From: Jarkko Sakkinen <jarkko@kernel.org>
To: shuah@kernel.org
Cc: linux-kselftest@vger.kernel.org, linux-sgx@vger.kernel.org,
Reinette Chatre <reinette.chatre@intel.com>,
Jarkko Sakkinen <jarkko@kernel.org>,
Dave Hansen <dave.hansen@linux.intel.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v8 4/5] selftests/sgx: Add EXPECT_EEXIT() macro
Date: Thu, 10 Jun 2021 11:30:20 +0300 [thread overview]
Message-ID: <20210610083021.392269-4-jarkko@kernel.org> (raw)
In-Reply-To: <20210610083021.392269-1-jarkko@kernel.org>
Add EXPECT_EEXIT() macro, which will conditionally print the exception
information, in addition to
EXPECT_EQ(self->run.function, EEXIT);
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
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);
}
--
2.31.1
next prev parent reply other threads:[~2021-06-10 8:30 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 8:30 [PATCH v8 1/5] selftests/sgx: Rename 'eenter' and 'sgx_call_vdso' Jarkko Sakkinen
2021-06-10 8:30 ` [PATCH v8 2/5] selftests/sgx: Migrate to kselftest harness Jarkko Sakkinen
2021-06-10 8:30 ` [PATCH v8 3/5] selftests/sgx: Dump enclave memory map Jarkko Sakkinen
2021-06-11 22:45 ` Shuah Khan
2021-06-12 0:34 ` Dave Hansen
2021-06-12 4:27 ` Jarkko Sakkinen
2021-06-14 16:45 ` Shuah Khan
2021-06-15 13:07 ` Jarkko Sakkinen
2021-06-10 8:30 ` Jarkko Sakkinen [this message]
2021-06-10 8:30 ` [PATCH v8 5/5] selftests/sgx: Refine the test enclave to have storage Jarkko Sakkinen
2021-06-14 20:16 ` Shuah Khan
2021-06-15 13:13 ` Jarkko Sakkinen
2021-06-15 13:15 ` Jarkko Sakkinen
2021-06-15 21:55 ` Shuah Khan
2021-06-18 9:07 ` Jarkko Sakkinen
2021-06-10 15:45 ` [PATCH v8 1/5] selftests/sgx: Rename 'eenter' and 'sgx_call_vdso' Dave Hansen
2021-06-11 17:35 ` Shuah Khan
2021-06-11 22:47 ` Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210610083021.392269-4-jarkko@kernel.org \
--to=jarkko@kernel.org \
--cc=dave.hansen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=reinette.chatre@intel.com \
--cc=shuah@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).