selftests/futex: Dynamically skip unsupported tests
PATCH 1/1 selftests/futex: Dynamically skip unsupported tests
Some new futex tests rely on kernel features that may not be supported on all configurations (e.g., FUTEX2_NUMA or PR_FUTEX_HASH). Currently, these tests fail with EINVAL when the features are missing.
This patch adds dynamic skip logic to:
1. futex_priv_hash: Skip if PR_FUTEX_HASH returns ENOSYS or EINVAL.
2. futex_numa_mpol: Skip if futex2 or FUTEX2_NUMA returns ENOSYS or EINVAL.
This allows the tests to pass (as SKIPPED) on kernels without support, while preserving coverage on configurations that do support them.
--- tools/testing/selftests/futex/functional/futex_numa_mpol.c | 2 ++ tools/testing/selftests/futex/functional/futex_priv_hash.c | 2 ++ 2 files changed, 4 insertions(+)
tools/testing/selftests/futex/functional/futex_numa_mpol.c +2 -0
@@ -103,6 +103,8 @@ static void __test_futex(void *futex_ptr, int err_value, unsigned int futex_flagbreak ; }if (ret <0 ) { +if (errno ==ENOSYS || (errno ==EINVAL && (futex_flags &FUTEX2_NUMA ))) +ksft_exit_skip ("futex2 or FUTEX2_NUMA not supported by kernel\n" );ksft_exit_fail_msg ("Failed futex2_wake(%d, 0x%x): %m\n" , to_wake, futex_flags); }
tools/testing/selftests/futex/functional/futex_priv_hash.c +2 -0
@@ -145,6 +145,8 @@ TEST(priv_hash) }/* First thread, expect to be 0, not yet initialized */ ret =futex_hash_slots_get (); +if (ret <0 && errno ==EINVAL ) +ksft_exit_skip ("PR_FUTEX_HASH not supported by kernel\n" );if (ret !=0 )ksft_exit_fail_msg ("futex_hash_slots_get() failed: %d, %m\n" , ret);
Signature · 1 line
2.55.0.rc0.799.gd6f94ed593-goog
The following commit has been merged into the locking/futex branch of tip:
The following commit has been merged into the locking/futex branch of tip:
Commit-ID: 50c121e5a57abe446e46825fb9c69ac419765d5c Gitweb: https://git.kernel.org/tip/50c121e5a57abe446e46825fb9c69ac419765d5c Author: Wake Liu <[email protected]> AuthorDate: Wed, 24 Jun 2026 07:02:23 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sun, 05 Jul 2026 21:49:18 +02:00
selftests/futex: Dynamically skip unsupported tests
Some new futex tests rely on kernel features that may not be supported on all configurations (e.g., FUTEX2_NUMA or PR_FUTEX_HASH). Currently, these tests fail with EINVAL when the features are missing.
Add dynamic skip logic to:
- futex_priv_hash: Skip if PR_FUTEX_HASH returns ENOSYS or EINVAL.
- futex_numa_mpol: Skip if futex2 or FUTEX2_NUMA returns ENOSYS or EINVAL.
This allows the tests to pass (as SKIPPED) on kernels without support, while preserving coverage on configurations that do support them.
[ tglx: Adapt to harness changes, massage change log ]
--- tools/testing/selftests/futex/functional/futex_numa_mpol.c | 3 +++ tools/testing/selftests/futex/functional/futex_priv_hash.c | 3 +++ 2 files changed, 6 insertions(+)
tools/testing/selftests/futex/functional/futex_numa_mpol.c +3 -0
@@ -107,6 +107,9 @@ static void __test_futex(struct __test_metadata *_metadata, void *futex_ptr, intbreak ; }if (ret <0 ) { +if (errno ==ENOSYS || (errno ==EINVAL && (futex_flags &FUTEX2_NUMA ))) +SKIP (return,"futex2 or FUTEX2_NUMA not supported by kernel" ); + ASSERT_GE(ret, 0) {TH_LOG ("Failed futex2_wake(%d, 0x%x): %s" , to_wake, futex_flags,strerror (errno));
tools/testing/selftests/futex/functional/futex_priv_hash.c +3 -0
@@ -143,6 +143,9 @@ TEST(priv_hash)/* First thread, expect to be 0, not yet initialized */ ret =futex_hash_slots_get (); +if (ret <0 && errno ==EINVAL ) +SKIP (return,"PR_FUTEX_HASH not supported by kernel" ); + ASSERT_EQ(ret, 0)TH_LOG ("futex_hash_slots_get() failed: %d, %s" , ret,strerror (errno));