Re: [PATCH] selftests: futex: Restore support checks for futex2 and priv_hash

[André Almeida]

Hi Wake,

Em 22/07/2026 04:08, Wake Liu escreveu:
Older kernels may not support FUTEX2 syscalls or PR_FUTEX_HASH.
Removing these checks causes false failures when running the tests on
such kernels. Restore the checks so the tests can be gracefully
skipped when the features are not supported.
Signed-off-by: Wake Liu <wa...@google.com>
---
  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(+)

diff --git a/tools/testing/selftests/futex/functional/futex_numa_mpol.c 
b/tools/testing/selftests/futex/functional/futex_numa_mpol.c
index 78c0f7a59e17..d215acf88120 100644
--- a/tools/testing/selftests/futex/functional/futex_numa_mpol.c
+++ b/tools/testing/selftests/futex/functional/futex_numa_mpol.c
@@ -103,6 +103,8 @@ static void __test_futex(void *futex_ptr, int err_value, 
unsigned int futex_flag
                        break;
                }
                if (ret < 0) {
+                       if (errno == ENOSYS || (errno == EINVAL && (futex_flags 
& FUTEX2_NUMA)))
+                               ksft_exit_skip("futex2 or FUTEX2_NUMA not supported 
by kernel\n");

Why aren't you using SKIP() instead of ksft_exit_skip() like how you 
have done at

https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?h=locking/futex&id=50c121e5a57abe446e46825fb9c69ac419765d5c


                        ksft_exit_fail_msg("Failed futex2_wake(%d, 0x%x): %m\n",
                                           to_wake, futex_flags);
                }
diff --git a/tools/testing/selftests/futex/functional/futex_priv_hash.c 
b/tools/testing/selftests/futex/functional/futex_priv_hash.c
index e8079d7c65e8..27c3ea5ff3ed 100644
--- a/tools/testing/selftests/futex/functional/futex_priv_hash.c
+++ b/tools/testing/selftests/futex/functional/futex_priv_hash.c
@@ -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);