public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

selftests/harness: Fix fixture teardown

Browse source 
Make sure fixture teardowns are run when test cases failed, including
when _metadata->teardown_parent is set to true.

Make sure only one fixture teardown is run per test case, handling the
case where the test child forks.

Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Shengyu Li <shengyu.li.evgeny@gmail.com>
Cc: Shuah Khan <skhan@linuxfoundation.org>
Fixes: 72d7cb5c19 ("selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN")
Fixes: 0710a1a73f ("selftests/harness: Merge TEST_F_FORK() into TEST_F()")
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20240511171445.904356-4-mic@digikod.net
Rule: add
Link: https://lore.kernel.org/stable/20240506165518.474504-4-mic%40digikod.net
Signed-off-by: Mickaël Salaün <mic@digikod.net>
This commit is contained in:
Mickaël Salaün 2024-05-11 19:14:38 +02:00
parent 7e4042abe2
commit fff37bd32c
No known key found for this signature in database
GPG key ID: E5E3D0E88C82F6D2
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/testing/selftests/kselftest_harness.h
View file

@ -382,7 +382,10 @@
FIXTURE_DATA(fixture_name) self; \ FIXTURE_DATA(fixture_name) self; \
pid_t child = 1; \ pid_t child = 1; \
int status = 0; \ int status = 0; \
bool jmp = false; \ /* Makes sure there is only one teardown, even when child forks again. */ \
bool *teardown = mmap(NULL, sizeof(*teardown), \
PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0); \
*teardown = false; \
memset(&self, 0, sizeof(FIXTURE_DATA(fixture_name))); \ memset(&self, 0, sizeof(FIXTURE_DATA(fixture_name))); \
if (setjmp(_metadata->env) == 0) { \ if (setjmp(_metadata->env) == 0) { \
/* Use the same _metadata. */ \ /* Use the same _metadata. */ \
@ -399,15 +402,16 @@
_metadata->exit_code = KSFT_FAIL; \ _metadata->exit_code = KSFT_FAIL; \
} \ } \
} \ } \
else \
jmp = true; \
if (child == 0) { \ if (child == 0) { \
if (_metadata->setup_completed && !_metadata->teardown_parent && !jmp) \ if (_metadata->setup_completed && !_metadata->teardown_parent && \
__sync_bool_compare_and_swap(teardown, false, true)) \
fixture_name##_teardown(_metadata, &self, variant->data); \ fixture_name##_teardown(_metadata, &self, variant->data); \
_exit(0); \ _exit(0); \
} \ } \
if (_metadata->setup_completed && _metadata->teardown_parent) \ if (_metadata->setup_completed && _metadata->teardown_parent && \
__sync_bool_compare_and_swap(teardown, false, true)) \
fixture_name##_teardown(_metadata, &self, variant->data); \ fixture_name##_teardown(_metadata, &self, variant->data); \
munmap(teardown, sizeof(*teardown)); \
if (!WIFEXITED(status) && WIFSIGNALED(status)) \ if (!WIFEXITED(status) && WIFSIGNALED(status)) \
/* Forward signal to __wait_for_test(). */ \ /* Forward signal to __wait_for_test(). */ \
kill(getpid(), WTERMSIG(status)); \ kill(getpid(), WTERMSIG(status)); \