Reviewed-by: Bamvor Zhang bamvor.zhang@suse.com
在 2/18/22 4:16 PM, Laibin Qiu 写道:
From: Jarkko Sakkinen jarkko@kernel.org
mainline inclusion from mainline-v5.14-rc1 commit b334fb6fa7f38b4ad188d38307aea45e827b56ce category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4SIGI CVE: NA
Add EXPECT_EEXIT() macro, which will conditionally print the exception information, in addition to
EXPECT_EQ(self->run.function, EEXIT);
Intel-SIG: commit b334fb6fa7f3 selftests/sgx: Add EXPECT_EEXIT() macro Backport for SGX Foundations support
Signed-off-by: Jarkko Sakkinen jarkko@kernel.org Signed-off-by: Shuah Khan skhan@linuxfoundation.org Signed-off-by: Fan Du fan.du@intel.com #openEuler_contributor Signed-off-by: Laibin Qiu qiulaibin@huawei.com
tools/testing/selftests/sgx/main.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/sgx/main.c b/tools/testing/selftests/sgx/main.c index 14030f8b85ff..bcd0257f48e0 100644 --- a/tools/testing/selftests/sgx/main.c +++ b/tools/testing/selftests/sgx/main.c @@ -205,6 +205,14 @@ FIXTURE_TEARDOWN(enclave) ret; \ })
+#define EXPECT_EEXIT(run) \
- do { \
EXPECT_EQ((run)->function, EEXIT); \if ((run)->function != EEXIT) \TH_LOG("0x%02x 0x%02x 0x%016llx", (run)->exception_vector, \(run)->exception_error_code, (run)->exception_addr); \- } while (0)
- TEST_F(enclave, unclobbered_vdso) { uint64_t result = 0;
@@ -212,7 +220,7 @@ TEST_F(enclave, unclobbered_vdso) EXPECT_EQ(ENCL_CALL(&MAGIC, &result, &self->run, false), 0);
EXPECT_EQ(result, MAGIC);
- EXPECT_EQ(self->run.function, EEXIT);
- EXPECT_EEXIT(&self->run); EXPECT_EQ(self->run.user_data, 0); }
@@ -223,7 +231,7 @@ TEST_F(enclave, clobbered_vdso) EXPECT_EQ(ENCL_CALL(&MAGIC, &result, &self->run, true), 0);
EXPECT_EQ(result, MAGIC);
- EXPECT_EQ(self->run.function, EEXIT);
- EXPECT_EEXIT(&self->run); EXPECT_EQ(self->run.user_data, 0); }
@@ -245,7 +253,7 @@ TEST_F(enclave, clobbered_vdso_and_user_function) EXPECT_EQ(ENCL_CALL(&MAGIC, &result, &self->run, true), 0);
EXPECT_EQ(result, MAGIC);
- EXPECT_EQ(self->run.function, EEXIT);
- EXPECT_EEXIT(&self->run); EXPECT_EQ(self->run.user_data, 0); }