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>,
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>,
linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
"Shuah Khan" <skhan@linuxfoundation.org>
Subject: [PATCH v3 8/9] selftests/harness: Share _metadata between forked processes
Date: Mon, 29 Apr 2024 21:19:10 +0200 [thread overview]
Message-ID: <20240429191911.2552580-9-mic@digikod.net> (raw)
In-Reply-To: <20240429191911.2552580-1-mic@digikod.net>
Unconditionally share _metadata between all forked processes, which
enables to actually catch errors which were previously ignored.
This is required for a following commit replacing vfork() with clone3()
and CLONE_VFORK (i.e. not sharing the full memory) . It should also be
useful to share _metadata to extend expectations to test process's
forks. For instance, this change identified a wrong expectation in
pidfd_setns_test.
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Shuah Khan <skhan@linuxfoundation.org>
Cc: Will Drewry <wad@chromium.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Mickaël Salaün <mic@digikod.net>
Link: https://lore.kernel.org/r/20240429191911.2552580-9-mic@digikod.net
---
Changes since v1:
* Extract change from a bigger patch (suggested by Kees).
---
tools/testing/selftests/kselftest_harness.h | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h
index 201040207c85..abf2ffd2094f 100644
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
@@ -430,19 +430,17 @@ static inline pid_t clone3_vfork(void)
kill(getpid(), WTERMSIG(status)); \
__test_check_assert(_metadata); \
} \
- static struct __test_metadata \
- _##fixture_name##_##test_name##_object = { \
- .name = #test_name, \
- .fn = &wrapper_##fixture_name##_##test_name, \
- .fixture = &_##fixture_name##_fixture_object, \
- .termsig = signal, \
- .timeout = tmout, \
- .teardown_parent = false, \
- }; \
static void __attribute__((constructor)) \
_register_##fixture_name##_##test_name(void) \
{ \
- __register_test(&_##fixture_name##_##test_name##_object); \
+ struct __test_metadata *object = mmap(NULL, sizeof(*object), \
+ PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0); \
+ object->name = #test_name; \
+ object->fn = &wrapper_##fixture_name##_##test_name; \
+ object->fixture = &_##fixture_name##_fixture_object; \
+ object->termsig = signal; \
+ object->timeout = tmout; \
+ __register_test(object); \
} \
static void fixture_name##_##test_name( \
struct __test_metadata __attribute__((unused)) *_metadata, \
--
2.44.0
next prev parent reply other threads:[~2024-04-29 19:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-29 19:19 [PATCH v3 0/9] Fix Kselftest's vfork() side effects Mickaël Salaün
2024-04-29 19:19 ` [PATCH v3 1/9] selftests/pidfd: Fix config for pidfd_setns_test Mickaël Salaün
2024-05-02 14:10 ` Christian Brauner
2024-04-29 19:19 ` [PATCH v3 2/9] selftests/landlock: Fix FS tests when run on a private mount point Mickaël Salaün
2024-04-29 19:19 ` [PATCH v3 3/9] selftests/harness: Fix fixture teardown Mickaël Salaün
2024-04-29 19:19 ` [PATCH v3 4/9] selftests/harness: Fix interleaved scheduling leading to race conditions Mickaël Salaün
2024-04-29 19:19 ` [PATCH v3 5/9] selftests/landlock: Do not allocate memory in fixture data Mickaël Salaün
2024-04-29 19:19 ` [PATCH v3 6/9] selftests/harness: Constify fixture variants Mickaël Salaün
2024-04-29 19:19 ` [PATCH v3 7/9] selftests/pidfd: Fix wrong expectation Mickaël Salaün
2024-05-02 14:12 ` Christian Brauner
2024-04-29 19:19 ` Mickaël Salaün [this message]
2024-04-29 19:19 ` [PATCH v3 9/9] selftests/harness: Fix vfork() side effects Mickaël Salaün
2024-04-30 13:54 ` [PATCH v3 0/9] Fix Kselftest's " Mickaël Salaün
2024-04-30 15:13 ` Jakub Kicinski
2024-04-30 16:38 ` Mickaël Salaün
2024-04-30 16:50 ` Kees Cook
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=20240429191911.2552580-9-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=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=oliver.sang@intel.com \
--cc=shengyu.li.evgeny@gmail.com \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).