Commit 065825db authored by Jarkko Sakkinen's avatar Jarkko Sakkinen Committed by Dave Hansen

selftests/sgx: Move setup_test_encl() to each TEST_F()

Create the test enclave inside each TEST_F(), instead of FIXTURE_SETUP(),
so that the heap size can be defined per test.
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Acked-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Link: https://lkml.kernel.org/r/70ca264535d2ca0dc8dcaf2281e7d6965f8d4a24.1636997631.git.reinette.chatre@intel.com
parent 1b35eb71
...@@ -191,10 +191,6 @@ static bool setup_test_encl(unsigned long heap_size, struct encl *encl, ...@@ -191,10 +191,6 @@ static bool setup_test_encl(unsigned long heap_size, struct encl *encl,
FIXTURE_SETUP(enclave) FIXTURE_SETUP(enclave)
{ {
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;
} }
FIXTURE_TEARDOWN(enclave) FIXTURE_TEARDOWN(enclave)
...@@ -226,6 +222,11 @@ TEST_F(enclave, unclobbered_vdso) ...@@ -226,6 +222,11 @@ TEST_F(enclave, unclobbered_vdso)
{ {
struct encl_op op; struct encl_op op;
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;
op.type = ENCL_OP_PUT; op.type = ENCL_OP_PUT;
op.buffer = MAGIC; op.buffer = MAGIC;
...@@ -248,6 +249,11 @@ TEST_F(enclave, clobbered_vdso) ...@@ -248,6 +249,11 @@ TEST_F(enclave, clobbered_vdso)
{ {
struct encl_op op; struct encl_op op;
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;
op.type = ENCL_OP_PUT; op.type = ENCL_OP_PUT;
op.buffer = MAGIC; op.buffer = MAGIC;
...@@ -278,6 +284,11 @@ TEST_F(enclave, clobbered_vdso_and_user_function) ...@@ -278,6 +284,11 @@ TEST_F(enclave, clobbered_vdso_and_user_function)
{ {
struct encl_op op; struct encl_op op;
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;
self->run.user_handler = (__u64)test_handler; self->run.user_handler = (__u64)test_handler;
self->run.user_data = 0xdeadbeef; self->run.user_data = 0xdeadbeef;
......
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