Hi Jarkko, On 8/31/2022 10:38 AM, Jarkko Sakkinen wrote: > From: Vijay Dhanraj <vijay.dhanraj@xxxxxxxxx> > > 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. > > Signed-off-by: Vijay Dhanraj <vijay.dhanraj@xxxxxxxxx> > Co-developed-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx> > Signed-off-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx> > --- > v3: > - Addressed Reinette's feedback: > https://lore.kernel.org/linux-sgx/bd5285dd-d6dd-8a46-fca9-728db5e2f369@xxxxxxxxx/ > v2: > - Addressed Reinette's feedback: > https://lore.kernel.org/linux-sgx/24bd8e42-ff4e-0090-d9e1-cd81e4807f21@xxxxxxxxx/ > --- > tools/testing/selftests/sgx/load.c | 5 +- > tools/testing/selftests/sgx/main.c | 143 +++++++++++++++++++++++++---- > tools/testing/selftests/sgx/main.h | 3 +- Is this test passing on your system? This version is missing the change to mrenclave_ecreate() that causes SGX_IOC_ENCLAVE_INIT to fail when I try it out. > 3 files changed, 130 insertions(+), 21 deletions(-) > > diff --git a/tools/testing/selftests/sgx/load.c b/tools/testing/selftests/sgx/load.c > index 94bdeac1cf04..47b2786d6a77 100644 > --- a/tools/testing/selftests/sgx/load.c > +++ b/tools/testing/selftests/sgx/load.c > @@ -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; > diff --git a/tools/testing/selftests/sgx/main.c b/tools/testing/selftests/sgx/main.c > index 9820b3809c69..c5aa9f323745 100644 > --- a/tools/testing/selftests/sgx/main.c > +++ b/tools/testing/selftests/sgx/main.c > @@ -23,6 +23,10 @@ > > static const uint64_t MAGIC = 0x1122334455667788ULL; > static const uint64_t MAGIC2 = 0x8877665544332211ULL; > +/* Message-ID: <DM8PR11MB55912A7F47A84EC9913A6352F6999@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> */ > +static const uint64_t EDMM_SIZE_LONG = 8L * 1024L * 1024L * 1024L; > +static const uint64_t TIMEOUT_LONG = 900; /* seconds */ > + Apologies if my feedback was vague - I actually think that the comments in V1 added valuable information, it was just the variation in formatting that was distracting. Reinette
