x86/sgx: Handle VA page allocation failure for EAUG on PF.
Jarkko Sakkinen
maintainerPATCH 1/2 x86/sgx: Handle VA page allocation failure for EAUG on PF.
From: Haitao Huang <[email protected]>
VM_FAULT_NOPAGE is expected behaviour for -EBUSY failure path, when augmenting a page, as this means that the reclaimer thread has been triggered, and the intention is just to round-trip in ring-3, and retry with a new page fault.
---
I rewrote the commit message because it was not explanatory enough, added the missing fixes tag, and all cumulated tags.
arch/x86/kernel/cpu/sgx/encl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/sgx/encl.c +4 -1
@@ -344,8 +344,11 @@ static vm_fault_t sgx_encl_eaug_page(struct vm_area_struct *vma, } va_page =sgx_encl_grow (encl, false); -if (IS_ERR (va_page)) +if (IS_ERR (va_page)) { +if (PTR_ERR (va_page) == -EBUSY ) + vmret =VM_FAULT_NOPAGE ; goto err_out_epc; + }if (va_page)list_add (&va_page->list, &encl->va_pages);
Signature · 1 line
2.37.1
Jarkko Sakkinen
maintainerPATCH 2/2 selftests/sgx: Add SGX selftest augment_via_eaccept_long
From: Vijay Dhanraj <[email protected]>
Add a new test case which is same as augment_via_eaccept but adds a larger number of EPC pages to stress test EAUG via EACCEPT.
---
I removed Githubisms (hyphens), added missing subsystem tag, and cleaned up the commit message a bit.
tools/testing/selftests/sgx/load.c | 5 +- tools/testing/selftests/sgx/main.c | 120 +++++++++++++++++++++++- tools/testing/selftests/sgx/main.h | 3 +- tools/testing/selftests/sgx/sigstruct.c | 2 +- 4 files changed, 125 insertions(+), 5 deletions(-)
tools/testing/selftests/sgx/load.c +3 -2
@@ -171,7 +171,8 @@ uint64_t encl_get_entry(struct encl *encl, const char *symbol)return 0 ; } -bool encl_load (const char *path,struct encl *encl,unsigned long heap_size) +bool encl_load (const char *path,struct encl *encl,unsigned long heap_size, +unsigned long edmm_size) {const char device_path[] ="/dev/sgx_enclave" ;struct encl_segment *seg;
@@ -300,7 +301,7 @@ bool encl_load(const char *path, struct encl *encl, unsigned long heap_size) encl->src_size = encl->segment_tbl[j].offset + encl->segment_tbl[j].size; -for (encl->encl_size =4096 ; encl->encl_size < encl->src_size; ) +for (encl->encl_size =4096 ; encl->encl_size < encl->src_size + edmm_size;) encl->encl_size <<=1 ;return true;
tools/testing/selftests/sgx/main.c +119 -1
138 lines not on this page · raw message
tools/testing/selftests/sgx/main.h +2 -1
@@ -35,7 +35,8 @@ extern unsigned char sign_key[];extern unsigned char sign_key_end[];void encl_delete (struct encl *ctx); -bool encl_load (const char *path,struct encl *encl,unsigned long heap_size); +bool encl_load (const char *path,struct encl *encl,unsigned long heap_size, +unsigned long edmm_size);bool encl_measure (struct encl *encl);bool encl_build (struct encl *encl);uint64_t encl_get_entry (struct encl *encl,const char *symbol);
tools/testing/selftests/sgx/sigstruct.c +1 -1
@@ -343,7 +343,7 @@ bool encl_measure(struct encl *encl)if (!ctx) goto err; -if (!mrenclave_ecreate (ctx, encl->src_size)) +if (!mrenclave_ecreate (ctx, encl->encl_size)) goto err;for (i =0 ; i < encl->nr_segments; i++) {
Signature · 1 line
2.37.1
Re: [PATCH 2/2] selftests/sgx: Add SGX selftest augment_via_eaccept_long
Hi Vijay,
Thank you very much for digging into this. A few comments below.
Quoted 32 lines · Jarkko Sakkinen
From: Vijay Dhanraj <[email protected]>
Add a new test case which is same as
augment_via_eacceptbut adds a larger number of EPC pages to stress test EAUG via EACCEPT.Signed-off-by Vijay Dhanraj <[email protected]>Reviewed-by Jarkko Sakkinen <[email protected]>Signed-off-by Jarkko Sakkinen <[email protected]>---
I removed Githubisms (hyphens), added missing subsystem tag, and cleaned up the commit message a bit.tools/testing/selftests/sgx/load.c | 5 +- tools/testing/selftests/sgx/main.c | 120 +++++++++++++++++++++++- tools/testing/selftests/sgx/main.h | 3 +- tools/testing/selftests/sgx/sigstruct.c | 2 +- 4 files changed, 125 insertions(+), 5 deletions(-)tools/testing/selftests/sgx/load.c +2
-1@@ -171,7 +171,8 @@ uint64_t encl_get_entry(struct encl *encl, const char *symbol)return 0 ; } -bool encl_load (const char *path,struct encl *encl,unsigned long heap_size) +bool encl_load (const char *path,struct encl *encl,unsigned long heap_size, +unsigned long edmm_size) {const char device_path[] ="/dev/sgx_enclave" ;struct encl_segment *seg;
tools/testing/selftests/sgx/load.c bool encl_load(const char *path, struct encl *encl, unsigned long heap_size) · line 306
Quoted 7 lines
tools/testing/selftests/sgx/load.c +1
-1@@ -300,7 +301,7 @@ bool encl_load(const char *path, struct encl *encl, unsigned long heap_size) encl->src_size = encl->segment_tbl[j].offset + encl->segment_tbl[j].size; -for (encl->encl_size =4096 ; encl->encl_size < encl->src_size; ) +for (encl->encl_size =4096 ; encl->encl_size < encl->src_size + edmm_size;) encl->encl_size <<=1 ;
This seems to create the hardcoded 8GB larger enclave for all (SGX1 and SGX2) tests, not just the test introduced with this commit (and the only user of this extra space). Is this intended? This can be done without impacting all the other tests.
tools/testing/selftests/sgx/main.c static const uint64_t MAGIC = 0x1122334455667788ULL; · line 29
Quoted 11 lines
tools/testing/selftests/sgx/load.c +0
-0return true;tools/testing/selftests/sgx/main.c +2
-0@@ -25,6 +25,8 @@ static const uint64_t MAGIC = 0x1122334455667788ULL;static const uint64_t MAGIC2 =0x8877665544332211ULL ;vdso_sgx_enter_enclave_t vdso_sgx_enter_enclave; +static const unsigned long edmm_size =8589934592 ;//8G +
Could you please elaborate how this constant was chosen? I understand that this test helped to uncover a bug and it is useful to add to the kernel. When doing so this test will be run on systems with a variety of SGX memory sizes, could you please elaborate (and add a snippet) how 8GB is the right value for all systems?
Quoted 13 lines
tools/testing/selftests/sgx/main.c +1
-1/* * Security Information (SECINFO) data structure needed by a few SGX * instructions (eg. ENCLU[EACCEPT] and ENCLU[EMODPE]) holds meta-data @@ -183,7 +185,7 @@ static bool setup_test_encl(unsigned long heap_size, struct encl *encl,unsigned int i;void *addr; -if (!encl_load ("test_encl.elf" , encl, heap_size)) { +if (!encl_load ("test_encl.elf" , encl, heap_size, edmm_size)) {encl_delete (encl);TH_LOG ("Failed to load the test enclave." );return false;
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1217
Quoted 6 lines
tools/testing/selftests/sgx/main.c +3
-0@@ -1210,6 +1212,122 @@ TEST_F(enclave, augment_via_eaccept)munmap (addr,PAGE_SIZE ); } +/* +* Test for the addition of large number of pages to an initialized enclave via +* a pre-emptive run of EACCEPT on page to be added.
/on page to be added/on every page to be added/ ?
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1227
Quoted 10 lines
tools/testing/selftests/sgx/main.c +10
-0+*/ +#define TIMEOUT_LONG 900/* seconds */ +TEST_F_TIMEOUT(enclave, augment_via_eaccept_long, TIMEOUT_LONG) +{ +struct encl_op_get_from_addr get_addr_op; +struct encl_op_put_to_addr put_addr_op; +struct encl_op_eaccept eaccept_op; +size_t total_size =0 ; +void *addr; +unsigned long i;
(reverse fir tree order)
Quoted 12 lines
tools/testing/selftests/sgx/main.c +12
-0+ +if (!sgx2_supported ()) +SKIP (return,"SGX2 not supported" ); + +ASSERT_TRUE (setup_test_encl (ENCL_HEAP_SIZE_DEFAULT , &self->encl, _metadata)); + +memset (&self->run,0 ,sizeof (self->run)); + self->run.tcs = self->encl.encl_base; + +for (i =0 ; i < self->encl.nr_segments; i++) { +struct encl_segment *seg = &self->encl.segment_tbl[i]; +
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1249
Quoted 10 lines
tools/testing/selftests/sgx/main.c +10
-0+ total_size += seg->size; +TH_LOG ("test enclave: total_size = %ld, seg->size = %ld" , total_size, seg->size); + } + +/* +* Actual enclave size is expected to be larger than the loaded +* test enclave since enclave size must be a power of 2 in bytes while +* test_encl does not consume it all. +*/ +EXPECT_LT (total_size + edmm_size, self->encl.encl_size);
Will this test ever fail?
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1253
Quoted 4 lines
tools/testing/selftests/sgx/main.c +4
-0+ +/* +* mmap() a page at end of existing enclave to be used for dynamic +* EPC page.
copy&paste line still refers to single page
Quoted 9 lines
tools/testing/selftests/sgx/main.c +9
-0+* +* Kernel will allow new mapping using any permissions if it +* falls into the enclave's address range but not backed +* by existing enclave pages. +*/ +TH_LOG ("mmaping pages at end of enclave..." ); + addr =mmap ((void *)self->encl.encl_base + total_size, edmm_size, +PROT_READ |PROT_WRITE |PROT_EXEC ,MAP_SHARED |MAP_FIXED , + self->encl.fd,0 );
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1272
Quoted 10 lines
tools/testing/selftests/sgx/main.c +10
-0+EXPECT_NE (addr,MAP_FAILED ); + + self->run.exception_vector =0 ; + self->run.exception_error_code =0 ; + self->run.exception_addr =0 ; + +/* +* Run EACCEPT on new page to trigger the #PF->EAUG->EACCEPT(again +* without a #PF). All should be transparent to userspace. +*/
copy&paste from single page test referring to one page
Quoted 18 lines
tools/testing/selftests/sgx/main.c +18
-0+TH_LOG ("Entering enclave to run EACCEPT for each page of %zd bytes may take a while ..." , + edmm_size); + eaccept_op.flags =SGX_SECINFO_R |SGX_SECINFO_W |SGX_SECINFO_REG |SGX_SECINFO_PENDING ; + eaccept_op.ret =0 ; + eaccept_op.header.type =ENCL_OP_EACCEPT ; + +for (i =0 ; i < edmm_size; i +=4096 ) { + eaccept_op.epc_addr = (uint64_t )(addr + i); + +EXPECT_EQ (ENCL_CALL (&eaccept_op, &self->run, true),0 ); +if (self->run.exception_vector ==14 && + self->run.exception_error_code ==4 && + self->run.exception_addr == self->encl.encl_base) { +munmap (addr, edmm_size); +SKIP (return,"Kernel does not support adding pages to initialized enclave" ); + } + +EXPECT_EQ (self->run.exception_vector,0 );
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1300
Quoted 10 lines
tools/testing/selftests/sgx/main.c +10
-0+EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); +ASSERT_EQ (eaccept_op.ret,0 ); +ASSERT_EQ (self->run.function,EEXIT ); + } + +/* +* New page should be accessible from within enclave - attempt to +* write to it. +*/
This portion below was also copied from previous test and by only testing a write to the first page of the range the purpose is not clear. Could you please elaborate if the intention is to only test accessibility of the first page and why that is sufficient?
Quoted 52 lines
tools/testing/selftests/sgx/main.c +30
-0+ put_addr_op.value =MAGIC ; + put_addr_op.addr = (unsigned long )addr; + put_addr_op.header.type =ENCL_OP_PUT_TO_ADDRESS ; + +EXPECT_EQ (ENCL_CALL (&put_addr_op, &self->run, true),0 ); + +EXPECT_EEXIT (&self->run); +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); + +/* +* Read memory from newly added page that was just written to, +* confirming that data previously written (MAGIC) is present. +*/ + get_addr_op.value =0 ; + get_addr_op.addr = (unsigned long )addr; + get_addr_op.header.type =ENCL_OP_GET_FROM_ADDRESS ; + +EXPECT_EQ (ENCL_CALL (&get_addr_op, &self->run, true),0 ); + +EXPECT_EQ (get_addr_op.value,MAGIC ); +EXPECT_EEXIT (&self->run); +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); + +munmap (addr, edmm_size); +} +/* * SGX2 page type modification test in two phases: * Phase 1: tools/testing/selftests/sgx/main.h +2
-1@@ -35,7 +35,8 @@ extern unsigned char sign_key[];extern unsigned char sign_key_end[];void encl_delete (struct encl *ctx); -bool encl_load (const char *path,struct encl *encl,unsigned long heap_size); +bool encl_load (const char *path,struct encl *encl,unsigned long heap_size, +unsigned long edmm_size);bool encl_measure (struct encl *encl);bool encl_build (struct encl *encl);uint64_t encl_get_entry (struct encl *encl,const char *symbol);tools/testing/selftests/sgx/sigstruct.c +0
-0
tools/testing/selftests/sgx/sigstruct.c bool encl_measure(struct encl *encl) · line 349
Quoted 8 lines
tools/testing/selftests/sgx/sigstruct.c +1
-1@@ -343,7 +343,7 @@ bool encl_measure(struct encl *encl)if (!ctx) goto err; -if (!mrenclave_ecreate (ctx, encl->src_size)) +if (!mrenclave_ecreate (ctx, encl->encl_size)) goto err;for (i =0 ; i < encl->nr_segments; i++) {
Looking at mrenclave_ecreate() the above snippet seems separate from this test and incomplete since it now obtains encl->encl_size but continues to compute it again internally. Should this be a separate fix?
Reinette
Jarkko Sakkinen
maintainerRe: [PATCH 2/2] selftests/sgx: Add SGX selftest augment_via_eaccept_long
Quoted 40 lines · Reinette Chatre
Hi Vijay,
Thank you very much for digging into this. A few comments below.
Quoted 35 lines · Jarkko Sakkinen
From: Vijay Dhanraj <[email protected]>
Add a new test case which is same as
augment_via_eacceptbut adds a larger number of EPC pages to stress test EAUG via EACCEPT.Signed-off-by Vijay Dhanraj <[email protected]>Reviewed-by Jarkko Sakkinen <[email protected]>Signed-off-by Jarkko Sakkinen <[email protected]>---
I removed Githubisms (hyphens), added missing subsystem tag, and cleaned up the commit message a bit.tools/testing/selftests/sgx/load.c | 5 +- tools/testing/selftests/sgx/main.c | 120 +++++++++++++++++++++++- tools/testing/selftests/sgx/main.h | 3 +- tools/testing/selftests/sgx/sigstruct.c | 2 +- 4 files changed, 125 insertions(+), 5 deletions(-)tools/testing/selftests/sgx/load.c +2
-1@@ -171,7 +171,8 @@ uint64_t encl_get_entry(struct encl *encl, const char *symbol)return 0 ; } -bool encl_load (const char *path,struct encl *encl,unsigned long heap_size) +bool encl_load (const char *path,struct encl *encl,unsigned long heap_size, +unsigned long edmm_size) {const char device_path[] ="/dev/sgx_enclave" ;struct encl_segment *seg;@@ -300,7 +301,7 @@ bool encl_load(const char *path, struct encl *encl, unsigned long heap_size) encl->src_size = encl->segment_tbl[j].offset + encl->segment_tbl[j].size;
Quoted 8 lines
tools/testing/selftests/sgx/load.c bool encl_load(const char *path, struct encl *encl, unsigned long heap_size) · line 306
Quoted 4 lines
tools/testing/selftests/sgx/load.c +1
-1-for (encl->encl_size =4096 ; encl->encl_size < encl->src_size; ) +for (encl->encl_size =4096 ; encl->encl_size < encl->src_size + edmm_size;) encl->encl_size <<=1 ;This seems to create the hardcoded 8GB larger enclave for all (SGX1 and SGX2) tests, not just the test introduced with this commit (and the only user of this extra space). Is this intended? This can be done without impacting all the other tests.
It's a valid point. I can adjust the patch.
Quoted 10 lines
Quoted 10 lines
tools/testing/selftests/sgx/load.c +0
-0return true;tools/testing/selftests/sgx/main.c +0
-0@@ -25,6 +25,8 @@ static const uint64_t MAGIC = 0x1122334455667788ULL;static const uint64_t MAGIC2 =0x8877665544332211ULL ;vdso_sgx_enter_enclave_t vdso_sgx_enter_enclave;
Quoted 7 lines
tools/testing/selftests/sgx/main.c static const uint64_t MAGIC = 0x1122334455667788ULL; · line 29
Quoted 2 lines
tools/testing/selftests/sgx/main.c +2
-0+static const unsigned long edmm_size =8589934592 ;//8G +Could you please elaborate how this constant was chosen? I understand that this test helped to uncover a bug and it is useful to add to the kernel. When doing so this test will be run on systems with a variety of SGX memory sizes, could you please elaborate (and add a snippet) how 8GB is the right value for all systems?
It is the only constant I know for sure that some people (Vijay and Haitao) have been able to reproduce the bug.
Unless someone can show that the same bug reproduces with a smaller constant, changing it would make the whole test irrelevant.
Quoted 15 lines
/on page to be added/on every page to be added/ ?
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1227
Quoted 10 lines
tools/testing/selftests/sgx/main.c +10
-0+*/ +#define TIMEOUT_LONG 900/* seconds */ +TEST_F_TIMEOUT(enclave, augment_via_eaccept_long, TIMEOUT_LONG) +{ +struct encl_op_get_from_addr get_addr_op; +struct encl_op_put_to_addr put_addr_op; +struct encl_op_eaccept eaccept_op; +size_t total_size =0 ; +void *addr; +unsigned long i;(reverse fir tree order)
I would just change this to "int i" instead.
Quoted 17 lines
Quoted 17 lines
tools/testing/selftests/sgx/main.c +16
-0+ +if (!sgx2_supported ()) +SKIP (return,"SGX2 not supported" ); + +ASSERT_TRUE (setup_test_encl (ENCL_HEAP_SIZE_DEFAULT , &self->encl, _metadata)); + +memset (&self->run,0 ,sizeof (self->run)); + self->run.tcs = self->encl.encl_base; + +for (i =0 ; i < self->encl.nr_segments; i++) { +struct encl_segment *seg = &self->encl.segment_tbl[i]; + + total_size += seg->size; +TH_LOG ("test enclave: total_size = %ld, seg->size = %ld" , total_size, seg->size); + } +
Quoted 8 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1249
Quoted 6 lines
tools/testing/selftests/sgx/main.c +6
-0+/* +* Actual enclave size is expected to be larger than the loaded +* test enclave since enclave size must be a power of 2 in bytes while +* test_encl does not consume it all. +*/ +EXPECT_LT (total_size + edmm_size, self->encl.encl_size);Will this test ever fail?
With a *quick* look: no.
Vijay, what was the point of this check?
Quoted 54 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1253
Quoted 4 lines
tools/testing/selftests/sgx/main.c +4
-0+ +/* +* mmap() a page at end of existing enclave to be used for dynamic +* EPC page. copy&paste line still refers to single page
Quoted 9 lines
tools/testing/selftests/sgx/main.c +9
-0+* +* Kernel will allow new mapping using any permissions if it +* falls into the enclave's address range but not backed +* by existing enclave pages. +*/ +TH_LOG ("mmaping pages at end of enclave..." ); + addr =mmap ((void *)self->encl.encl_base + total_size, edmm_size, +PROT_READ |PROT_WRITE |PROT_EXEC ,MAP_SHARED |MAP_FIXED , + self->encl.fd,0 );tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1272
Quoted 10 lines
tools/testing/selftests/sgx/main.c +10
-0+EXPECT_NE (addr,MAP_FAILED ); + + self->run.exception_vector =0 ; + self->run.exception_error_code =0 ; + self->run.exception_addr =0 ; + +/* +* Run EACCEPT on new page to trigger the #PF->EAUG->EACCEPT(again +* without a #PF). All should be transparent to userspace. +*/ copy&paste from single page test referring to one page
Quoted 25 lines
tools/testing/selftests/sgx/main.c +25
-0+TH_LOG ("Entering enclave to run EACCEPT for each page of %zd bytes may take a while ..." , + edmm_size); + eaccept_op.flags =SGX_SECINFO_R |SGX_SECINFO_W |SGX_SECINFO_REG |SGX_SECINFO_PENDING ; + eaccept_op.ret =0 ; + eaccept_op.header.type =ENCL_OP_EACCEPT ; + +for (i =0 ; i < edmm_size; i +=4096 ) { + eaccept_op.epc_addr = (uint64_t )(addr + i); + +EXPECT_EQ (ENCL_CALL (&eaccept_op, &self->run, true),0 ); +if (self->run.exception_vector ==14 && + self->run.exception_error_code ==4 && + self->run.exception_addr == self->encl.encl_base) { +munmap (addr, edmm_size); +SKIP (return,"Kernel does not support adding pages to initialized enclave" ); + } + +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); +ASSERT_EQ (eaccept_op.ret,0 ); +ASSERT_EQ (self->run.function,EEXIT ); + } + +/*
Quoted 8 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1300
Quoted 3 lines
tools/testing/selftests/sgx/main.c +3
-0+* New page should be accessible from within enclave - attempt to +* write to it. +*/ This portion below was also copied from previous test and by only testing a write to the first page of the range the purpose is not clear. Could you please elaborate if the intention is to only test accessibility of the first page and why that is sufficient?
It is sufficient because the test reproduces the bug. It would have to be rather elaborated why you would possibly want to do more than that.
Quoted 59 lines
Quoted 59 lines
tools/testing/selftests/sgx/main.c +30
-0+ put_addr_op.value =MAGIC ; + put_addr_op.addr = (unsigned long )addr; + put_addr_op.header.type =ENCL_OP_PUT_TO_ADDRESS ; + +EXPECT_EQ (ENCL_CALL (&put_addr_op, &self->run, true),0 ); + +EXPECT_EEXIT (&self->run); +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); + +/* +* Read memory from newly added page that was just written to, +* confirming that data previously written (MAGIC) is present. +*/ + get_addr_op.value =0 ; + get_addr_op.addr = (unsigned long )addr; + get_addr_op.header.type =ENCL_OP_GET_FROM_ADDRESS ; + +EXPECT_EQ (ENCL_CALL (&get_addr_op, &self->run, true),0 ); + +EXPECT_EQ (get_addr_op.value,MAGIC ); +EXPECT_EEXIT (&self->run); +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); + +munmap (addr, edmm_size); +} +/* * SGX2 page type modification test in two phases: * Phase 1: tools/testing/selftests/sgx/main.h +2
-1@@ -35,7 +35,8 @@ extern unsigned char sign_key[];extern unsigned char sign_key_end[];void encl_delete (struct encl *ctx); -bool encl_load (const char *path,struct encl *encl,unsigned long heap_size); +bool encl_load (const char *path,struct encl *encl,unsigned long heap_size, +unsigned long edmm_size);bool encl_measure (struct encl *encl);bool encl_build (struct encl *encl);uint64_t encl_get_entry (struct encl *encl,const char *symbol);tools/testing/selftests/sgx/sigstruct.c +1
-1@@ -343,7 +343,7 @@ bool encl_measure(struct encl *encl)if (!ctx) goto err; -if (!mrenclave_ecreate (ctx, encl->src_size)) +if (!mrenclave_ecreate (ctx, encl->encl_size)) goto err;
Quoted 6 lines
tools/testing/selftests/sgx/sigstruct.c bool encl_measure(struct encl *encl) · line 349
Quoted 1 line
tools/testing/selftests/sgx/sigstruct.c +0
-0for (i =0 ; i < encl->nr_segments; i++) {Looking at
mrenclave_ecreate()the above snippet seems separate from this test and incomplete since it now obtainsencl->encl_sizebut continues to compute it again internally. Should this be a separate fix?
I would remove this part completely but this also needs comment from Vijay.
Quoted 1 line
Reinette
BR, Jarkko
Jarkko Sakkinen
maintainerRe: [PATCH 2/2] selftests/sgx: Add SGX selftest augment_via_eaccept_long
Quoted 258 lines · Jarkko Sakkinen
Quoted 40 lines · Reinette Chatre
Hi Vijay,
Thank you very much for digging into this. A few comments below.
Quoted 35 lines · Jarkko Sakkinen
From: Vijay Dhanraj <[email protected]>
Add a new test case which is same as
augment_via_eacceptbut adds a larger number of EPC pages to stress test EAUG via EACCEPT.Signed-off-by Vijay Dhanraj <[email protected]>Reviewed-by Jarkko Sakkinen <[email protected]>Signed-off-by Jarkko Sakkinen <[email protected]>---
I removed Githubisms (hyphens), added missing subsystem tag, and cleaned up the commit message a bit.tools/testing/selftests/sgx/load.c | 5 +- tools/testing/selftests/sgx/main.c | 120 +++++++++++++++++++++++- tools/testing/selftests/sgx/main.h | 3 +- tools/testing/selftests/sgx/sigstruct.c | 2 +- 4 files changed, 125 insertions(+), 5 deletions(-)tools/testing/selftests/sgx/load.c +2
-1@@ -171,7 +171,8 @@ uint64_t encl_get_entry(struct encl *encl, const char *symbol)return 0 ; } -bool encl_load (const char *path,struct encl *encl,unsigned long heap_size) +bool encl_load (const char *path,struct encl *encl,unsigned long heap_size, +unsigned long edmm_size) {const char device_path[] ="/dev/sgx_enclave" ;struct encl_segment *seg;@@ -300,7 +301,7 @@ bool encl_load(const char *path, struct encl *encl, unsigned long heap_size) encl->src_size = encl->segment_tbl[j].offset + encl->segment_tbl[j].size;Quoted 8 lines
tools/testing/selftests/sgx/load.c bool encl_load(const char *path, struct encl *encl, unsigned long heap_size) · line 306
Quoted 4 lines
tools/testing/selftests/sgx/load.c +1
-1-for (encl->encl_size =4096 ; encl->encl_size < encl->src_size; ) +for (encl->encl_size =4096 ; encl->encl_size < encl->src_size + edmm_size;) encl->encl_size <<=1 ;This seems to create the hardcoded 8GB larger enclave for all (SGX1 and SGX2) tests, not just the test introduced with this commit (and the only user of this extra space). Is this intended? This can be done without impacting all the other tests.
It's a valid point. I can adjust the patch.
Quoted 10 lines
Quoted 10 lines
tools/testing/selftests/sgx/load.c +0
-0return true;tools/testing/selftests/sgx/main.c +0
-0@@ -25,6 +25,8 @@ static const uint64_t MAGIC = 0x1122334455667788ULL;static const uint64_t MAGIC2 =0x8877665544332211ULL ;vdso_sgx_enter_enclave_t vdso_sgx_enter_enclave;Quoted 7 lines
tools/testing/selftests/sgx/main.c static const uint64_t MAGIC = 0x1122334455667788ULL; · line 29
Quoted 2 lines
tools/testing/selftests/sgx/main.c +2
-0+static const unsigned long edmm_size =8589934592 ;//8G +Could you please elaborate how this constant was chosen? I understand that this test helped to uncover a bug and it is useful to add to the kernel. When doing so this test will be run on systems with a variety of SGX memory sizes, could you please elaborate (and add a snippet) how 8GB is the right value for all systems?
It is the only constant I know for sure that some people (Vijay and Haitao) have been able to reproduce the bug.
Unless someone can show that the same bug reproduces with a smaller constant, changing it would make the whole test irrelevant.
Quoted 15 lines
/on page to be added/on every page to be added/ ?
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1227
Quoted 10 lines
tools/testing/selftests/sgx/main.c +10
-0+*/ +#define TIMEOUT_LONG 900/* seconds */ +TEST_F_TIMEOUT(enclave, augment_via_eaccept_long, TIMEOUT_LONG) +{ +struct encl_op_get_from_addr get_addr_op; +struct encl_op_put_to_addr put_addr_op; +struct encl_op_eaccept eaccept_op; +size_t total_size =0 ; +void *addr; +unsigned long i;(reverse fir tree order)
I would just change this to "int i" instead.
Quoted 17 lines
Quoted 17 lines
tools/testing/selftests/sgx/main.c +16
-0+ +if (!sgx2_supported ()) +SKIP (return,"SGX2 not supported" ); + +ASSERT_TRUE (setup_test_encl (ENCL_HEAP_SIZE_DEFAULT , &self->encl, _metadata)); + +memset (&self->run,0 ,sizeof (self->run)); + self->run.tcs = self->encl.encl_base; + +for (i =0 ; i < self->encl.nr_segments; i++) { +struct encl_segment *seg = &self->encl.segment_tbl[i]; + + total_size += seg->size; +TH_LOG ("test enclave: total_size = %ld, seg->size = %ld" , total_size, seg->size); + } +Quoted 8 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1249
Quoted 6 lines
tools/testing/selftests/sgx/main.c +6
-0+/* +* Actual enclave size is expected to be larger than the loaded +* test enclave since enclave size must be a power of 2 in bytes while +* test_encl does not consume it all. +*/ +EXPECT_LT (total_size + edmm_size, self->encl.encl_size);Will this test ever fail?
With a *quick* look: no.
Vijay, what was the point of this check?
Quoted 54 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1253
Quoted 4 lines
tools/testing/selftests/sgx/main.c +4
-0+ +/* +* mmap() a page at end of existing enclave to be used for dynamic +* EPC page. copy&paste line still refers to single page
Quoted 9 lines
tools/testing/selftests/sgx/main.c +9
-0+* +* Kernel will allow new mapping using any permissions if it +* falls into the enclave's address range but not backed +* by existing enclave pages. +*/ +TH_LOG ("mmaping pages at end of enclave..." ); + addr =mmap ((void *)self->encl.encl_base + total_size, edmm_size, +PROT_READ |PROT_WRITE |PROT_EXEC ,MAP_SHARED |MAP_FIXED , + self->encl.fd,0 );tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1272
Quoted 10 lines
tools/testing/selftests/sgx/main.c +10
-0+EXPECT_NE (addr,MAP_FAILED ); + + self->run.exception_vector =0 ; + self->run.exception_error_code =0 ; + self->run.exception_addr =0 ; + +/* +* Run EACCEPT on new page to trigger the #PF->EAUG->EACCEPT(again +* without a #PF). All should be transparent to userspace. +*/ copy&paste from single page test referring to one page
Quoted 25 lines
tools/testing/selftests/sgx/main.c +25
-0+TH_LOG ("Entering enclave to run EACCEPT for each page of %zd bytes may take a while ..." , + edmm_size); + eaccept_op.flags =SGX_SECINFO_R |SGX_SECINFO_W |SGX_SECINFO_REG |SGX_SECINFO_PENDING ; + eaccept_op.ret =0 ; + eaccept_op.header.type =ENCL_OP_EACCEPT ; + +for (i =0 ; i < edmm_size; i +=4096 ) { + eaccept_op.epc_addr = (uint64_t )(addr + i); + +EXPECT_EQ (ENCL_CALL (&eaccept_op, &self->run, true),0 ); +if (self->run.exception_vector ==14 && + self->run.exception_error_code ==4 && + self->run.exception_addr == self->encl.encl_base) { +munmap (addr, edmm_size); +SKIP (return,"Kernel does not support adding pages to initialized enclave" ); + } + +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); +ASSERT_EQ (eaccept_op.ret,0 ); +ASSERT_EQ (self->run.function,EEXIT ); + } + +/* Quoted 8 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1300
Quoted 3 lines
tools/testing/selftests/sgx/main.c +3
-0+* New page should be accessible from within enclave - attempt to +* write to it. +*/ This portion below was also copied from previous test and by only testing a write to the first page of the range the purpose is not clear. Could you please elaborate if the intention is to only test accessibility of the first page and why that is sufficient?
It is sufficient because the test reproduces the bug. It would have to be rather elaborated why you would possibly want to do more than that.
Quoted 59 lines
Quoted 59 lines
tools/testing/selftests/sgx/main.c +30
-0+ put_addr_op.value =MAGIC ; + put_addr_op.addr = (unsigned long )addr; + put_addr_op.header.type =ENCL_OP_PUT_TO_ADDRESS ; + +EXPECT_EQ (ENCL_CALL (&put_addr_op, &self->run, true),0 ); + +EXPECT_EEXIT (&self->run); +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); + +/* +* Read memory from newly added page that was just written to, +* confirming that data previously written (MAGIC) is present. +*/ + get_addr_op.value =0 ; + get_addr_op.addr = (unsigned long )addr; + get_addr_op.header.type =ENCL_OP_GET_FROM_ADDRESS ; + +EXPECT_EQ (ENCL_CALL (&get_addr_op, &self->run, true),0 ); + +EXPECT_EQ (get_addr_op.value,MAGIC ); +EXPECT_EEXIT (&self->run); +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); + +munmap (addr, edmm_size); +} +/* * SGX2 page type modification test in two phases: * Phase 1: tools/testing/selftests/sgx/main.h +2
-1@@ -35,7 +35,8 @@ extern unsigned char sign_key[];extern unsigned char sign_key_end[];void encl_delete (struct encl *ctx); -bool encl_load (const char *path,struct encl *encl,unsigned long heap_size); +bool encl_load (const char *path,struct encl *encl,unsigned long heap_size, +unsigned long edmm_size);bool encl_measure (struct encl *encl);bool encl_build (struct encl *encl);uint64_t encl_get_entry (struct encl *encl,const char *symbol);tools/testing/selftests/sgx/sigstruct.c +1
-1@@ -343,7 +343,7 @@ bool encl_measure(struct encl *encl)if (!ctx) goto err; -if (!mrenclave_ecreate (ctx, encl->src_size)) +if (!mrenclave_ecreate (ctx, encl->encl_size)) goto err;Quoted 6 lines
tools/testing/selftests/sgx/sigstruct.c bool encl_measure(struct encl *encl) · line 349
Quoted 1 line
tools/testing/selftests/sgx/sigstruct.c +0
-0for (i =0 ; i < encl->nr_segments; i++) {Looking at
mrenclave_ecreate()the above snippet seems separate from this test and incomplete since it now obtainsencl->encl_sizebut continues to compute it again internally. Should this be a separate fix?
Quoted 4 lines
I would remove this part completely but this also needs comment from Vijay.
Quoted 1 line
Reinette
Related:
https://github.com/jarkkojs/bpftrace-sgx/blob/main/sgx-alloc-error.bt
Thought that this might be useful, if there is still some need to discuss about the bug, e.g. to compare the results. Can be run with bpftrace.
The bug did not reproduce in my side, even after changing to the 2GB PRMRR configuration.
BR, Jarkko
RE: [PATCH 2/2] selftests/sgx: Add SGX selftest augment_via_eaccept_long
In reply to Jarkko SakkinenHi Jarkko, Reinette,
Quoted 67 lines
-----Original Message-----
From: Jarkko Sakkinen <[email protected]>
Sent: Tuesday, August 16, 2022 4:34 PM
To: Chatre, Reinette <[email protected]>
Cc: Dave Hansen <[email protected]>; linux- [email protected]; Dhanraj, Vijay <[email protected]>; Shuah Khan <[email protected]>; open list:KERNEL SELFTEST FRAMEWORK <linux- [email protected]>; open list <[email protected]>
Subject: Re: [PATCH 2/2] selftests/sgx: Add SGX selftestaugment_via_eaccept_longQuoted 18 lines · Reinette Chatre
Hi Vijay,
Thank you very much for digging into this. A few comments below.
Quoted 13 lines · Jarkko Sakkinen
From: Vijay Dhanraj <[email protected]>
Add a new test case which is same as
augment_via_eacceptbut adds a larger number of EPC pages to stress test EAUG via EACCEPT.Signed-off-by Vijay Dhanraj <[email protected]>Reviewed-by Jarkko Sakkinen <[email protected]>Signed-off-by Jarkko Sakkinen <[email protected]>---
I removed Githubisms (hyphens), added missing subsystem tag, and cleaned up the commit message a bit.tools/testing/selftests/sgx/load.c | 5 +- tools/testing/selftests/sgx/main.c | 120+++++++++++++++++++++++-
Quoted 10 lines
tools/testing/selftests/sgx/load.c uint64_t encl_get_entry(struct encl *encl, const
Quoted 10 lines
tools/testing/selftests/sgx/main.h | 3 +- tools/testing/selftests/sgx/sigstruct.c | 2 +- 4 files changed, 125 insertions(+), 5 deletions(-)tools/testing/selftests/sgx/load.c +0
-0@@ -171,7 +171,8 @@ uint64_t encl_get_entry(struct encl *encl, constchar *symbol)
Quoted 6 lines
tools/testing/selftests/sgx/load.c uint64_t encl_get_entry(struct encl *encl, const char *symbol)
Quoted 6 lines
tools/testing/selftests/sgx/load.c +1
-1return 0 ; } -bool encl_load (const char *path,struct encl *encl,unsigned long heap_size) +bool encl_load(const char *path, struct encl *encl, unsigned long
heap_size,Quoted 10 lines
Quoted 10 lines
tools/testing/selftests/sgx/load.c +1
-0+ unsigned long edmm_size) {const char device_path[] ="/dev/sgx_enclave" ;tools/testing/selftests/sgx/load.c +0
-0struct encl_segment *seg;@@ -300,7 +301,7 @@ bool encl_load(const char *path, struct encl *encl, unsigned long heap_size) encl->src_size = encl->segment_tbl[j].offset + encl->segment_tbl[j].size;Quoted 8 lines
tools/testing/selftests/sgx/load.c bool encl_load(const char *path, struct encl *encl, unsigned long heap_size) · line 305
Quoted 5 lines
tools/testing/selftests/sgx/load.c +2
-1-for (encl->encl_size =4096 ; encl->encl_size < encl->src_size; ) +for (encl->encl_size =4096 ; encl->encl_size < encl->src_size + +edmm_size;) encl->encl_size <<=1 ;This seems to create the hardcoded 8GB larger enclave for all (SGX1 and SGX2) tests, not just the test introduced with this commit (and the only
Quoted 4 lines
user of this extra space).
Quoted 1 line
Is this intended? This can be done without impacting all the other tests.
It's a valid point. I can adjust the patch.
Thanks Jarkko.
Quoted 22 lines
Quoted 13 lines
Quoted 13 lines
tools/testing/selftests/sgx/load.c +0
-0return true;tools/testing/selftests/sgx/main.c +0
-0@@ -25,6 +25,8 @@ static const uint64_t MAGIC =
0x1122334455667788ULL; static constuint64_tMAGIC2 =0x8877665544332211ULL;vdso_sgx_enter_enclave_tvdso_sgx_enter_enclave;Quoted 8 lines
tools/testing/selftests/sgx/main.c static const uint64_t MAGIC = 0x1122334455667788ULL; · line 29
Quoted 2 lines
tools/testing/selftests/sgx/main.c +2
-0+static const unsigned long edmm_size =8589934592 ;//8G +Could you please elaborate how this constant was chosen? I understand that this test helped to uncover a bug and it is useful to add to the kernel. When doing so this test will be run on systems with a variety of SGX memory sizes, could you please elaborate (and add a snippet) how 8GB is the right value for all systems?
Quoted 5 lines
It is the only constant I know for sure that some people (Vijay and Haitao) have been able to reproduce the bug.
Unless someone can show that the same bug reproduces with a smaller constant, changing it would make the whole test irrelevant.
I tried with 2GB and it always succeed and with 4GB was able to repro sporadically. But with 8GB failure was consistent. One thing to note is even with 8GB Haitao couldn't reproduce this every time. So not sure if it good for all the systems but on my ICX system, I was able to consistently repro with this value.
Quoted 16 lines
Quoted 4 lines
/on page to be added/on every page to be added/ ?
Quoted 11 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1227
Quoted 9 lines
+ */
tools/testing/selftests/sgx/main.c +8
-0+#define TIMEOUT_LONG 900 /* seconds */ TEST_F_TIMEOUT(enclave, +augment_via_eaccept_long,TIMEOUT_LONG ) { +struct encl_op_get_from_addr get_addr_op; +struct encl_op_put_to_addr put_addr_op; +struct encl_op_eaccept eaccept_op; +size_t total_size =0 ; +void *addr; +unsigned long i;(reverse fir tree order)
Quoted 1 line
I would just change this to "int i" instead.
I think changing it to "int i" will cause a buffer overflow with edmm_size being 8GB.
Quoted 30 lines
Quoted 8 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept)
Quoted 7 lines
tools/testing/selftests/sgx/main.c +5
-0+ +if (!sgx2_supported ()) +SKIP (return,"SGX2 not supported" ); + + ASSERT_TRUE(setup_test_encl(ENCL_HEAP_SIZE_DEFAULT, &self-encl,
Quoted 10 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept)
Quoted 10 lines
tools/testing/selftests/sgx/main.c +10
-0+_metadata)); + +memset (&self->run,0 ,sizeof (self->run)); + self->run.tcs = self->encl.encl_base; + +for (i =0 ; i < self->encl.nr_segments; i++) { +struct encl_segment *seg = &self->encl.segment_tbl[i]; + + total_size += seg->size; + TH_LOG("test enclave: total_size = %ld, seg->size = %ld",
total_size,seg->size);Quoted 10 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1249
Quoted 8 lines
tools/testing/selftests/sgx/main.c +8
-0+ } + +/* +* Actual enclave size is expected to be larger than the loaded +* test enclave since enclave size must be a power of 2 in bytes while +* test_encl does not consume it all. +*/ +EXPECT_LT (total_size + edmm_size, self->encl.encl_size);Will this test ever fail?
Quoted 3 lines
With a *quick* look: no.
Vijay, what was the point of this check?
Yes we can remove this check. I tried to copy from augment_via_eaccept and just changed the request size.
Quoted 133 lines
Quoted 8 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1253
Quoted 5 lines
tools/testing/selftests/sgx/main.c +4
-0+ +/* +* mmap() a page at end of existing enclave to be used for dynamic +* EPC page. copy&paste line still refers to single page
Quoted 8 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept)
Quoted 8 lines
tools/testing/selftests/sgx/main.c +8
-0+* +* Kernel will allow new mapping using any permissions if it +* falls into the enclave's address range but not backed +* by existing enclave pages. +*/ +TH_LOG ("mmaping pages at end of enclave..." ); + addr = mmap((void *)self->encl.encl_base + total_size, edmm_size, + PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_SHARED|MAP_FIXED,Quoted 10 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept)
Quoted 9 lines
tools/testing/selftests/sgx/main.c +9
-0+ self->encl.fd, 0); +EXPECT_NE (addr,MAP_FAILED ); + + self->run.exception_vector =0 ; + self->run.exception_error_code =0 ; + self->run.exception_addr =0 ; + +/* +* Run EACCEPT on new page to trigger the #PF->EAUG- EACCEPT(again
Quoted 6 lines
tools/testing/selftests/sgx/main.c
Quoted 2 lines
tools/testing/selftests/sgx/main.c +2
-0+* without a #PF). All should be transparent to userspace. +*/ copy&paste from single page test referring to one page
tools/testing/selftests/sgx/main.c
Quoted 1 line
tools/testing/selftests/sgx/main.c +1
-0+ TH_LOG("Entering enclave to run EACCEPT for each page of %zdbytes may take a while ...",
Quoted 2 lines
tools/testing/selftests/sgx/main.c
Quoted 2 lines
tools/testing/selftests/sgx/main.c +2
-0+ edmm_size); + eaccept_op.flags = SGX_SECINFO_R | SGX_SECINFO_W |
SGX_SECINFO_REG|SGX_SECINFO_PENDING;Quoted 4 lines
Quoted 4 lines
tools/testing/selftests/sgx/main.c +4
-0+ eaccept_op.ret =0 ; + eaccept_op.header.type =ENCL_OP_EACCEPT ; + +for (i =0 ; i < edmm_size; i +=4096 ) {Quoted 8 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept)
Quoted 8 lines
tools/testing/selftests/sgx/main.c +8
-0+ eaccept_op.epc_addr = (uint64_t )(addr + i); + +EXPECT_EQ (ENCL_CALL (&eaccept_op, &self->run, true),0 ); +if (self->run.exception_vector ==14 && + self->run.exception_error_code ==4 && + self->run.exception_addr == self->encl.encl_base) { +munmap (addr, edmm_size); + SKIP(return, "Kernel does not support adding pagesto initialized enclave");
Quoted 10 lines
Quoted 10 lines
tools/testing/selftests/sgx/main.c +10
-0+ } + +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); +ASSERT_EQ (eaccept_op.ret,0 ); +ASSERT_EQ (self->run.function,EEXIT ); + } + +/* Quoted 8 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1300
Quoted 3 lines
tools/testing/selftests/sgx/main.c +3
-0+* New page should be accessible from within enclave - attempt to +* write to it. +*/ This portion below was also copied from previous test and by only testing a write to the first page of the range the purpose is not clear. Could you please elaborate if the intention is to only test accessibility of the first page and why that is sufficient?
It is sufficient because the test reproduces the bug. It would have to be rather elaborated why you would possibly want to do more than that.
Quoted 41 lines
Quoted 41 lines
tools/testing/selftests/sgx/main.c +30
-0+ put_addr_op.value =MAGIC ; + put_addr_op.addr = (unsigned long )addr; + put_addr_op.header.type =ENCL_OP_PUT_TO_ADDRESS ; + +EXPECT_EQ (ENCL_CALL (&put_addr_op, &self->run, true),0 ); + +EXPECT_EEXIT (&self->run); +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); + +/* +* Read memory from newly added page that was just written to, +* confirming that data previously written (MAGIC) is present. +*/ + get_addr_op.value =0 ; + get_addr_op.addr = (unsigned long )addr; + get_addr_op.header.type =ENCL_OP_GET_FROM_ADDRESS ; + +EXPECT_EQ (ENCL_CALL (&get_addr_op, &self->run, true),0 ); + +EXPECT_EQ (get_addr_op.value,MAGIC ); +EXPECT_EEXIT (&self->run); +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); + +munmap (addr, edmm_size); +} +/* * SGX2 page type modification test in two phases: * Phase 1: tools/testing/selftests/sgx/main.h +0
-0@@ -35,7 +35,8 @@ extern unsigned char sign_key[]; extern unsignedchar sign_key_end[];Quoted 3 lines
tools/testing/selftests/sgx/main.h extern unsigned char sign_key[]; extern unsigned · line 39
Quoted 3 lines
tools/testing/selftests/sgx/main.h +1
-0void encl_delete(struct encl *ctx); -bool encl_load(const char *path, struct encl *encl, unsigned long heap_size); +bool encl_load(const char *path, struct encl *encl, unsigned long
heap_size,Quoted 16 lines
Quoted 16 lines
tools/testing/selftests/sgx/main.h +1
-0+ unsigned long edmm_size);bool encl_measure (struct encl *encl);bool encl_build (struct encl *encl); uint64_t encl_get_entry(struct encl *encl, const char*symbol); diff --git
a/tools/testing/selftests/sgx/sigstruct.cb/tools/testing/selftests/sgx/sigstruct.c
index50c5ab1aa6fa..6000cf0e4975100644tools/testing/selftests/sgx/sigstruct.c +1
-1@@ -343,7 +343,7 @@ bool encl_measure(struct encl *encl)if (!ctx) goto err; -if (!mrenclave_ecreate (ctx, encl->src_size)) +if (!mrenclave_ecreate (ctx, encl->encl_size)) goto err;
Quoted 8 lines
Quoted 6 lines
tools/testing/selftests/sgx/sigstruct.c bool encl_measure(struct encl *encl) · line 349
Quoted 1 line
tools/testing/selftests/sgx/sigstruct.c +0
-0for (i =0 ; i < encl->nr_segments; i++) {Looking at
mrenclave_ecreate()the above snippet seems separate from this test and incomplete since it now obtainsencl->encl_sizebut continues to compute it again internally. Should this be a separate fix?I would remove this part completely but this also needs comment from Vijay.
If we restrict the large enclave size just for this test, then the above change can be reverted. Calling mrenclave_ecreate with src_size esults in EINIT failure and I think the reason is because of incorrect MRenclave.
Quoted 5 lines
Quoted 2 lines
Reinette
BR, Jarkko
Regards, Vijay
Re: [PATCH 2/2] selftests/sgx: Add SGX selftest augment_via_eaccept_long
Hi Vijay,
Quoted 19 lines · Vijay
Hi Jarkko, Reinette,
Quoted 17 lines
-----Original Message-----
From: Jarkko Sakkinen <[email protected]>
Sent: Tuesday, August 16, 2022 4:34 PM
To: Chatre, Reinette <[email protected]>
Cc: Dave Hansen <[email protected]>; linux- [email protected]; Dhanraj, Vijay <[email protected]>; Shuah Khan <[email protected]>; open list:KERNEL SELFTEST FRAMEWORK <linux- [email protected]>; open list <[email protected]>
Subject: Re: [PATCH 2/2] selftests/sgx: Add SGX selftestaugment_via_eaccept_longQuoted 5 lines · Reinette Chatre
Hi Vijay,
Thank you very much for digging into this. A few comments below.
On 8/15/2022 4:39 PM, Jarkko Sakkinen wrote:
...
Quoted 14 lines
Quoted 14 lines
Quoted 13 lines
tools/testing/selftests/sgx/main.c static const uint64_t MAGIC = 0x1122334455667788ULL; · line 29
Quoted 7 lines
(quoted diff) +0
-0@@ -25,6 +25,8 @@ static const uint64_t MAGIC =
0x1122334455667788ULL; static constuint64_tMAGIC2 =0x8877665544332211ULL;vdso_sgx_enter_enclave_tvdso_sgx_enter_enclave;tools/testing/selftests/sgx/main.c +2
-0+static const unsigned long edmm_size =8589934592 ;//8G +Could you please elaborate how this constant was chosen? I understand that this test helped to uncover a bug and it is useful to add to the kernel. When doing so this test will be run on systems with a variety of SGX memory sizes, could you please elaborate (and add a snippet) how 8GB is the right value for all systems?
Quoted 8 lines
Quoted 5 lines
It is the only constant I know for sure that some people (Vijay and Haitao) have been able to reproduce the bug.
Unless someone can show that the same bug reproduces with a smaller constant, changing it would make the whole test irrelevant.
I tried with 2GB and it always succeed and with 4GB was able to repro sporadically. But with 8GB failure was consistent. One thing to note is even with 8GB Haitao couldn't reproduce this every time. So not sure if it good for all the systems but on my ICX system, I was able to consistently repro with this value.
Could all of this information be placed in a description of this constant? At this time it appears to be arbitrary.
Quoted 28 lines
Quoted 28 lines
Quoted 6 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept)
Quoted 5 lines
tools/testing/selftests/sgx/main.c +5
-0+ +if (!sgx2_supported ()) +SKIP (return,"SGX2 not supported" ); + + ASSERT_TRUE(setup_test_encl(ENCL_HEAP_SIZE_DEFAULT, &self-encl,
Quoted 10 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept)
Quoted 10 lines
tools/testing/selftests/sgx/main.c +10
-0+_metadata)); + +memset (&self->run,0 ,sizeof (self->run)); + self->run.tcs = self->encl.encl_base; + +for (i =0 ; i < self->encl.nr_segments; i++) { +struct encl_segment *seg = &self->encl.segment_tbl[i]; + + total_size += seg->size; + TH_LOG("test enclave: total_size = %ld, seg->size = %ld",
total_size,seg->size);Quoted 10 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1249
Quoted 8 lines
tools/testing/selftests/sgx/main.c +8
-0+ } + +/* +* Actual enclave size is expected to be larger than the loaded +* test enclave since enclave size must be a power of 2 in bytes while +* test_encl does not consume it all. +*/ +EXPECT_LT (total_size + edmm_size, self->encl.encl_size);Will this test ever fail?
Quoted 6 lines
Quoted 3 lines
With a *quick* look: no.
Vijay, what was the point of this check?
Yes we can remove this check. I tried to copy from
augment_via_eacceptand just changed the request size.
In augment_via_eaccept the check is required since augment_via_eaccept assumes that there is enough address space in the existing enclave for dynamic memory addition without needing to change the enclave size. If anybody later changes the test enclave to break this assumption then that check will pick it up.
In this new test the enclave size is set to accommodate the planned dynamic memory addition and thus adding a test to check if the enclave has enough space for the dynamic memory is not needed.
Quoted 37 lines
Quoted 37 lines
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +1
-0+ TH_LOG("Entering enclave to run EACCEPT for each page of %zdbytes may take a while ...",
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ edmm_size); + eaccept_op.flags = SGX_SECINFO_R | SGX_SECINFO_W |
SGX_SECINFO_REG|SGX_SECINFO_PENDING;Quoted 4 lines
Quoted 4 lines
tools/testing/selftests/sgx/main.c +4
-0+ eaccept_op.ret =0 ; + eaccept_op.header.type =ENCL_OP_EACCEPT ; + +for (i =0 ; i < edmm_size; i +=4096 ) {Quoted 8 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept)
Quoted 8 lines
tools/testing/selftests/sgx/main.c +8
-0+ eaccept_op.epc_addr = (uint64_t )(addr + i); + +EXPECT_EQ (ENCL_CALL (&eaccept_op, &self->run, true),0 ); +if (self->run.exception_vector ==14 && + self->run.exception_error_code ==4 && + self->run.exception_addr == self->encl.encl_base) { +munmap (addr, edmm_size); + SKIP(return, "Kernel does not support adding pagesto initialized enclave");
Quoted 18 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1300
Quoted 13 lines
tools/testing/selftests/sgx/main.c +13
-0+ } + +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); +ASSERT_EQ (eaccept_op.ret,0 ); +ASSERT_EQ (self->run.function,EEXIT ); + } + +/* +* New page should be accessible from within enclave - attempt to +* write to it. +*/ This portion below was also copied from previous test and by only testing a write to the first page of the range the purpose is not clear. Could you please elaborate if the intention is to only test accessibility of the first page and why that is sufficient?
Quoted 2 lines
Quoted 2 lines
It is sufficient because the test reproduces the bug. It would have to be rather elaborated why you would possibly want to do more than that.
That is fair. An accurate comment (currently an inaccurate copy&paste) would help to explain this part of the test.
Quoted 68 lines
Quoted 68 lines
Quoted 41 lines
Quoted 41 lines
tools/testing/selftests/sgx/main.c +30
-0+ put_addr_op.value =MAGIC ; + put_addr_op.addr = (unsigned long )addr; + put_addr_op.header.type =ENCL_OP_PUT_TO_ADDRESS ; + +EXPECT_EQ (ENCL_CALL (&put_addr_op, &self->run, true),0 ); + +EXPECT_EEXIT (&self->run); +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); + +/* +* Read memory from newly added page that was just written to, +* confirming that data previously written (MAGIC) is present. +*/ + get_addr_op.value =0 ; + get_addr_op.addr = (unsigned long )addr; + get_addr_op.header.type =ENCL_OP_GET_FROM_ADDRESS ; + +EXPECT_EQ (ENCL_CALL (&get_addr_op, &self->run, true),0 ); + +EXPECT_EQ (get_addr_op.value,MAGIC ); +EXPECT_EEXIT (&self->run); +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); + +munmap (addr, edmm_size); +} +/* * SGX2 page type modification test in two phases: * Phase 1: tools/testing/selftests/sgx/main.h +0
-0@@ -35,7 +35,8 @@ extern unsigned char sign_key[]; extern unsignedchar sign_key_end[];Quoted 3 lines
tools/testing/selftests/sgx/main.h extern unsigned char sign_key[]; extern unsigned · line 39
Quoted 3 lines
tools/testing/selftests/sgx/main.h +1
-0void encl_delete(struct encl *ctx); -bool encl_load(const char *path, struct encl *encl, unsigned long heap_size); +bool encl_load(const char *path, struct encl *encl, unsigned long
heap_size,Quoted 22 lines
Quoted 9 lines
tools/testing/selftests/sgx/main.h +1
-0+ unsigned long edmm_size);bool encl_measure (struct encl *encl);bool encl_build (struct encl *encl); uint64_t encl_get_entry(struct encl *encl, const char*symbol); diff --git
a/tools/testing/selftests/sgx/sigstruct.cb/tools/testing/selftests/sgx/sigstruct.c
index50c5ab1aa6fa..6000cf0e4975100644tools/testing/selftests/sgx/sigstruct.c bool encl_measure(struct encl *encl) · line 349
Quoted 8 lines
tools/testing/selftests/sgx/sigstruct.c +1
-1@@ -343,7 +343,7 @@ bool encl_measure(struct encl *encl)if (!ctx) goto err; -if (!mrenclave_ecreate (ctx, encl->src_size)) +if (!mrenclave_ecreate (ctx, encl->encl_size)) goto err;for (i =0 ; i < encl->nr_segments; i++) {Looking at
mrenclave_ecreate()the above snippet seems separate from this test and incomplete since it now obtainsencl->encl_sizebut continues to compute it again internally. Should this be a separate fix?
Quoted 3 lines
Quoted 1 line
I would remove this part completely but this also needs comment from Vijay.
If we restrict the large enclave size just for this test, then the above change can be reverted. Calling
mrenclave_ecreatewithsrc_sizeesults in EINIT failure and I think the reason is because of incorrect MRenclave.
From what I understand this change is needed since the enclave size is no longer just the size of all the segments at enclave creation. I think it is incomplete though since it still recomputes the enclave size even though it is now provided as parameter. This change does not need to be part of this test addition.
Reinette
Jarkko Sakkinen
maintainerRe: [PATCH 2/2] selftests/sgx: Add SGX selftest augment_via_eaccept_long
Quoted 10 lines · Reinette Chatre
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
This portion below was also copied from previous test and by only testing a write to the first page of the range the purpose is not clear. Could you please elaborate if the intention is to only test accessibility of the first page and why that is sufficient?
It is sufficient because the test reproduces the bug. It would have to be rather elaborated why you would possibly want to do more than that.
That is fair. An accurate comment (currently an inaccurate copy&paste) would help to explain this part of the test.
I would simply add something like:
/*
* Define memory pool size big enough to trigger the reclaimer in the EAUG
* path of the page reclaimer.
*/
Suggestions/edits obviously welcome for the comment.
BR, Jarkko
Jarkko Sakkinen
maintainerRe: [PATCH 2/2] selftests/sgx: Add SGX selftest augment_via_eaccept_long
Quoted 12 lines · Jarkko Sakkinen
Quoted 10 lines · Reinette Chatre
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
This portion below was also copied from previous test and by only testing a write to the first page of the range the purpose is not clear. Could you please elaborate if the intention is to only test accessibility of the first page and why that is sufficient?
It is sufficient because the test reproduces the bug. It would have to be rather elaborated why you would possibly want to do more than that.
That is fair. An accurate comment (currently an inaccurate copy&paste) would help to explain this part of the test.
Quoted 8 lines
I would simply add something like:
/*
* Define memory pool size big enough to trigger the reclaimer in the EAUG
* path of the page reclaimer.
*/Suggestions/edits obviously welcome for the comment.
I wonder if we could put .bt files somewhere to make them available. In root causing this bug bpftrace scripting was the key so it would nice to have them available along with kselftest.
I could imagine that we end up also in future to bugs allocation so it would have the script when you clone the kernel tree, and possibly more scripts in future.
E.g. add bt/alloc-error.bt under tools/testing/selftests/sgx.
BR, Jarkko
Re: [PATCH 2/2] selftests/sgx: Add SGX selftest augment_via_eaccept_long
Hi Jarkko,
Quoted 13 lines · Jarkko Sakkinen
Quoted 12 lines · Jarkko Sakkinen
Quoted 10 lines · Reinette Chatre
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
This portion below was also copied from previous test and by only testing a write to the first page of the range the purpose is not clear. Could you please elaborate if the intention is to only test accessibility of the first page and why that is sufficient?
It is sufficient because the test reproduces the bug. It would have to be rather elaborated why you would possibly want to do more than that.
That is fair. An accurate comment (currently an inaccurate copy&paste) would help to explain this part of the test.
Quoted 8 lines
Quoted 8 lines
I would simply add something like:
/*
* Define memory pool size big enough to trigger the reclaimer in the EAUG
* path of the page reclaimer.
*/Suggestions/edits obviously welcome for the comment.
The comment seems to better match the code below than the area referred to above:
static const unsigned long edmm_size = 8589934592; //8G
Even so, I think that raises the point that this is platform specific since edmm_size of 8GB would not trigger reclaimer on all platforms.
How about adjusting it to:
/*
* Define memory pool size big enough to trigger the reclaimer in the EAUG
* path of the page reclaimer on some platforms. This constant has been
* successful in triggering a bug on some platforms (independent of the
* platforms where the reclaimer is triggered) and thus considered
* appropriate for general use.
*/
Regarding the area referred to above, a comment like below may help:
/*
* Pool of pages were successfully added to enclave. Perform sanity
* check on first page of the pool only to ensure data can be written
* to and read from a dynamically added enclave page.
*/
Quoted 10 lines
I wonder if we could put .bt files somewhere to make them available. In root causing this bug bpftrace scripting was the key so it would nice to have them available along with kselftest.
I could imagine that we end up also in future to bugs allocation so it would have the script when you clone the kernel tree, and possibly more scripts in future.
E.g. add bt/alloc-error.bt under
tools/testing/selftests/sgx.
Thank you very much for helping to debug this issue. I also think the scripts you created are very valuable and making them easily accessible sounds great.
Reinette
Jarkko Sakkinen
maintainerRe: [PATCH 2/2] selftests/sgx: Add SGX selftest augment_via_eaccept_long
Quoted 58 lines · Reinette Chatre
Hi Jarkko,
Quoted 13 lines · Jarkko Sakkinen
Quoted 12 lines · Jarkko Sakkinen
Quoted 10 lines · Reinette Chatre
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
This portion below was also copied from previous test and by only testing a write to the first page of the range the purpose is not clear. Could you please elaborate if the intention is to only test accessibility of the first page and why that is sufficient?
It is sufficient because the test reproduces the bug. It would have to be rather elaborated why you would possibly want to do more than that.
That is fair. An accurate comment (currently an inaccurate copy&paste) would help to explain this part of the test.
Quoted 8 lines
Quoted 8 lines
I would simply add something like:
/*
* Define memory pool size big enough to trigger the reclaimer in the EAUG
* path of the page reclaimer.
*/Suggestions/edits obviously welcome for the comment.
The comment seems to better match the code below than the area referred to above:
static const unsigned long edmm_size = 8589934592; //8GEven so, I think that raises the point that this is platform specific since
edmm_sizeof 8GB would not trigger reclaimer on all platforms.How about adjusting it to:
/*
* Define memory pool size big enough to trigger the reclaimer in the EAUG
* path of the page reclaimer on some platforms. This constant has been
* successful in triggering a bug on some platforms (independent of the
* platforms where the reclaimer is triggered) and thus considered
* appropriate for general use.
*/Regarding the area referred to above, a comment like below may help:
/*
* Pool of pages were successfully added to enclave. Perform sanity
* check on first page of the pool only to ensure data can be written
* to and read from a dynamically added enclave page.
*/Quoted 9 lines
I wonder if we could put .bt files somewhere to make them available. In root causing this bug bpftrace scripting was the key so it would nice to have them available along with kselftest.
I could imagine that we end up also in future to bugs allocation so it would have the script when you clone the kernel tree, and possibly more scripts in future.
Quoted 5 lines
Quoted 1 line
E.g. add bt/alloc-error.bt under
tools/testing/selftests/sgx.Thank you very much for helping to debug this issue. I also think the scripts you created are very valuable and making them easily accessible sounds great.
Yeah, I mean they do no harm there, even if not directly used by the test program.
Thanks for the valuable feedback. I will incorporate it to the next version.
BR, Jarkko
RE: [PATCH 2/2] selftests/sgx: Add SGX selftest augment_via_eaccept_long
In reply to Reinette ChatreHi Reinette,
Quoted 60 lines
-----Original Message-----
From: Chatre, Reinette <[email protected]>
Sent: Tuesday, August 16, 2022 9:35 PM
To: Dhanraj, Vijay <[email protected]>; Jarkko Sakkinen <[email protected]>
Cc: Dave Hansen <[email protected]>; linux- [email protected]; Shuah Khan <[email protected]>; open list:KERNEL SELFTEST FRAMEWORK <[email protected]>; open list <linux- [email protected]>
Subject: Re: [PATCH 2/2] selftests/sgx: Add SGX selftestaugment_via_eaccept_longHi Vijay,
Quoted 9 lines · Vijay
Hi Jarkko, Reinette,
Quoted 7 lines
-----Original Message-----
From: Jarkko Sakkinen <[email protected]>
Sent: Tuesday, August 16, 2022 4:34 PM
To: Chatre, Reinette <[email protected]>
Cc: Dave Hansen <[email protected]>; linux- [email protected]; Dhanraj, Vijay <[email protected]>; Shuah Khan <[email protected]>; open list:KERNEL SELFTEST FRAMEWORK<linux-
Quoted 10 lines
Quoted 10 lines
[email protected]>; open list <[email protected]>
Subject: Re: [PATCH 2/2] selftests/sgx: Add SGX selftestaugment_via_eaccept_longQuoted 5 lines · Reinette Chatre
Hi Vijay,
Thank you very much for digging into this. A few comments below.
On 8/15/2022 4:39 PM, Jarkko Sakkinen wrote:
...
Quoted 15 lines
Quoted 15 lines
Quoted 14 lines
tools/testing/selftests/sgx/main.c static const uint64_t MAGIC = 0x1122334455667788ULL; · line 29
Quoted 7 lines
(quoted diff) +0
-0@@ -25,6 +25,8 @@ static const uint64_t MAGIC =
0x1122334455667788ULL; static constuint64_tMAGIC2 =0x8877665544332211ULL;vdso_sgx_enter_enclave_tvdso_sgx_enter_enclave;tools/testing/selftests/sgx/main.c +2
-0+static const unsigned long edmm_size =8589934592 ;//8G +Could you please elaborate how this constant was chosen? I understand that this test helped to uncover a bug and it is useful to add to the kernel. When doing so this test will be run on systems with a variety of SGX memory sizes, could you please elaborate (and add a
snippet) how 8GB is the right value for all systems?Quoted 7 lines
Quoted 5 lines
It is the only constant I know for sure that some people (Vijay and Haitao) have been able to reproduce the bug.
Unless someone can show that the same bug reproduces with a smaller constant, changing it would make the whole test irrelevant.
I tried with 2GB and it always succeed and with 4GB was able to repro
Quoted 8 lines
sporadically. But with 8GB failure was consistent. One thing to note is even with 8GB Haitao couldn't reproduce this every time. So not sure if it good for all the systems but on my ICX system, I was able to consistently repro with this value.
Quoted 1 line
Could all of this information be placed in a description of this constant? At this time it appears to be arbitrary.
Yes it makes sense to record the reason for this constant.
Quoted 34 lines
Quoted 29 lines
Quoted 29 lines
Quoted 7 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept)
Quoted 6 lines
tools/testing/selftests/sgx/main.c +5
-0+ +if (!sgx2_supported ()) +SKIP (return,"SGX2 not supported" ); + + ASSERT_TRUE(setup_test_encl(ENCL_HEAP_SIZE_DEFAULT, &self-encl,
Quoted 10 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept)
Quoted 10 lines
tools/testing/selftests/sgx/main.c +10
-0+_metadata)); + +memset (&self->run,0 ,sizeof (self->run)); + self->run.tcs = self->encl.encl_base; + +for (i =0 ; i < self->encl.nr_segments; i++) { +struct encl_segment *seg = &self->encl.segment_tbl[i]; + + total_size += seg->size; + TH_LOG("test enclave: total_size = %ld, seg->size = %ld",
total_size,seg->size);Quoted 10 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1249
Quoted 8 lines
tools/testing/selftests/sgx/main.c +8
-0+ } + +/* +* Actual enclave size is expected to be larger than the loaded +* test enclave since enclave size must be a power of 2 in bytes while +* test_encl does not consume it all. +*/ +EXPECT_LT (total_size + edmm_size, self->encl.encl_size);Will this test ever fail?
Quoted 5 lines
Quoted 3 lines
With a *quick* look: no.
Vijay, what was the point of this check?
Yes we can remove this check. I tried to copy from
augment_via_eaccept
Quoted 8 lines
and just changed the request size.
Quoted 1 line
In
augment_via_eacceptthe check is required sinceaugment_via_eacceptassumes that there is enough address space in the existing enclave for dynamic memory addition without needing to change the enclave size. If anybody later changes the test enclave to break this assumption then that check will pick it up.
Got it, thanks. Yes this check is can be removed.
Quoted 121 lines
In this new test the enclave size is set to accommodate the planned dynamic memory addition and thus adding a test to check if the enclave has enough space for the dynamic memory is not needed.
Quoted 37 lines
Quoted 37 lines
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +1
-0+ TH_LOG("Entering enclave to run EACCEPT for each page of %zdbytes may take a while ...",
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ edmm_size); + eaccept_op.flags = SGX_SECINFO_R | SGX_SECINFO_W |
SGX_SECINFO_REG|SGX_SECINFO_PENDING;Quoted 4 lines
Quoted 4 lines
tools/testing/selftests/sgx/main.c +4
-0+ eaccept_op.ret =0 ; + eaccept_op.header.type =ENCL_OP_EACCEPT ; + +for (i =0 ; i < edmm_size; i +=4096 ) {Quoted 8 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept)
Quoted 8 lines
tools/testing/selftests/sgx/main.c +8
-0+ eaccept_op.epc_addr = (uint64_t )(addr + i); + +EXPECT_EQ (ENCL_CALL (&eaccept_op, &self->run, true),0 ); +if (self->run.exception_vector ==14 && + self->run.exception_error_code ==4 && + self->run.exception_addr == self->encl.encl_base) { +munmap (addr, edmm_size); + SKIP(return, "Kernel does not support adding pagesto initialized enclave");
Quoted 18 lines
tools/testing/selftests/sgx/main.c TEST_F(enclave, augment_via_eaccept) · line 1300
Quoted 13 lines
tools/testing/selftests/sgx/main.c +13
-0+ } + +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); +ASSERT_EQ (eaccept_op.ret,0 ); +ASSERT_EQ (self->run.function,EEXIT ); + } + +/* +* New page should be accessible from within enclave - attempt to +* write to it. +*/ This portion below was also copied from previous test and by only testing a write to the first page of the range the purpose is not clear. Could you please elaborate if the intention is to only test accessibility of the first page and why that is sufficient?
Quoted 2 lines
Quoted 2 lines
It is sufficient because the test reproduces the bug. It would have to be rather elaborated why you would possibly want to do more than
that.
That is fair. An accurate comment (currently an inaccurate copy&paste) would help to explain this part of the test.
Quoted 61 lines
Quoted 61 lines
Quoted 41 lines
Quoted 41 lines
tools/testing/selftests/sgx/main.c +30
-0+ put_addr_op.value =MAGIC ; + put_addr_op.addr = (unsigned long )addr; + put_addr_op.header.type =ENCL_OP_PUT_TO_ADDRESS ; + +EXPECT_EQ (ENCL_CALL (&put_addr_op, &self->run, true),0 ); + +EXPECT_EEXIT (&self->run); +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); + +/* +* Read memory from newly added page that was just written to, +* confirming that data previously written (MAGIC) is present. +*/ + get_addr_op.value =0 ; + get_addr_op.addr = (unsigned long )addr; + get_addr_op.header.type =ENCL_OP_GET_FROM_ADDRESS ; + +EXPECT_EQ (ENCL_CALL (&get_addr_op, &self->run, true),0 ); + +EXPECT_EQ (get_addr_op.value,MAGIC ); +EXPECT_EEXIT (&self->run); +EXPECT_EQ (self->run.exception_vector,0 ); +EXPECT_EQ (self->run.exception_error_code,0 ); +EXPECT_EQ (self->run.exception_addr,0 ); + +munmap (addr, edmm_size); +} +/* * SGX2 page type modification test in two phases: * Phase 1: tools/testing/selftests/sgx/main.h +0
-0@@ -35,7 +35,8 @@ extern unsigned char sign_key[]; extern unsignedchar sign_key_end[];Quoted 3 lines
tools/testing/selftests/sgx/main.h extern unsigned char sign_key[]; extern unsigned · line 39
Quoted 3 lines
tools/testing/selftests/sgx/main.h +1
-0void encl_delete(struct encl *ctx); -bool encl_load(const char *path, struct encl *encl, unsigned long heap_size); +bool encl_load(const char *path, struct encl *encl, unsigned long
heap_size,Quoted 16 lines
Quoted 16 lines
tools/testing/selftests/sgx/main.h +1
-0+ unsigned long edmm_size);bool encl_measure (struct encl *encl);bool encl_build (struct encl *encl); uint64_t encl_get_entry(struct encl *encl, const char*symbol); diff --git
a/tools/testing/selftests/sgx/sigstruct.cb/tools/testing/selftests/sgx/sigstruct.c
index50c5ab1aa6fa..6000cf0e4975100644tools/testing/selftests/sgx/sigstruct.c +1
-1@@ -343,7 +343,7 @@ bool encl_measure(struct encl *encl)if (!ctx) goto err; -if (!mrenclave_ecreate (ctx, encl->src_size)) +if (!mrenclave_ecreate (ctx, encl->encl_size)) goto err;Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
tools/testing/selftests/sgx/sigstruct.c bool encl_measure(struct encl *encl) · line 349
Quoted 1 line
tools/testing/selftests/sgx/sigstruct.c +0
-0for (i =0 ; i < encl->nr_segments; i++) {Looking at
mrenclave_ecreate()the above snippet seems separate from this test and incomplete since it now obtainsencl->encl_sizebut continues to compute it again internally. Should this be a separate fix?I would remove this part completely but this also needs comment from
Vijay.
Quoted 2 lines
If we restrict the large enclave size just for this test, then the above change
Quoted 8 lines
can be reverted. Calling
mrenclave_ecreatewithsrc_sizeesults in EINIT failure and I think the reason is because of incorrect MRenclave.From what I understand this change is needed since the enclave size is no longer just the size of all the segments at enclave creation. I think it is incomplete though since it still recomputes the enclave size even though it is now provided as parameter.
This change does not need to be part of this test addition.
I see your point and this change can be removed from the test.
Quoted 2 lines
Reinette
Regards, Vijay
Jarkko Sakkinen
maintainerRe: [PATCH 2/2] selftests/sgx: Add SGX selftest augment_via_eaccept_long
In reply to Dhanraj, VijayQuoted 2 lines · Vijay
I think changing it to "int i" will cause a buffer overflow with
edmm_sizebeing 8GB.
Hmm.. 'i' iterates segments. Amd I missing something?
BR, Jarkko
RE: [PATCH 2/2] selftests/sgx: Add SGX selftest augment_via_eaccept_long
Quoted 13 lines
-----Original Message-----
From: Jarkko Sakkinen <[email protected]>
Sent: Wednesday, August 17, 2022 7:39 AM
To: Dhanraj, Vijay <[email protected]>
Cc: Chatre, Reinette <[email protected]>; Dave Hansen <[email protected]>; [email protected]; Shuah Khan <[email protected]>; open list:KERNEL SELFTEST FRAMEWORK <linux- [email protected]>; open list <[email protected]>
Subject: Re: [PATCH 2/2] selftests/sgx: Add SGX selftestaugment_via_eaccept_long
Quoted 7 lines
Quoted 2 lines · Vijay
I think changing it to "int i" will cause a buffer overflow with
edmm_sizebeing 8GB.Hmm.. 'i' iterates segments. Amd I missing something?
BR, Jarkko
It is also used when iterating over pages to eaccept. This might cause an issue.
for (i = 0; i < edmm_size; i += 4096) {
eaccept_op.epc_addr = (uint64_t)(addr + i);Regards, Vijay
Jarkko Sakkinen
maintainerRe: [PATCH 2/2] selftests/sgx: Add SGX selftest augment_via_eaccept_long
Quoted 19 lines · Vijay
Quoted 19 lines
-----Original Message-----
From: Jarkko Sakkinen <[email protected]>
Sent: Wednesday, August 17, 2022 7:39 AM
To: Dhanraj, Vijay <[email protected]>
Cc: Chatre, Reinette <[email protected]>; Dave Hansen <[email protected]>; [email protected]; Shuah Khan <[email protected]>; open list:KERNEL SELFTEST FRAMEWORK <linux- [email protected]>; open list <[email protected]>
Subject: Re: [PATCH 2/2] selftests/sgx: Add SGX selftestaugment_via_eaccept_longQuoted 2 lines · Vijay
I think changing it to "int i" will cause a buffer overflow with
edmm_sizebeing 8GB.Hmm.. 'i' iterates segments. Amd I missing something?
Quoted 8 lines
Quoted 1 line
BR, Jarkko
It is also used when iterating over pages to eaccept. This might cause an issue.
for (i = 0; i < edmm_size; i += 4096) { eaccept_op.epc_addr = (uint64_t)(addr + i);Regards, Vijay
Ah got it, thanks.
BR, Jarkko