From: Reinette Chatre <reinette.chatre@intel.com>
To: jarkko@kernel.org, dave.hansen@linux.intel.com,
linux-sgx@vger.kernel.org, shuah@kernel.org
Cc: linux-kselftest@vger.kernel.org
Subject: [PATCH V2 3/4] selftests/sgx: Ensure enclave data available during debug print
Date: Tue, 1 Feb 2022 14:47:05 -0800 [thread overview]
Message-ID: <eaaeeb9122916d831942fc8a3043c687137314c1.1643754040.git.reinette.chatre@intel.com> (raw)
In-Reply-To: <cover.1643754040.git.reinette.chatre@intel.com>
In support of debugging the SGX tests print details from
the enclave and its memory mappings if any failure is encountered
during enclave loading.
When a failure is encountered no data is printed because the
printing of the data is preceded by cleanup of the data.
Move the data cleanup after the data print.
Fixes: 147172148909 ("selftests/sgx: Dump segments and /proc/self/maps only on failure")
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
---
No changes since V1.
tools/testing/selftests/sgx/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/sgx/main.c b/tools/testing/selftests/sgx/main.c
index a7cd2c3e6f7e..b0bd95a4730d 100644
--- a/tools/testing/selftests/sgx/main.c
+++ b/tools/testing/selftests/sgx/main.c
@@ -186,8 +186,6 @@ static bool setup_test_encl(unsigned long heap_size, struct encl *encl,
return true;
err:
- encl_delete(encl);
-
for (i = 0; i < encl->nr_segments; i++) {
seg = &encl->segment_tbl[i];
@@ -208,6 +206,8 @@ static bool setup_test_encl(unsigned long heap_size, struct encl *encl,
TH_LOG("Failed to initialize the test enclave.\n");
+ encl_delete(encl);
+
return false;
}
--
2.25.1
next prev parent reply other threads:[~2022-02-01 22:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-01 22:47 [PATCH V2 0/4] selftests/sgx: Early enclave loading error path fixes Reinette Chatre
2022-02-01 22:47 ` [PATCH V2 1/4] selftests/sgx: Fix NULL-pointer-dereference upon early test failure Reinette Chatre
2022-02-02 18:01 ` Shuah Khan
2022-02-02 18:52 ` Reinette Chatre
2022-02-02 18:59 ` Shuah Khan
2022-02-20 20:02 ` Jarkko Sakkinen
2022-02-22 20:05 ` Reinette Chatre
2022-02-23 15:43 ` Jarkko Sakkinen
2022-02-01 22:47 ` [PATCH V2 2/4] selftests/sgx: Do not attempt enclave build without valid enclave Reinette Chatre
2022-02-02 18:03 ` Shuah Khan
2022-02-20 19:04 ` Jarkko Sakkinen
2022-02-01 22:47 ` Reinette Chatre [this message]
2022-02-02 18:04 ` [PATCH V2 3/4] selftests/sgx: Ensure enclave data available during debug print Shuah Khan
2022-02-20 19:04 ` Jarkko Sakkinen
2022-02-01 22:47 ` [PATCH V2 4/4] selftests/sgx: Remove extra newlines in test output Reinette Chatre
2022-02-02 18:04 ` Shuah Khan
2022-02-20 19:05 ` Jarkko Sakkinen
2022-02-02 18:06 ` [PATCH V2 0/4] selftests/sgx: Early enclave loading error path fixes 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=eaaeeb9122916d831942fc8a3043c687137314c1.1643754040.git.reinette.chatre@intel.com \
--to=reinette.chatre@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=jarkko@kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--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).