From: "Mickaël Salaün" <mic@digikod.net>
To: Christian Brauner <brauner@kernel.org>,
Jakub Kicinski <kuba@kernel.org>,
Kees Cook <keescook@chromium.org>,
Mark Brown <broonie@kernel.org>,
Sean Christopherson <seanjc@google.com>,
Shengyu Li <shengyu.li.evgeny@gmail.com>,
Shuah Khan <shuah@kernel.org>
Cc: "Mickaël Salaün" <mic@digikod.net>,
"David S . Miller" <davem@davemloft.net>,
"Günther Noack" <gnoack@google.com>,
"Will Drewry" <wad@chromium.org>,
"kernel test robot" <oliver.sang@intel.com>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org
Subject: [PATCH v4 10/10] selftests/harness: Fix TEST_F()'s exit codes
Date: Thu, 2 May 2024 23:09:26 +0200 [thread overview]
Message-ID: <20240502210926.145539-11-mic@digikod.net> (raw)
In-Reply-To: <20240502210926.145539-1-mic@digikod.net>
Always forward grandchild's exit codes to its parent. This fixes
KVM_ONE_VCPU_TEST().
Initial patch written by Sean Christopherson [1].
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Will Drewry <wad@chromium.org>
Link: https://lore.kernel.org/r/ZjPelW6-AbtYvslu@google.com [1]
Fixes: 0710a1a73fb4 ("selftests/harness: Merge TEST_F_FORK() into TEST_F()")
Signed-off-by: Mickaël Salaün <mic@digikod.net>
Link: https://lore.kernel.org/r/20240502210926.145539-11-mic@digikod.net
---
Changes since v3:
* New patch mainly from Sean Christopherson.
---
tools/testing/selftests/kselftest_harness.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h
index d3837a3a584e..77d4fac8d0c0 100644
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
@@ -442,7 +442,7 @@ static inline pid_t clone3_vfork(void)
fixture_name##_setup(_metadata, self, variant->data); \
/* Let setup failure terminate early. */ \
if (_metadata->exit_code) \
- _exit(0); \
+ _exit(_metadata->exit_code); \
_metadata->setup_completed = true; \
fixture_name##_##test_name(_metadata, self, variant->data); \
} else if (child < 0 || child != waitpid(child, &status, 0)) { \
@@ -454,7 +454,7 @@ static inline pid_t clone3_vfork(void)
if (_metadata->setup_completed && !fixture_name##_teardown_parent && \
__sync_bool_compare_and_swap(teardown, false, true)) \
fixture_name##_teardown(_metadata, self, variant->data); \
- _exit(0); \
+ _exit(_metadata->exit_code); \
} \
if (_metadata->setup_completed && fixture_name##_teardown_parent && \
__sync_bool_compare_and_swap(teardown, false, true)) \
@@ -462,8 +462,10 @@ static inline pid_t clone3_vfork(void)
munmap(teardown, sizeof(*teardown)); \
if (self && fixture_name##_teardown_parent) \
munmap(self, sizeof(*self)); \
- if (!WIFEXITED(status) && WIFSIGNALED(status)) \
- /* Forward signal to __wait_for_test(). */ \
+ /* Forward exit codes and signals to __wait_for_test(). */ \
+ if (WIFEXITED(status)) \
+ _exit(_metadata->exit_code); \
+ if (WIFSIGNALED(status)) \
kill(getpid(), WTERMSIG(status)); \
__test_check_assert(_metadata); \
} \
--
2.45.0
next prev parent reply other threads:[~2024-05-02 21:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-02 21:09 [PATCH v4 00/10] Fix Kselftest's vfork() side effects Mickaël Salaün
2024-05-02 21:09 ` [PATCH v4 01/10] selftests/pidfd: Fix config for pidfd_setns_test Mickaël Salaün
2024-05-02 21:09 ` [PATCH v4 02/10] selftests/landlock: Fix FS tests when run on a private mount point Mickaël Salaün
2024-05-02 21:09 ` [PATCH v4 03/10] selftests/harness: Fix fixture teardown Mickaël Salaün
2024-05-02 21:09 ` [PATCH v4 04/10] selftests/harness: Fix interleaved scheduling leading to race conditions Mickaël Salaün
2024-05-02 21:09 ` [PATCH v4 05/10] selftests/landlock: Do not allocate memory in fixture data Mickaël Salaün
2024-05-02 21:09 ` [PATCH v4 06/10] selftests/harness: Constify fixture variants Mickaël Salaün
2024-05-02 21:09 ` [PATCH v4 07/10] selftests/pidfd: Fix wrong expectation Mickaël Salaün
2024-05-02 21:09 ` [PATCH v4 08/10] selftests/harness: Share _metadata between forked processes Mickaël Salaün
2024-05-02 21:09 ` [PATCH v4 09/10] selftests/harness: Fix vfork() side effects Mickaël Salaün
2024-05-02 21:09 ` Mickaël Salaün [this message]
2024-05-02 22:45 ` [PATCH v4 10/10] selftests/harness: Fix TEST_F()'s exit codes Sean Christopherson
2024-05-03 7:51 ` Mickaël Salaün
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=20240502210926.145539-11-mic@digikod.net \
--to=mic@digikod.net \
--cc=brauner@kernel.org \
--cc=broonie@kernel.org \
--cc=davem@davemloft.net \
--cc=gnoack@google.com \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=oliver.sang@intel.com \
--cc=seanjc@google.com \
--cc=shengyu.li.evgeny@gmail.com \
--cc=shuah@kernel.org \
--cc=wad@chromium.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