public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-18 12:30:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

selftests/sgx: Dump segments and /proc/self/maps only on failure

Browse source 
Logging is always a compromise between clarity and detail. The main use
case for dumping VMA's is when FIXTURE_SETUP() fails, and is less important
for enclaves that do initialize correctly. Therefore, print the segments
and /proc/self/maps only in the error case.

Finally, if a single test ever creates multiple enclaves, the amount of
log lines would become enormous.

Signed-off-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: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lkml.kernel.org/r/23cef0ae1de3a8a74cbfbbe74eca48ca3f300fde.1636997631.git.reinette.chatre@intel.com
This commit is contained in:
Jarkko Sakkinen 2021-11-15 10:35:18 -08:00 • committed by Dave Hansen
parent 3200505d4d
commit 1471721489
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tools/testing/selftests/sgx/main.c
View file

@ -127,12 +127,6 @@ FIXTURE_SETUP(enclave)
ksft_exit_skip("cannot load enclaves\n"); ksft_exit_skip("cannot load enclaves\n");
} }
for (i = 0; i < self->encl.nr_segments; i++) {
seg = &self->encl.segment_tbl[i];
TH_LOG("0x%016lx 0x%016lx 0x%02x", seg->offset, seg->size, seg->prot);
}
if (!encl_measure(&self->encl)) if (!encl_measure(&self->encl))
goto err; goto err;
@ -169,6 +163,17 @@ FIXTURE_SETUP(enclave)
memset(&self->run, 0, sizeof(self->run)); memset(&self->run, 0, sizeof(self->run));
self->run.tcs = self->encl.encl_base; self->run.tcs = self->encl.encl_base;
return;
err:
encl_delete(&self->encl);
for (i = 0; i < self->encl.nr_segments; i++) {
seg = &self->encl.segment_tbl[i];
TH_LOG("0x%016lx 0x%016lx 0x%02x", seg->offset, seg->size, seg->prot);
}
maps_file = fopen("/proc/self/maps", "r"); maps_file = fopen("/proc/self/maps", "r");
if (maps_file != NULL) { if (maps_file != NULL) {
while (fgets(maps_line, sizeof(maps_line), maps_file) != NULL) { while (fgets(maps_line, sizeof(maps_line), maps_file) != NULL) {
@ -181,11 +186,7 @@ FIXTURE_SETUP(enclave)
fclose(maps_file); fclose(maps_file);
} }
err: ASSERT_TRUE(false);
if (!sgx_enter_enclave_sym)
encl_delete(&self->encl);
ASSERT_NE(sgx_enter_enclave_sym, NULL);
} }
FIXTURE_TEARDOWN(enclave) FIXTURE_TEARDOWN(enclave)