selftests/sgx: retry the ioctls returned with EAGAIN
PATCH 1/1 selftests/sgx: retry the ioctls returned with EAGAIN
For EMODT and EREMOVE ioctls with a large range, kernel may not finish in one shot and return EAGAIN error code and count of bytes of EPC pages on that operations are finished successfully.
Change the unclobbered_vdso_oversubscribed_remove test to rerun the ioctls in a loop, updating offset and length using the byte count returned in each iteration.
--- tools/testing/selftests/sgx/main.c | 39 +++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 9 deletions(-)
tools/testing/selftests/sgx/main.c +30 -9
@@ -391,7 +391,7 @@ TEST_F_TIMEOUT(enclave, unclobbered_vdso_oversubscribed_remove, 900)unsigned long total_mem;int ret, errno_save;unsigned long addr; -unsigned long i; +unsigned long i, count;/* * Create enclave with additional heap that is as big as all
@@ -453,16 +453,27 @@ TEST_F_TIMEOUT(enclave, unclobbered_vdso_oversubscribed_remove, 900) modt_ioc.offset = heap->offset; modt_ioc.length = heap->size; modt_ioc.page_type =SGX_PAGE_TYPE_TRIM ; - + count =0 ;TH_LOG ("Changing type of %zd bytes to trimmed may take a while ..." , heap->size); - ret =ioctl (self->encl.fd,SGX_IOC_ENCLAVE_MODIFY_TYPES , &modt_ioc); - errno_save = ret ==-1 ? errno :0 ; +do { + ret =ioctl (self->encl.fd,SGX_IOC_ENCLAVE_MODIFY_TYPES , &modt_ioc); + errno_save = ret ==-1 ? errno :0 ; +if (errno_save ==EAGAIN ) { + count += modt_ioc.count; + modt_ioc.offset += modt_ioc.count; + modt_ioc.length -= modt_ioc.count; + modt_ioc.result=0 ; + modt_ioc.count =0 ; + }else +break ; + }while (modt_ioc.length !=0 );EXPECT_EQ (ret,0 );EXPECT_EQ (errno_save,0 );EXPECT_EQ (modt_ioc.result,0 ); -EXPECT_EQ (modt_ioc.count, heap->size); + count += modt_ioc.count; +EXPECT_EQ (count, heap->size);/* EACCEPT all removed pages. */ addr = self->encl.encl_base + heap->offset;
@@ -490,15 +501,25 @@ TEST_F_TIMEOUT(enclave, unclobbered_vdso_oversubscribed_remove, 900) remove_ioc.offset = heap->offset; remove_ioc.length = heap->size; - + count =0 ;TH_LOG ("Removing %zd bytes from enclave may take a while ..." , heap->size); - ret =ioctl (self->encl.fd,SGX_IOC_ENCLAVE_REMOVE_PAGES , &remove_ioc); - errno_save = ret ==-1 ? errno :0 ; +do { + ret =ioctl (self->encl.fd,SGX_IOC_ENCLAVE_REMOVE_PAGES , &remove_ioc); + errno_save = ret ==-1 ? errno :0 ; +if (errno_save ==EAGAIN ) { + count += remove_ioc.count; + remove_ioc.offset += remove_ioc.count; + remove_ioc.length -= remove_ioc.count; + remove_ioc.count =0 ; + }else +break ; + }while (remove_ioc.length !=0 );EXPECT_EQ (ret,0 );EXPECT_EQ (errno_save,0 ); -EXPECT_EQ (remove_ioc.count, heap->size); + count += remove_ioc.count; +EXPECT_EQ (count, heap->size); }TEST_F (enclave, clobbered_vdso)
Signature · 1 line
2.25.1
Quoted 92 lines · Haitao Huang
For EMODT and EREMOVE ioctls with a large range, kernel may not finish in one shot and return EAGAIN error code and count of bytes of EPC pages on that operations are finished successfully.
Change the
unclobbered_vdso_oversubscribed_removetest to rerun the ioctls in a loop, updating offset and length using the byte count returned in each iteration.Signed-off-by Haitao Huang <[email protected]>--- tools/testing/selftests/sgx/main.c | 39 +++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 9 deletions(-)tools/testing/selftests/sgx/main.c +30
-9@@ -391,7 +391,7 @@ TEST_F_TIMEOUT(enclave, unclobbered_vdso_oversubscribed_remove, 900)unsigned long total_mem;int ret, errno_save;unsigned long addr; -unsigned long i; +unsigned long i, count;/* * Create enclave with additional heap that is as big as all @@ -453,16 +453,27 @@ TEST_F_TIMEOUT(enclave, unclobbered_vdso_oversubscribed_remove, 900) modt_ioc.offset = heap->offset; modt_ioc.length = heap->size; modt_ioc.page_type =SGX_PAGE_TYPE_TRIM ; - + count =0 ;TH_LOG ("Changing type of %zd bytes to trimmed may take a while ..." , heap->size); - ret =ioctl (self->encl.fd,SGX_IOC_ENCLAVE_MODIFY_TYPES , &modt_ioc); - errno_save = ret ==-1 ? errno :0 ; +do { + ret =ioctl (self->encl.fd,SGX_IOC_ENCLAVE_MODIFY_TYPES , &modt_ioc); + errno_save = ret ==-1 ? errno :0 ; +if (errno_save ==EAGAIN ) { + count += modt_ioc.count; + modt_ioc.offset += modt_ioc.count; + modt_ioc.length -= modt_ioc.count; + modt_ioc.result=0 ; + modt_ioc.count =0 ; + }else +break ; + }while (modt_ioc.length !=0 );EXPECT_EQ (ret,0 );EXPECT_EQ (errno_save,0 );EXPECT_EQ (modt_ioc.result,0 ); -EXPECT_EQ (modt_ioc.count, heap->size); + count += modt_ioc.count; +EXPECT_EQ (count, heap->size);/* EACCEPT all removed pages. */ addr = self->encl.encl_base + heap->offset;@@ -490,15 +501,25 @@ TEST_F_TIMEOUT(enclave, unclobbered_vdso_oversubscribed_remove, 900) remove_ioc.offset = heap->offset; remove_ioc.length = heap->size; - + count =0 ;TH_LOG ("Removing %zd bytes from enclave may take a while ..." , heap->size); - ret =ioctl (self->encl.fd,SGX_IOC_ENCLAVE_REMOVE_PAGES , &remove_ioc); - errno_save = ret ==-1 ? errno :0 ; +do { + ret =ioctl (self->encl.fd,SGX_IOC_ENCLAVE_REMOVE_PAGES , &remove_ioc); + errno_save = ret ==-1 ? errno :0 ; +if (errno_save ==EAGAIN ) { + count += remove_ioc.count; + remove_ioc.offset += remove_ioc.count; + remove_ioc.length -= remove_ioc.count; + remove_ioc.count =0 ; + }else +break ; + }while (remove_ioc.length !=0 );EXPECT_EQ (ret,0 );EXPECT_EQ (errno_save,0 ); -EXPECT_EQ (remove_ioc.count, heap->size); + count += remove_ioc.count; +EXPECT_EQ (count, heap->size); }TEST_F (enclave, clobbered_vdso)Signature · 1 line
2.25.1
Thank you.
BR, Jarkko
PATCH 1/1 selftests/sgx: retry the ioctls returned with EAGAIN
For EMODT and EREMOVE ioctls with a large range, kernel may not finish in one shot and return EAGAIN error code and count of bytes of EPC pages on that operations are finished successfully.
Change the unclobbered_vdso_oversubscribed_remove test to rerun the ioctls in a loop, updating offset and length using the byte count returned in each iteration.
--- tools/testing/selftests/sgx/main.c | 39 +++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 9 deletions(-)
tools/testing/selftests/sgx/main.c +30 -9
@@ -391,7 +391,7 @@ TEST_F_TIMEOUT(enclave, unclobbered_vdso_oversubscribed_remove, 900)unsigned long total_mem;int ret, errno_save;unsigned long addr; -unsigned long i; +unsigned long i, count;/* * Create enclave with additional heap that is as big as all
@@ -453,16 +453,27 @@ TEST_F_TIMEOUT(enclave, unclobbered_vdso_oversubscribed_remove, 900) modt_ioc.offset = heap->offset; modt_ioc.length = heap->size; modt_ioc.page_type =SGX_PAGE_TYPE_TRIM ; - + count =0 ;TH_LOG ("Changing type of %zd bytes to trimmed may take a while ..." , heap->size); - ret =ioctl (self->encl.fd,SGX_IOC_ENCLAVE_MODIFY_TYPES , &modt_ioc); - errno_save = ret ==-1 ? errno :0 ; +do { + ret =ioctl (self->encl.fd,SGX_IOC_ENCLAVE_MODIFY_TYPES , &modt_ioc); + errno_save = ret ==-1 ? errno :0 ; +if (errno_save ==EAGAIN ) { + count += modt_ioc.count; + modt_ioc.offset += modt_ioc.count; + modt_ioc.length -= modt_ioc.count; + modt_ioc.result =0 ; + modt_ioc.count =0 ; + }else +break ; + }while (modt_ioc.length !=0 );EXPECT_EQ (ret,0 );EXPECT_EQ (errno_save,0 );EXPECT_EQ (modt_ioc.result,0 ); -EXPECT_EQ (modt_ioc.count, heap->size); + count += modt_ioc.count; +EXPECT_EQ (count, heap->size);/* EACCEPT all removed pages. */ addr = self->encl.encl_base + heap->offset;
@@ -490,15 +501,25 @@ TEST_F_TIMEOUT(enclave, unclobbered_vdso_oversubscribed_remove, 900) remove_ioc.offset = heap->offset; remove_ioc.length = heap->size; - + count =0 ;TH_LOG ("Removing %zd bytes from enclave may take a while ..." , heap->size); - ret =ioctl (self->encl.fd,SGX_IOC_ENCLAVE_REMOVE_PAGES , &remove_ioc); - errno_save = ret ==-1 ? errno :0 ; +do { + ret =ioctl (self->encl.fd,SGX_IOC_ENCLAVE_REMOVE_PAGES , &remove_ioc); + errno_save = ret ==-1 ? errno :0 ; +if (errno_save ==EAGAIN ) { + count += remove_ioc.count; + remove_ioc.offset += remove_ioc.count; + remove_ioc.length -= remove_ioc.count; + remove_ioc.count =0 ; + }else +break ; + }while (remove_ioc.length !=0 );EXPECT_EQ (ret,0 );EXPECT_EQ (errno_save,0 ); -EXPECT_EQ (remove_ioc.count, heap->size); + count += remove_ioc.count; +EXPECT_EQ (count, heap->size); }TEST_F (enclave, clobbered_vdso)
Signature · 1 line
2.25.1
Quoted 11 lines · Haitao Huang
For EMODT and EREMOVE ioctls with a large range, kernel may not finish in one shot and return EAGAIN error code and count of bytes of EPC pages on that operations are finished successfully.
Change the
unclobbered_vdso_oversubscribed_removetest to rerun the ioctls in a loop, updating offset and length using the byte count returned in each iteration.Signed-off-by Haitao Huang <[email protected]>Reviewed-by Jarkko Sakkinen <[email protected]>
Also,
Dave, in addition to [*], these should be picked x86 tree for v6.0
https://lore.kernel.org/linux-sgx/[email protected]/T/#t
BR, Jarkko
Quoted 3 lines · Jarkko Sakkinen
Dave, in addition to [*], these should be picked x86 tree for v6.0
Was there an ack somewhere in that thread that I missed?
Jarkko Sakkinen
maintainerQuoted 6 lines · Dave Hansen
Quoted 3 lines · Jarkko Sakkinen
Dave, in addition to [*], these should be picked x86 tree for v6.0
Was there an ack somewhere in that thread that I missed?
Yes, both had mine.
I sent both unmodified bundled into a single patch set, except cosmetic changes to the commit message. The discussion that followed up came up a day later I've send that response.
The next version will be lacking ack's, given that I'm modifying the patches, i.e. will be disqualified to review them.
BR, Jarkko
Jarkko Sakkinen
maintainerQuoted 8 lines · Jarkko Sakkinen
Quoted 6 lines · Dave Hansen
Quoted 3 lines · Jarkko Sakkinen
Dave, in addition to [*], these should be picked x86 tree for v6.0
Was there an ack somewhere in that thread that I missed?
Quoted 8 lines
Yes, both had mine.
I sent both unmodified bundled into a single patch set, except cosmetic changes to the commit message. The discussion that followed up came up a day later I've send that response.
The next version will be lacking ack's, given that I'm modifying the patches, i.e. will be disqualified to review them.
Also, the next version will include additional patch for a bpftrace script derived from what I tossed with Haitao in order to root cause the error. Probably useful to have available, as it did the trick.
BR, Jarkko