Received-SPF: pass (google.com: domain of linux-kernel+bounces-167753-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Fri, 3 May 2024 07:17:16 -0700
In-Reply-To: <20240503105820.300927-11-mic@digikod.net>
Precedence: bulk
Mime-Version: 1.0
References: <20240503105820.300927-1-mic@digikod.net> <20240503105820.300927-11-mic@digikod.net>
Message-ID: <ZjTx7BYvbrqFSNuH@google.com>
Subject: Re: [PATCH v5 10/10] selftests/harness: Handle TEST_F()'s explicit
 exit codes
From: Sean Christopherson <seanjc@google.com>
To: "=?utf-8?Q?Micka=C3=ABl_Sala=C3=BCn?=" <mic@digikod.net>
Cc: Christian Brauner <brauner@kernel.org>, Jakub Kicinski <kuba@kernel.org>, 
	Kees Cook <keescook@chromium.org>, Mark Brown <broonie@kernel.org>, 
	Shengyu Li <shengyu.li.evgeny@gmail.com>, Shuah Khan <shuah@kernel.org>, 
	"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, netdev@vger.kernel.org
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

On Fri, May 03, 2024, Micka=C3=ABl Sala=C3=BCn wrote:
> If TEST_F() explicitly calls exit(code) with code different than 0, then
> _metadata->exit_code is set to this code (e.g. KVM_ONE_VCPU_TEST()).  We
> need to keep in mind that _metadata->exit_code can be KSFT_SKIP while
> the process exit code is 0.
>=20
> Initial patch written by Sean Christopherson [1].

Heh, my pseudo patch barely has any relevance at this point.  How about rep=
lacing
that with:

  Reported-by: Sean Christopherson <seanjc@google.com>
  Closes: https://lore.kernel.org/r/ZjPelW6-AbtYvslu@google.com

> 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=C3=ABl Sala=C3=BCn <mic@digikod.net>
> Link: https://lore.kernel.org/r/20240503105820.300927-11-mic@digikod.net
> ---
>=20
> Changes since v4:
> * Check abort status when the grandchild exited.
> * Keep the _exit(0) calls because _metadata->exit_code is always
>   checked.
> * Only set _metadata->exit_code to WEXITSTATUS() if it is not zero.
>=20
> Changes since v3:
> * New patch mainly from Sean Christopherson.
> ---
>  tools/testing/selftests/kselftest_harness.h | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>=20
> diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/=
selftests/kselftest_harness.h
> index eb25f7c11949..7612bf09c5f8 100644
> --- a/tools/testing/selftests/kselftest_harness.h
> +++ b/tools/testing/selftests/kselftest_harness.h
> @@ -462,9 +462,13 @@ 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)) \
> +		if (WIFEXITED(status)) { \
> +			if (WEXITSTATUS(status)) \
> +				_metadata->exit_code =3D WEXITSTATUS(status); \

Ah, IIUC, this works because __run_test() effectively forwards the exit_cod=
e?

	} else if (t->pid =3D=3D 0) {
		setpgrp();
		t->fn(t, variant);
		_exit(t->exit_code);
	}

Tested-by: Sean Christopherson <seanjc@google.com>

> +		} else if (WIFSIGNALED(status)) { \
>  			/* Forward signal to __wait_for_test(). */ \
>  			kill(getpid(), WTERMSIG(status)); \
> +		} \
>  		__test_check_assert(_metadata); \
>  	} \
>  	static void __attribute__((constructor)) \
> --=20
> 2.45.0
>=20