From nobody Mon Jun 8 22:51:09 2026 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 98DFB27B340 for ; Tue, 26 May 2026 01:06:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779757602; cv=none; b=cBan3X9ub4BRKewoSPJbsxJewCY81kwNqMjFaDslkjqvt61Y8s/XXUUmS2xckyBy4qwIgMSqn6zfHVILgYAM+iiftYMRR14oBLwovcRS4gnDhit7jhbIa869l7+V6WNAR1xbmzVUJMDg/uUf+zzAzS1SNJbAftchMpYftA9L+uI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779757602; c=relaxed/simple; bh=4TerPLFP7p2wFYdos3lWuqFx2vK2CXsjSh1yICBmN2E=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jyoaT4szLMIoPSgO1/Ln5Bck9RnA/vYH/jOXVaS941D5eVw1ZiTGTK9hJWzG11UXFYS3g2e2Qjlv4z45Mq2IlC7cvnQz7bux+ePtpBK7tMClToYCJMvoefq6zdBu78eqA/xqZ2HiTMZx2vsD/1p3o/D3buDyqoS5MuNuR2ic7T0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--wakel.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=S7MUpLvP; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--wakel.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="S7MUpLvP" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-366015bca9bso8157220a91.1 for ; Mon, 25 May 2026 18:06:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779757600; x=1780362400; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=CqyxZJnN5wnW/7wCR3D9/QOMIhNa9RqRSymkTmEN/e4=; b=S7MUpLvPpQKW3C2NzW4kAlGN49K1QNzP6g1DPmQYbTGbed/17dCtZqWzKUo1LnwB4c i7UsQDVweDbPEnyjTriLbfx1BW0eUqHwfSDGNypwKSbzvD2CXt0Kip2uJB+8vyDZmix9 t52GSmgCotQ/TIrzLwXzcnkHPJP4EQ0YBkCExKsWFq1nEBXhxjdJX4zgk/1ngJBS7VGZ Jr/T6elKwHugHNAGJ7Vl2DSrPHlcGafEH+iowQCVq2kAUFuWiE5WfZpRcHEzucVU0ZVG bZ4wRK+PLIAtiF1q91AUBS49N/l04tjxyzEfZha7XVcQm1pZCYFGWGCm8YuRFNxfogzr BQHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779757600; x=1780362400; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CqyxZJnN5wnW/7wCR3D9/QOMIhNa9RqRSymkTmEN/e4=; b=TosyEbXkXXeGVcOU4JUEoO3bckrnK4Msx8YvYkpLawuAEQjIu8mw5UVjYChbRndkXW tf/yUTV1Uy7ES1FcGd8BaJSbYq37aPXg05esEqdiOHQJXC5xNt+0aGl2CMwE9iOZqbfv aVPA5YiQDYkPov2OKvvqk8ZhoaRED1lg42HCcOsnu3slSmSPSSSZwK16PJT+NzgW9AMr loLKb3bqPvihcCSitTrgEQ2mvEiN8MyGyVdZlrGMJSVfSyOIqdkJZzxrx08W3gwnA6iI NmKrYMOOlRnZIZ6xM9NZZ5zUXuXMJA0ilaTNTlZGg0McO1P3Ktt9R/oL/HvlXWW6Ni72 vDhw== X-Forwarded-Encrypted: i=1; AFNElJ9ZfvZekvfaIxp4VLxIYXEIcugueWDQzAXweA7DkZEzu+9b90y84XbhJN3Yn6M0TodqqHxu6OgV3dq+kgE=@vger.kernel.org X-Gm-Message-State: AOJu0Ywn4L2GP9xl/UOt/VyrdHfeUx5Y1ceW5wsnUOFsRxH3a7G/2+ti KV+m1NGpE9EAFsg6cHx7eFiQyywEs0wT/700U59xxWOzgDM+uNKsm1QjE7J/QOG+PoTtDol8LnB XaA== X-Received: from pjbok18.prod.google.com ([2002:a17:90b:1d52:b0:367:db79:9af7]) (user=wakel job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2d44:b0:369:b2c9:a0a with SMTP id 98e67ed59e1d1-36a47ab457fmr15337364a91.13.1779757599763; Mon, 25 May 2026 18:06:39 -0700 (PDT) Date: Tue, 26 May 2026 01:06:34 +0000 In-Reply-To: <20260526010635.23980-1-wakel@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260525075748.3720995-1-wakel@google.com> <20260526010635.23980-1-wakel@google.com> X-Mailer: git-send-email 2.54.0.746.g67dd491aae-goog Message-ID: <20260526010635.23980-2-wakel@google.com> Subject: [PATCH v2 1/2] selftests/futex: Migrate functional tests to harness From: Wake Liu To: Thomas Gleixner , Ingo Molnar , Shuah Khan , linux-kselftest@vger.kernel.org Cc: Peter Zijlstra , Darren Hart , Davidlohr Bueso , "=?UTF-8?q?Andr=C3=A9=20Almeida?=" , Carlos Llamas , linux-kernel@vger.kernel.org, wakel@google.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, multiple futex functional tests (wait_timeout, waitv, wait_wouldblock) mix low-level ksft_* logging and result APIs with the kselftest_harness.h framework. On older kernels where system calls like futex_waitv are missing (returning -ENOSYS), this mixed usage triggers framework inconsistencies, causing the test to fail with: "Illegal usage of low-level ksft APIs in harness test". Address this by completely refactoring these tests to exclusively use the high-level kselftest_harness.h framework (gtest-like API), mapping all low-level calls to native harness macros: - Non-fatal assertions: Replace ksft_test_result_fail() with EXPECT_EQ() and EXPECT_NE(). - Fatal assertions: Replace ksft_exit_fail_msg() with ASSERT_EQ() and ASSERT_TRUE() to immediately terminate execution upon setup failure. - Test skipping: Replace ksft_exit_skip() with the graceful SKIP() macro combined with early runtime availability checks for sys_futex_waitv. - Debug logging: Replace ksft_print_dbg_msg() with TH_LOG() to inherit automatic file/line context. - Success reporting: Remove explicit ksft_test_result_pass() calls, deferring to automated harness completion reporting. Additionally: - Fix a critical SIGSEGV crash in early syscall probing logic caused by passing a NULL pointer to inline user-space timespec conversions. - Introduce TEST_TIMEOUT() and GET_ABS_TIMEOUT() macros in wait_timeout to encapsulate assertions while preserving source line attribution. - Pass test metadata (_metadata) into secondary threads to allow native harness assertions during concurrent execution. Signed-off-by: Wake Liu --- .../futex/functional/futex_wait_timeout.c | 104 ++++++++---------- .../futex/functional/futex_wait_wouldblock.c | 33 +++--- .../selftests/futex/functional/futex_waitv.c | 100 ++++++++--------- .../selftests/futex/include/futex2test.h | 10 ++ 4 files changed, 117 insertions(+), 130 deletions(-) diff --git a/tools/testing/selftests/futex/functional/futex_wait_timeout.c = b/tools/testing/selftests/futex/functional/futex_wait_timeout.c index 674dd13af421..a79ec51d0f34 100644 --- a/tools/testing/selftests/futex/functional/futex_wait_timeout.c +++ b/tools/testing/selftests/futex/functional/futex_wait_timeout.c @@ -31,53 +31,43 @@ static pthread_barrier_t barrier; */ void *get_pi_lock(void *arg) { + struct __test_metadata *_metadata =3D (struct __test_metadata *)arg; int ret; volatile futex_t lock =3D 0; =20 ret =3D futex_lock_pi(&futex_pi, NULL, 0, 0); - if (ret !=3D 0) - ksft_exit_fail_msg("futex_lock_pi failed\n"); + ASSERT_EQ(ret, 0) TH_LOG("futex_lock_pi failed"); =20 pthread_barrier_wait(&barrier); =20 /* Blocks forever */ ret =3D futex_wait(&lock, 0, NULL, 0); - ksft_exit_fail_msg("futex_wait failed\n"); + ASSERT_TRUE(0) TH_LOG("futex_wait returned unexpectedly: %d", ret); =20 return NULL; } =20 -/* - * Check if the function returned the expected error - */ -static void test_timeout(int res, char *test_name, int err) -{ - if (!res || errno !=3D err) { - ksft_test_result_fail("%s returned %d\n", test_name, - res < 0 ? errno : res); - } else { - ksft_test_result_pass("%s succeeds\n", test_name); - } -} - -/* - * Calculate absolute timeout and correct overflow - */ -static int futex_get_abs_timeout(clockid_t clockid, struct timespec *to, - long timeout_ns) -{ - if (clock_gettime(clockid, to)) - ksft_exit_fail_msg("clock_gettime failed\n"); - - to->tv_nsec +=3D timeout_ns; - - if (to->tv_nsec >=3D 1000000000) { - to->tv_sec++; - to->tv_nsec -=3D 1000000000; - } - - return 0; -} +#define TEST_TIMEOUT(_res, _test_name, _err) do { \ + if ((_res) < 0 && errno =3D=3D ENOSYS && (_err) !=3D ENOSYS) { \ + SKIP(return, "%s is not supported (ENOSYS)", _test_name); \ + } \ + EXPECT_EQ((_res), -1) \ + TH_LOG("%s returned unexpected result: %d", _test_name, (_res)); \ + if ((_res) =3D=3D -1) { \ + EXPECT_EQ(errno, (_err)) \ + TH_LOG("%s returned unexpected errno: %d (expected %d)", \ + _test_name, errno, (_err)); \ + } \ +} while (0) + +#define GET_ABS_TIMEOUT(_clockid, _to, _timeout_ns) do { \ + ASSERT_EQ(clock_gettime((_clockid), (_to)), 0) TH_LOG("clock_gettime fail= ed"); \ + (_to)->tv_nsec +=3D (_timeout_ns); \ + if ((_to)->tv_nsec >=3D 1000000000) { \ + (_to)->tv_sec++; \ + (_to)->tv_nsec -=3D 1000000000; \ + } \ +} while (0) =20 TEST(wait_bitset) { @@ -90,19 +80,17 @@ TEST(wait_bitset) to.tv_nsec =3D timeout_ns; =20 res =3D futex_wait(&f1, f1, &to, 0); - test_timeout(res, "futex_wait relative", ETIMEDOUT); + TEST_TIMEOUT(res, "futex_wait relative", ETIMEDOUT); =20 /* FUTEX_WAIT_BITSET with CLOCK_REALTIME */ - if (futex_get_abs_timeout(CLOCK_REALTIME, &to, timeout_ns)) - ksft_test_result_error("get_time error"); + GET_ABS_TIMEOUT(CLOCK_REALTIME, &to, timeout_ns); res =3D futex_wait_bitset(&f1, f1, &to, 1, FUTEX_CLOCK_REALTIME); - test_timeout(res, "futex_wait_bitset realtime", ETIMEDOUT); + TEST_TIMEOUT(res, "futex_wait_bitset realtime", ETIMEDOUT); =20 /* FUTEX_WAIT_BITSET with CLOCK_MONOTONIC */ - if (futex_get_abs_timeout(CLOCK_MONOTONIC, &to, timeout_ns)) - ksft_test_result_error("get_time error"); + GET_ABS_TIMEOUT(CLOCK_MONOTONIC, &to, timeout_ns); res =3D futex_wait_bitset(&f1, f1, &to, 1, 0); - test_timeout(res, "futex_wait_bitset monotonic", ETIMEDOUT); + TEST_TIMEOUT(res, "futex_wait_bitset monotonic", ETIMEDOUT); } =20 TEST(requeue_pi) @@ -112,17 +100,14 @@ TEST(requeue_pi) int res; =20 /* FUTEX_WAIT_REQUEUE_PI with CLOCK_REALTIME */ - if (futex_get_abs_timeout(CLOCK_REALTIME, &to, timeout_ns)) - ksft_test_result_error("get_time error"); + GET_ABS_TIMEOUT(CLOCK_REALTIME, &to, timeout_ns); res =3D futex_wait_requeue_pi(&f1, f1, &futex_pi, &to, FUTEX_CLOCK_REALTI= ME); - test_timeout(res, "futex_wait_requeue_pi realtime", ETIMEDOUT); + TEST_TIMEOUT(res, "futex_wait_requeue_pi realtime", ETIMEDOUT); =20 /* FUTEX_WAIT_REQUEUE_PI with CLOCK_MONOTONIC */ - if (futex_get_abs_timeout(CLOCK_MONOTONIC, &to, timeout_ns)) - ksft_test_result_error("get_time error"); + GET_ABS_TIMEOUT(CLOCK_MONOTONIC, &to, timeout_ns); res =3D futex_wait_requeue_pi(&f1, f1, &futex_pi, &to, 0); - test_timeout(res, "futex_wait_requeue_pi monotonic", ETIMEDOUT); - + TEST_TIMEOUT(res, "futex_wait_requeue_pi monotonic", ETIMEDOUT); } =20 TEST(lock_pi) @@ -133,7 +118,8 @@ TEST(lock_pi) =20 /* Create a thread that will lock forever so any waiter will timeout */ pthread_barrier_init(&barrier, NULL, 2); - pthread_create(&thread, NULL, get_pi_lock, NULL); + ASSERT_EQ(pthread_create(&thread, NULL, get_pi_lock, _metadata), 0) + TH_LOG("pthread_create failed"); =20 /* Wait until the other thread calls futex_lock_pi() */ pthread_barrier_wait(&barrier); @@ -149,14 +135,13 @@ TEST(lock_pi) * time or your time machine) the monotonic clock value is always * smaller than realtime and the syscall will timeout immediately. */ - if (futex_get_abs_timeout(CLOCK_REALTIME, &to, timeout_ns)) - ksft_test_result_error("get_time error"); + GET_ABS_TIMEOUT(CLOCK_REALTIME, &to, timeout_ns); res =3D futex_lock_pi(&futex_pi, &to, 0, 0); - test_timeout(res, "futex_lock_pi realtime", ETIMEDOUT); + TEST_TIMEOUT(res, "futex_lock_pi realtime", ETIMEDOUT); =20 /* Test operations that don't support FUTEX_CLOCK_REALTIME */ res =3D futex_lock_pi(&futex_pi, NULL, 0, FUTEX_CLOCK_REALTIME); - test_timeout(res, "futex_lock_pi invalid timeout flag", ENOSYS); + TEST_TIMEOUT(res, "futex_lock_pi invalid timeout flag", ENOSYS); } =20 TEST(waitv) @@ -171,17 +156,18 @@ TEST(waitv) struct timespec to; int res; =20 + if (!is_futex_waitv_supported()) + SKIP(return, "futex_waitv syscall not supported"); + /* futex_waitv with CLOCK_MONOTONIC */ - if (futex_get_abs_timeout(CLOCK_MONOTONIC, &to, timeout_ns)) - ksft_test_result_error("get_time error"); + GET_ABS_TIMEOUT(CLOCK_MONOTONIC, &to, timeout_ns); res =3D futex_waitv(&waitv, 1, 0, &to, CLOCK_MONOTONIC); - test_timeout(res, "futex_waitv monotonic", ETIMEDOUT); + TEST_TIMEOUT(res, "futex_waitv monotonic", ETIMEDOUT); =20 /* futex_waitv with CLOCK_REALTIME */ - if (futex_get_abs_timeout(CLOCK_REALTIME, &to, timeout_ns)) - ksft_test_result_error("get_time error"); + GET_ABS_TIMEOUT(CLOCK_REALTIME, &to, timeout_ns); res =3D futex_waitv(&waitv, 1, 0, &to, CLOCK_REALTIME); - test_timeout(res, "futex_waitv realtime", ETIMEDOUT); + TEST_TIMEOUT(res, "futex_waitv realtime", ETIMEDOUT); } =20 TEST_HARNESS_MAIN diff --git a/tools/testing/selftests/futex/functional/futex_wait_wouldblock= .c b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c index 9ff936ecf164..5683569e83d9 100644 --- a/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c +++ b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c @@ -28,21 +28,19 @@ =20 #define timeout_ns 100000 =20 + TEST(futex_wait_wouldblock) { struct timespec to =3D {.tv_sec =3D 0, .tv_nsec =3D timeout_ns}; futex_t f1 =3D FUTEX_INITIALIZER; int res; =20 - ksft_print_dbg_msg("Calling futex_wait on f1: %u @ %p with val=3D%u\n", f= 1, &f1, f1+1); + TH_LOG("Calling futex_wait on f1: %u @ %p with val=3D%u", f1, &f1, f1+1); res =3D futex_wait(&f1, f1+1, &to, FUTEX_PRIVATE_FLAG); - if (!res || errno !=3D EWOULDBLOCK) { - ksft_test_result_fail("futex_wait returned: %d %s\n", - res ? errno : res, - res ? strerror(errno) : ""); - } else { - ksft_test_result_pass("futex_wait\n"); - } + EXPECT_EQ(res, -1) TH_LOG("futex_wait returned unexpected result: %d", re= s); + if (res =3D=3D -1) + EXPECT_EQ(errno, EWOULDBLOCK) + TH_LOG("futex_wait returned unexpected errno: %d", errno); } =20 TEST(futex_waitv_wouldblock) @@ -57,8 +55,10 @@ TEST(futex_waitv_wouldblock) }; int res; =20 - if (clock_gettime(CLOCK_MONOTONIC, &to)) - ksft_exit_fail_msg("clock_gettime failed %d\n", errno); + if (!is_futex_waitv_supported()) + SKIP(return, "futex_waitv syscall not supported"); + + ASSERT_EQ(clock_gettime(CLOCK_MONOTONIC, &to), 0) TH_LOG("clock_gettime f= ailed"); =20 to.tv_nsec +=3D timeout_ns; =20 @@ -67,15 +67,12 @@ TEST(futex_waitv_wouldblock) to.tv_nsec -=3D 1000000000; } =20 - ksft_print_dbg_msg("Calling futex_waitv on f1: %u @ %p with val=3D%u\n", = f1, &f1, f1+1); + TH_LOG("Calling futex_waitv on f1: %u @ %p with val=3D%u", f1, &f1, f1+1); res =3D futex_waitv(&waitv, 1, 0, &to, CLOCK_MONOTONIC); - if (!res || errno !=3D EWOULDBLOCK) { - ksft_test_result_fail("futex_waitv returned: %d %s\n", - res ? errno : res, - res ? strerror(errno) : ""); - } else { - ksft_test_result_pass("futex_waitv\n"); - } + EXPECT_EQ(res, -1) TH_LOG("futex_waitv returned unexpected result: %d", r= es); + if (res =3D=3D -1) + EXPECT_EQ(errno, EWOULDBLOCK) + TH_LOG("futex_waitv returned unexpected errno: %d", errno); } =20 TEST_HARNESS_MAIN diff --git a/tools/testing/selftests/futex/functional/futex_waitv.c b/tools= /testing/selftests/futex/functional/futex_waitv.c index b5ada9fdb26f..3053f69cf0c3 100644 --- a/tools/testing/selftests/futex/functional/futex_waitv.c +++ b/tools/testing/selftests/futex/functional/futex_waitv.c @@ -25,24 +25,24 @@ static struct futex_waitv waitv[NR_FUTEXES]; u_int32_t futexes[NR_FUTEXES] =3D {0}; =20 + void *waiterfn(void *arg) { + struct __test_metadata *_metadata =3D (struct __test_metadata *)arg; struct timespec to; int res; =20 /* setting absolute timeout for futex2 */ - if (clock_gettime(CLOCK_MONOTONIC, &to)) - ksft_exit_fail_msg("gettime64 failed\n"); + ASSERT_EQ(clock_gettime(CLOCK_MONOTONIC, &to), 0) TH_LOG("gettime64 faile= d"); =20 to.tv_sec++; =20 res =3D futex_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC); if (res < 0) { - ksft_test_result_fail("futex_waitv returned: %d %s\n", - errno, strerror(errno)); - } else if (res !=3D NR_FUTEXES - 1) { - ksft_test_result_fail("futex_waitv returned: %d, expecting %d\n", - res, NR_FUTEXES - 1); + EXPECT_EQ(res, NR_FUTEXES - 1) TH_LOG("futex_waitv failed: %s", strerror= (errno)); + } else { + EXPECT_EQ(res, NR_FUTEXES - 1) + TH_LOG("futex_waitv returned %d, expected %d", res, NR_FUTEXES - 1); } =20 return NULL; @@ -53,6 +53,9 @@ TEST(private_waitv) pthread_t waiter; int res, i; =20 + if (!is_futex_waitv_supported()) + SKIP(return, "futex_waitv syscall not supported"); + for (i =3D 0; i < NR_FUTEXES; i++) { waitv[i].uaddr =3D (uintptr_t)&futexes[i]; waitv[i].flags =3D FUTEX_32 | FUTEX_PRIVATE_FLAG; @@ -61,19 +64,15 @@ TEST(private_waitv) } =20 /* Private waitv */ - if (pthread_create(&waiter, NULL, waiterfn, NULL)) - ksft_exit_fail_msg("pthread_create failed\n"); + ASSERT_EQ(pthread_create(&waiter, NULL, waiterfn, _metadata), 0) + TH_LOG("pthread_create failed"); =20 usleep(WAKE_WAIT_US); =20 res =3D futex_wake(u64_to_ptr(waitv[NR_FUTEXES - 1].uaddr), 1, FUTEX_PRIV= ATE_FLAG); - if (res !=3D 1) { - ksft_test_result_fail("futex_wake private returned: %d %s\n", - res ? errno : res, - res ? strerror(errno) : ""); - } else { - ksft_test_result_pass("futex_waitv private\n"); - } + EXPECT_EQ(res, 1) + TH_LOG("futex_wake private returned: %d %s", + res, res < 0 ? strerror(errno) : ""); } =20 TEST(shared_waitv) @@ -81,15 +80,17 @@ TEST(shared_waitv) pthread_t waiter; int res, i; =20 + if (!is_futex_waitv_supported()) + SKIP(return, "futex_waitv syscall not supported"); + /* Shared waitv */ for (i =3D 0; i < NR_FUTEXES; i++) { int shm_id =3D shmget(IPC_PRIVATE, 4096, IPC_CREAT | 0666); =20 if (shm_id < 0) { if (errno =3D=3D ENOSYS) - ksft_exit_skip("shmget syscall not supported\n"); - perror("shmget"); - exit(1); + SKIP(return, "shmget syscall not supported"); + ASSERT_GE(shm_id, 0) TH_LOG("shmget failed"); } =20 unsigned int *shared_data =3D shmat(shm_id, NULL, 0); @@ -101,19 +102,15 @@ TEST(shared_waitv) waitv[i].__reserved =3D 0; } =20 - if (pthread_create(&waiter, NULL, waiterfn, NULL)) - ksft_exit_fail_msg("pthread_create failed\n"); + ASSERT_EQ(pthread_create(&waiter, NULL, waiterfn, _metadata), 0) + TH_LOG("pthread_create failed"); =20 usleep(WAKE_WAIT_US); =20 res =3D futex_wake(u64_to_ptr(waitv[NR_FUTEXES - 1].uaddr), 1, 0); - if (res !=3D 1) { - ksft_test_result_fail("futex_wake shared returned: %d %s\n", - res ? errno : res, - res ? strerror(errno) : ""); - } else { - ksft_test_result_pass("futex_waitv shared\n"); - } + EXPECT_EQ(res, 1) + TH_LOG("futex_wake shared returned: %d %s", + res, res < 0 ? strerror(errno) : ""); =20 for (i =3D 0; i < NR_FUTEXES; i++) shmdt(u64_to_ptr(waitv[i].uaddr)); @@ -124,21 +121,21 @@ TEST(invalid_flag) struct timespec to; int res; =20 + if (!is_futex_waitv_supported()) + SKIP(return, "futex_waitv syscall not supported"); + /* Testing a waiter without FUTEX_32 flag */ waitv[0].flags =3D FUTEX_PRIVATE_FLAG; =20 - if (clock_gettime(CLOCK_MONOTONIC, &to)) - ksft_exit_fail_msg("gettime64 failed\n"); + ASSERT_EQ(clock_gettime(CLOCK_MONOTONIC, &to), 0) TH_LOG("gettime64 faile= d"); =20 to.tv_sec++; =20 res =3D futex_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC); if (res =3D=3D EINVAL) { - ksft_test_result_fail("futex_waitv private returned: %d %s\n", + EXPECT_TRUE(0) TH_LOG("futex_waitv private returned: %d %s", res ? errno : res, res ? strerror(errno) : ""); - } else { - ksft_test_result_pass("futex_waitv without FUTEX_32\n"); } } =20 @@ -147,22 +144,22 @@ TEST(unaligned_address) struct timespec to; int res; =20 + if (!is_futex_waitv_supported()) + SKIP(return, "futex_waitv syscall not supported"); + /* Testing a waiter with an unaligned address */ waitv[0].flags =3D FUTEX_PRIVATE_FLAG | FUTEX_32; waitv[0].uaddr =3D 1; =20 - if (clock_gettime(CLOCK_MONOTONIC, &to)) - ksft_exit_fail_msg("gettime64 failed\n"); + ASSERT_EQ(clock_gettime(CLOCK_MONOTONIC, &to), 0) TH_LOG("gettime64 faile= d"); =20 to.tv_sec++; =20 res =3D futex_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC); if (res =3D=3D EINVAL) { - ksft_test_result_fail("futex_wake private returned: %d %s\n", + EXPECT_TRUE(0) TH_LOG("futex_wake private returned: %d %s", res ? errno : res, res ? strerror(errno) : ""); - } else { - ksft_test_result_pass("futex_waitv with an unaligned address\n"); } } =20 @@ -171,36 +168,33 @@ TEST(null_address) struct timespec to; int res; =20 + if (!is_futex_waitv_supported()) + SKIP(return, "futex_waitv syscall not supported"); + /* Testing a NULL address for waiters.uaddr */ waitv[0].uaddr =3D 0x00000000; =20 - if (clock_gettime(CLOCK_MONOTONIC, &to)) - ksft_exit_fail_msg("gettime64 failed\n"); + ASSERT_EQ(clock_gettime(CLOCK_MONOTONIC, &to), 0) TH_LOG("gettime64 faile= d"); =20 to.tv_sec++; =20 res =3D futex_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC); if (res =3D=3D EINVAL) { - ksft_test_result_fail("futex_waitv private returned: %d %s\n", + EXPECT_TRUE(0) TH_LOG("futex_waitv private returned: %d %s", res ? errno : res, res ? strerror(errno) : ""); - } else { - ksft_test_result_pass("futex_waitv NULL address in waitv.uaddr\n"); } =20 /* Testing a NULL address for *waiters */ - if (clock_gettime(CLOCK_MONOTONIC, &to)) - ksft_exit_fail_msg("gettime64 failed\n"); + ASSERT_EQ(clock_gettime(CLOCK_MONOTONIC, &to), 0) TH_LOG("gettime64 faile= d"); =20 to.tv_sec++; =20 res =3D futex_waitv(NULL, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC); if (res =3D=3D EINVAL) { - ksft_test_result_fail("futex_waitv private returned: %d %s\n", + EXPECT_TRUE(0) TH_LOG("futex_waitv private returned: %d %s", res ? errno : res, res ? strerror(errno) : ""); - } else { - ksft_test_result_pass("futex_waitv NULL address in *waiters\n"); } } =20 @@ -209,19 +203,19 @@ TEST(invalid_clockid) struct timespec to; int res; =20 + if (!is_futex_waitv_supported()) + SKIP(return, "futex_waitv syscall not supported"); + /* Testing an invalid clockid */ - if (clock_gettime(CLOCK_MONOTONIC, &to)) - ksft_exit_fail_msg("gettime64 failed\n"); + ASSERT_EQ(clock_gettime(CLOCK_MONOTONIC, &to), 0) TH_LOG("gettime64 faile= d"); =20 to.tv_sec++; =20 res =3D futex_waitv(NULL, NR_FUTEXES, 0, &to, CLOCK_TAI); if (res =3D=3D EINVAL) { - ksft_test_result_fail("futex_waitv private returned: %d %s\n", + EXPECT_TRUE(0) TH_LOG("futex_waitv private returned: %d %s", res ? errno : res, res ? strerror(errno) : ""); - } else { - ksft_test_result_pass("futex_waitv invalid clockid\n"); } } =20 diff --git a/tools/testing/selftests/futex/include/futex2test.h b/tools/tes= ting/selftests/futex/include/futex2test.h index 1f625b39948a..d157ba45eabc 100644 --- a/tools/testing/selftests/futex/include/futex2test.h +++ b/tools/testing/selftests/futex/include/futex2test.h @@ -6,6 +6,8 @@ */ #include #include +#include +#include =20 #define u64_to_ptr(x) ((void *)(uintptr_t)(x)) =20 @@ -96,3 +98,11 @@ static inline int futex2_wake(void *uaddr, int nr, unsig= ned int flags) { return syscall(__NR_futex_wake, uaddr, ~0U, nr, flags); } + +static inline bool is_futex_waitv_supported(void) +{ + struct timespec ts =3D {0, 0}; + int res =3D futex_waitv(NULL, 0, 0, &ts, CLOCK_MONOTONIC); + + return !(res < 0 && errno =3D=3D ENOSYS); +} --=20 2.54.0.746.g67dd491aae-goog From nobody Mon Jun 8 22:51:09 2026 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E058F274670 for ; Tue, 26 May 2026 01:06:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779757604; cv=none; b=LTFg9ODQNzLRdrvffgKmtnXOXmClwAGTrCEHMckLjr2096H12GG6qiqybr77JGakvqM62dtp3yu6JFC7X79fS843zKWusdup7EG5aRD5aEiyIWUNMbrcluTQq7EskFIrsw0TH2rk+L04yKJlJNV+b0cqIG/52q9YzzvWTQ9kw4I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779757604; c=relaxed/simple; bh=VXTy/Je1jTfdeX/4YnLlSdsBp3Faa7uVhPtRansJPTI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JWrJ87kb0T+SXazZShg9KeHyEiHRWobR1Hv9HI7a2m990SuGJTqFm+OevTDpcnll54Z7DjXvlc5YaYIwUcsKEGyDQ953GCezGdBVS3yc1qmWxBts04SMEF7mEAshgJqOtzSooZ+/irDF08egKFZDS/YakLlIOE8n3VkCsRIVhVI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--wakel.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=FnLGKyCR; arc=none smtp.client-ip=209.85.215.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--wakel.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="FnLGKyCR" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c802545ae0eso6107272a12.2 for ; Mon, 25 May 2026 18:06:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779757602; x=1780362402; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=BgcP78CuJM+w46yzARBBO5pXbQrpyUCHSKmRsplZX+M=; b=FnLGKyCREJ2gQmopZXccT6wUUr2D3oXZy0Uup59/WaffTlmRp5qVdi+48N2gnBznqr R64UbxonYnVzFLRDXCfavTMzqWP286aZRgvQxmpEdPwEv5kTQCNon7dtnQa7vGtBaVGD o100nDMAUlQ5eiGT9C7FwtXfwXWBr0QjHTiUZ/+F8ixkvFphCUo25IjVkHlKPJTNBpZN Dm9VRP25TDj2bcRH537cwPi0Npq+XVfdF/l2Ukkz2ucQ3KJLR3JuJaNlCkGE2oAI6wiU meRLz1Y4uETo1ZETKWZyMwew31/GqDsVQ+9JNvXhGLaOUhMirntwf9TNy2X+rNA4HZJ6 hUHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779757602; x=1780362402; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BgcP78CuJM+w46yzARBBO5pXbQrpyUCHSKmRsplZX+M=; b=qEqiHdDN+mY3HmYQ/8XFyD/dsgQ0mI5Gur+MIye6Bop3VZgPuJ6ZQUqVAIwwZR2yHC 9sD3WfRrC1XAAoSlGIY+DVpybwTLTNeObADNF0qRq9543JbElwaCgO++hYNhCJNeaxzt tw9vOsKvZ1udSVwCbfbiu4FUxh7ae3TlwzWSoJfU4T5FXUONJfkhzZV1wbEr52oBjkaj gPEsu+MsKkNDPiMWEe1TRU9VCpmspN/p6Z0km782yzxYAmCSe+8VnCGuz0RscPkPe00R i+0SuIZ2GB0ayHxOswDLPegXS5b48Ktb0dAJ3S7YGg7Y9TmrC54lP11OnOcZ7tvfoxTL rDYw== X-Forwarded-Encrypted: i=1; AFNElJ9629+hRv8E+t3NE0ljS6UtPjrS1r2aZV0YHgMqQVLnyaVjfHk6PdyRSVISXupDzgsdsZbVfpb4RVdMQmE=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4axBz4Yp7tX4mDesHyE8c1h/spp/i0xy9tvqRvFSyA5/g7trj BBKwawIrRkjct6ZGQSXN99pdW9W8OR4lv4Odbb2UeZQzRoOkWMkGEuzPILy/m0k1Yq/IzSWopsj Kxg== X-Received: from pfiu6.prod.google.com ([2002:a05:6a00:1246:b0:82f:2a0d:b24c]) (user=wakel job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:92a5:b0:82c:d9d0:f482 with SMTP id d2e1a72fcca58-8415f587d88mr15926644b3a.46.1779757601792; Mon, 25 May 2026 18:06:41 -0700 (PDT) Date: Tue, 26 May 2026 01:06:35 +0000 In-Reply-To: <20260526010635.23980-1-wakel@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260525075748.3720995-1-wakel@google.com> <20260526010635.23980-1-wakel@google.com> X-Mailer: git-send-email 2.54.0.746.g67dd491aae-goog Message-ID: <20260526010635.23980-3-wakel@google.com> Subject: [PATCH v2 2/2] selftests/futex: Correct validation logic in waitv From: Wake Liu To: Thomas Gleixner , Ingo Molnar , Shuah Khan , linux-kselftest@vger.kernel.org Cc: Peter Zijlstra , Darren Hart , Davidlohr Bueso , "=?UTF-8?q?Andr=C3=A9=20Almeida?=" , Carlos Llamas , linux-kernel@vger.kernel.org, wakel@google.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In futex_waitv negative tests (invalid_flag, unaligned_address, etc.), test results were previously evaluated as: if (res =3D=3D EINVAL) Since sys_futex_waitv returns -1 on error and sets errno, direct positive comparisons against res are always false, causing tests to silently pass regardless of real errors. Correct these validations to assert EXPECT_EQ(res, -1) and compare errno directly against expected constants. Signed-off-by: Wake Liu --- .../selftests/futex/functional/futex_waitv.c | 45 +++++++++---------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/tools/testing/selftests/futex/functional/futex_waitv.c b/tools= /testing/selftests/futex/functional/futex_waitv.c index 3053f69cf0c3..6a6fc49708a2 100644 --- a/tools/testing/selftests/futex/functional/futex_waitv.c +++ b/tools/testing/selftests/futex/functional/futex_waitv.c @@ -132,11 +132,10 @@ TEST(invalid_flag) to.tv_sec++; =20 res =3D futex_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC); - if (res =3D=3D EINVAL) { - EXPECT_TRUE(0) TH_LOG("futex_waitv private returned: %d %s", - res ? errno : res, - res ? strerror(errno) : ""); - } + EXPECT_EQ(res, -1) TH_LOG("futex_waitv returned unexpected result: %d", r= es); + if (res =3D=3D -1) + EXPECT_EQ(errno, EINVAL) + TH_LOG("futex_waitv returned unexpected errno: %d", errno); } =20 TEST(unaligned_address) @@ -156,11 +155,10 @@ TEST(unaligned_address) to.tv_sec++; =20 res =3D futex_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC); - if (res =3D=3D EINVAL) { - EXPECT_TRUE(0) TH_LOG("futex_wake private returned: %d %s", - res ? errno : res, - res ? strerror(errno) : ""); - } + EXPECT_EQ(res, -1) TH_LOG("futex_waitv returned unexpected result: %d", r= es); + if (res =3D=3D -1) + EXPECT_EQ(errno, EINVAL) + TH_LOG("futex_waitv returned unexpected errno: %d", errno); } =20 TEST(null_address) @@ -179,11 +177,10 @@ TEST(null_address) to.tv_sec++; =20 res =3D futex_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC); - if (res =3D=3D EINVAL) { - EXPECT_TRUE(0) TH_LOG("futex_waitv private returned: %d %s", - res ? errno : res, - res ? strerror(errno) : ""); - } + EXPECT_EQ(res, -1) TH_LOG("futex_waitv returned unexpected result: %d", r= es); + if (res =3D=3D -1) + EXPECT_EQ(errno, EINVAL) + TH_LOG("futex_waitv returned unexpected errno: %d", errno); =20 /* Testing a NULL address for *waiters */ ASSERT_EQ(clock_gettime(CLOCK_MONOTONIC, &to), 0) TH_LOG("gettime64 faile= d"); @@ -191,11 +188,10 @@ TEST(null_address) to.tv_sec++; =20 res =3D futex_waitv(NULL, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC); - if (res =3D=3D EINVAL) { - EXPECT_TRUE(0) TH_LOG("futex_waitv private returned: %d %s", - res ? errno : res, - res ? strerror(errno) : ""); - } + EXPECT_EQ(res, -1) TH_LOG("futex_waitv returned unexpected result: %d", r= es); + if (res =3D=3D -1) + EXPECT_EQ(errno, EINVAL) + TH_LOG("futex_waitv returned unexpected errno: %d", errno); } =20 TEST(invalid_clockid) @@ -212,11 +208,10 @@ TEST(invalid_clockid) to.tv_sec++; =20 res =3D futex_waitv(NULL, NR_FUTEXES, 0, &to, CLOCK_TAI); - if (res =3D=3D EINVAL) { - EXPECT_TRUE(0) TH_LOG("futex_waitv private returned: %d %s", - res ? errno : res, - res ? strerror(errno) : ""); - } + EXPECT_EQ(res, -1) TH_LOG("futex_waitv returned unexpected result: %d", r= es); + if (res =3D=3D -1) + EXPECT_EQ(errno, EINVAL) + TH_LOG("futex_waitv returned unexpected errno: %d", errno); } =20 TEST_HARNESS_MAIN --=20 2.54.0.746.g67dd491aae-goog