[v4,10/10] selftests/harness: Fix TEST_F()'s exit codes

Message ID	20240502210926.145539-11-mic@digikod.net
State	New
Headers	show Received: from smtp-bc0f.mail.infomaniak.ch (smtp-bc0f.mail.infomaniak.ch [45.157.188.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F48A1C2310; Thu, 2 May 2024 21:09:59 +0000 (UTC) From: =?utf-8?q?Micka=C3=ABl_Sala=C3=BCn?= <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: =?utf-8?q?Micka=C3=ABl_Sala=C3=BCn?= <mic@digikod.net>, "David S . Miller" <davem@davemloft.net>, =?utf-8?q?G=C3=BCnther_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 Message-ID: <20240502210926.145539-11-mic@digikod.net> In-Reply-To: <20240502210926.145539-1-mic@digikod.net> References: <20240502210926.145539-1-mic@digikod.net> Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
Series	Fix Kselftest's vfork() side effects \| expand [v4,00/10] Fix Kselftest's vfork() side effects [v4,01/10] selftests/pidfd: Fix config for pidfd_setns_test [v4,02/10] selftests/landlock: Fix FS tests when run on a private mount point [v4,03/10] selftests/harness: Fix fixture teardown [v4,04/10] selftests/harness: Fix interleaved scheduling leading to race conditions [v4,05/10] selftests/landlock: Do not allocate memory in fixture data [v4,06/10] selftests/harness: Constify fixture variants [v4,07/10] selftests/pidfd: Fix wrong expectation [v4,08/10] selftests/harness: Share _metadata between forked processes [v4,09/10] selftests/harness: Fix vfork() side effects [v4,10/10] selftests/harness: Fix TEST_F()'s exit codes

Message ID

20240502210926.145539-11-mic@digikod.net

State

New

Headers

From: =?utf-8?q?Micka=C3=ABl_Sala=C3=BCn?= <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: =?utf-8?q?Micka=C3=ABl_Sala=C3=BCn?= <mic@digikod.net>,
 "David S . Miller" <davem@davemloft.net>,
 =?utf-8?q?G=C3=BCnther_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
Message-ID: <20240502210926.145539-11-mic@digikod.net>
In-Reply-To: <20240502210926.145539-1-mic@digikod.net>
References: <20240502210926.145539-1-mic@digikod.net>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Series

Fix Kselftest's vfork() side effects | expand

Commit Message

Mickaël Salaün May 2, 2024, 9:09 p.m. UTC

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); \
 	} \

[v4,10/10] selftests/harness: Fix TEST_F()'s exit codes

Commit Message

Patch