selftests/sgx: Rename test properties in preparation for more enclave tests

SGX selftests prepares a data structure outside of the enclave with
the type of and data for the operation that needs to be run within
the enclave. At this time only two complementary operations are supported
by the enclave: copying a value from outside the enclave into a default
buffer within the enclave and reading a value from the enclave's default
buffer into a variable accessible outside the enclave.

In preparation for more operations supported by the enclave the names of the
current enclave operations are changed to more accurately reflect the
operations and more easily distinguish it from future operations:

* The enums ENCL_OP_PUT and ENCL_OP_GET are renamed to ENCL_OP_PUT_TO_BUFFER
  and ENCL_OP_GET_FROM_BUFFER respectively.
* The structs encl_op_put and encl_op_get are renamed to encl_op_put_to_buf
  and encl_op_get_from_buf respectively.
* The enclave functions do_encl_op_put and do_encl_op_get are renamed to
  do_encl_op_put_to_buf and do_encl_op_get_from_buf respectively.

No functional changes.

Suggested-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Jarkko Sakkinen <jarkko@kernel.org>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lkml.kernel.org/r/023fda047c787cf330b88ed9337705edae6a0078.1636997631.git.reinette.chatre@intel.com

diff --git a/tools/testing/selftests/sgx/defines.h b/tools/testing/selftests/sgx/defines.h
index 6ff95a766287edd26b0722e5a5c822a07f51f0d0..9ea0c7882dfb18a0efe6addc62057c331e091d28 100644 (file)
--- a/tools/testing/selftests/sgx/defines.h
+++ b/tools/testing/selftests/sgx/defines.h
@@ -19,8 +19,8 @@
 #include "../../../../arch/x86/include/uapi/asm/sgx.h"
 
 enum encl_op_type {
-       ENCL_OP_PUT,
-       ENCL_OP_GET,
+       ENCL_OP_PUT_TO_BUFFER,
+       ENCL_OP_GET_FROM_BUFFER,
        ENCL_OP_MAX,
 };
 
@@ -28,12 +28,12 @@ struct encl_op_header {
        uint64_t type;
 };
 
-struct encl_op_put {
+struct encl_op_put_to_buf {
        struct encl_op_header header;
        uint64_t value;
 };
 
-struct encl_op_get {
+struct encl_op_get_from_buf {
        struct encl_op_header header;
        uint64_t value;
 };

diff --git a/tools/testing/selftests/sgx/main.c b/tools/testing/selftests/sgx/main.c
index 3996c00486b60e6eb9501f55d5c416e7127863b3..61321229e48555b1d0e2a046b9812df2e0b3c062 100644 (file)
--- a/tools/testing/selftests/sgx/main.c
+++ b/tools/testing/selftests/sgx/main.c
@@ -220,15 +220,15 @@ FIXTURE_TEARDOWN(enclave)
 
 TEST_F(enclave, unclobbered_vdso)
 {
-       struct encl_op_put put_op;
-       struct encl_op_get get_op;
+       struct encl_op_get_from_buf get_op;
+       struct encl_op_put_to_buf put_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;
 
-       put_op.header.type = ENCL_OP_PUT;
+       put_op.header.type = ENCL_OP_PUT_TO_BUFFER;
        put_op.value = MAGIC;
 
        EXPECT_EQ(ENCL_CALL(&put_op, &self->run, false), 0);
@@ -236,7 +236,7 @@ TEST_F(enclave, unclobbered_vdso)
        EXPECT_EEXIT(&self->run);
        EXPECT_EQ(self->run.user_data, 0);
 
-       get_op.header.type = ENCL_OP_GET;
+       get_op.header.type = ENCL_OP_GET_FROM_BUFFER;
        get_op.value = 0;
 
        EXPECT_EQ(ENCL_CALL(&get_op, &self->run, false), 0);
@@ -292,9 +292,9 @@ static unsigned long get_total_epc_mem(void)
 
 TEST_F(enclave, unclobbered_vdso_oversubscribed)
 {
+       struct encl_op_get_from_buf get_op;
+       struct encl_op_put_to_buf put_op;
        unsigned long total_mem;
-       struct encl_op_put put_op;
-       struct encl_op_get get_op;
 
        total_mem = get_total_epc_mem();
        ASSERT_NE(total_mem, 0);
@@ -303,7 +303,7 @@ TEST_F(enclave, unclobbered_vdso_oversubscribed)
        memset(&self->run, 0, sizeof(self->run));
        self->run.tcs = self->encl.encl_base;
 
-       put_op.header.type = ENCL_OP_PUT;
+       put_op.header.type = ENCL_OP_PUT_TO_BUFFER;
        put_op.value = MAGIC;
 
        EXPECT_EQ(ENCL_CALL(&put_op, &self->run, false), 0);
@@ -311,7 +311,7 @@ TEST_F(enclave, unclobbered_vdso_oversubscribed)
        EXPECT_EEXIT(&self->run);
        EXPECT_EQ(self->run.user_data, 0);
 
-       get_op.header.type = ENCL_OP_GET;
+       get_op.header.type = ENCL_OP_GET_FROM_BUFFER;
        get_op.value = 0;
 
        EXPECT_EQ(ENCL_CALL(&get_op, &self->run, false), 0);
@@ -324,15 +324,15 @@ TEST_F(enclave, unclobbered_vdso_oversubscribed)
 
 TEST_F(enclave, clobbered_vdso)
 {
-       struct encl_op_put put_op;
-       struct encl_op_get get_op;
+       struct encl_op_get_from_buf get_op;
+       struct encl_op_put_to_buf put_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;
 
-       put_op.header.type = ENCL_OP_PUT;
+       put_op.header.type = ENCL_OP_PUT_TO_BUFFER;
        put_op.value = MAGIC;
 
        EXPECT_EQ(ENCL_CALL(&put_op, &self->run, true), 0);
@@ -340,7 +340,7 @@ TEST_F(enclave, clobbered_vdso)
        EXPECT_EEXIT(&self->run);
        EXPECT_EQ(self->run.user_data, 0);
 
-       get_op.header.type = ENCL_OP_GET;
+       get_op.header.type = ENCL_OP_GET_FROM_BUFFER;
        get_op.value = 0;
 
        EXPECT_EQ(ENCL_CALL(&get_op, &self->run, true), 0);
@@ -360,8 +360,8 @@ static int test_handler(long rdi, long rsi, long rdx, long ursp, long r8, long r
 
 TEST_F(enclave, clobbered_vdso_and_user_function)
 {
-       struct encl_op_put put_op;
-       struct encl_op_get get_op;
+       struct encl_op_get_from_buf get_op;
+       struct encl_op_put_to_buf put_op;
 
        ASSERT_TRUE(setup_test_encl(ENCL_HEAP_SIZE_DEFAULT, &self->encl, _metadata));
 
@@ -371,7 +371,7 @@ TEST_F(enclave, clobbered_vdso_and_user_function)
        self->run.user_handler = (__u64)test_handler;
        self->run.user_data = 0xdeadbeef;
 
-       put_op.header.type = ENCL_OP_PUT;
+       put_op.header.type = ENCL_OP_PUT_TO_BUFFER;
        put_op.value = MAGIC;
 
        EXPECT_EQ(ENCL_CALL(&put_op, &self->run, true), 0);
@@ -379,7 +379,7 @@ TEST_F(enclave, clobbered_vdso_and_user_function)
        EXPECT_EEXIT(&self->run);
        EXPECT_EQ(self->run.user_data, 0);
 
-       get_op.header.type = ENCL_OP_GET;
+       get_op.header.type = ENCL_OP_GET_FROM_BUFFER;
        get_op.value = 0;
 
        EXPECT_EQ(ENCL_CALL(&get_op, &self->run, true), 0);

diff --git a/tools/testing/selftests/sgx/test_encl.c b/tools/testing/selftests/sgx/test_encl.c
index f11eb8315704c7727c47fc04e25564a33d830c50..4e8da738173f204ab414b985b523a255b6842f21 100644 (file)
--- a/tools/testing/selftests/sgx/test_encl.c
+++ b/tools/testing/selftests/sgx/test_encl.c
@@ -16,16 +16,16 @@ static void *memcpy(void *dest, const void *src, size_t n)
        return dest;
 }
 
-static void do_encl_op_put(void *op)
+static void do_encl_op_put_to_buf(void *op)
 {
-       struct encl_op_put *op2 = op;
+       struct encl_op_put_to_buf *op2 = op;
 
        memcpy(&encl_buffer[0], &op2->value, 8);
 }
 
-static void do_encl_op_get(void *op)
+static void do_encl_op_get_from_buf(void *op)
 {
-       struct encl_op_get *op2 = op;
+       struct encl_op_get_from_buf *op2 = op;
 
        memcpy(&op2->value, &encl_buffer[0], 8);
 }
@@ -33,8 +33,8 @@ static void do_encl_op_get(void *op)
 void encl_body(void *rdi,  void *rsi)
 {
        const void (*encl_op_array[ENCL_OP_MAX])(void *) = {
-               do_encl_op_put,
-               do_encl_op_get,
+               do_encl_op_put_to_buf,
+               do_encl_op_get_from_buf,
        };
 
        struct encl_op_header *op = (struct encl_op_header *)rdi;