Commit 02241649 authored by Jo Van Bulck's avatar Jo Van Bulck Committed by Dave Hansen

selftests/sgx: Ensure expected location of test enclave buffer

The external tests manipulating page permissions expect encl_buffer to be
placed at the start of the test enclave's .data section. As this is not
guaranteed per the C standard, explicitly place encl_buffer in a separate
section that is explicitly placed at the start of the .data segment in the
linker script to avoid the compiler placing it somewhere else in .data.
Signed-off-by: default avatarJo Van Bulck <jo.vanbulck@cs.kuleuven.be>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Acked-by: default avatarKai Huang <kai.huang@intel.com>
Link: https://lore.kernel.org/all/20231005153854.25566-12-jo.vanbulck%40cs.kuleuven.be
parent a4c39ef4
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#define __aligned(x) __attribute__((__aligned__(x))) #define __aligned(x) __attribute__((__aligned__(x)))
#define __packed __attribute__((packed)) #define __packed __attribute__((packed))
#define __used __attribute__((used)) #define __used __attribute__((used))
#define __section(x)__attribute__((__section__(x)))
#include "../../../../arch/x86/include/asm/sgx.h" #include "../../../../arch/x86/include/asm/sgx.h"
#include "../../../../arch/x86/include/asm/enclu.h" #include "../../../../arch/x86/include/asm/enclu.h"
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
/* /*
* Data buffer spanning two pages that will be placed first in the .data * Data buffer spanning two pages that will be placed first in the .data
* segment. Even if not used internally the second page is needed by external * segment via the linker script. Even if not used internally the second page
* test manipulating page permissions, so mark encl_buffer as "used" to make * is needed by external test manipulating page permissions, so mark
* sure it is entirely preserved by the compiler. * encl_buffer as "used" to make sure it is entirely preserved by the compiler.
*/ */
static uint8_t __used encl_buffer[8192] = { 1 }; static uint8_t __used __section(".data.encl_buffer") encl_buffer[8192] = { 1 };
enum sgx_enclu_function { enum sgx_enclu_function {
EACCEPT = 0x5, EACCEPT = 0x5,
......
...@@ -24,6 +24,7 @@ SECTIONS ...@@ -24,6 +24,7 @@ SECTIONS
} : text } : text
.data : { .data : {
*(.data.encl_buffer)
*(.data*) *(.data*)
} : data } : data
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment