From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.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 DA32D380FD5 for ; Mon, 1 Jun 2026 06:51:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780296696; cv=none; b=bLLaIcmfkfmIMlJokqMwc8MU/5Qba560zU8AYihiLzhsKxpA+BMaNe8ybQ5W0zWjow/iPTvHZ22ZSy1MjYegZFXbPJT6Iv3mH8/AJGeeVt6ejb7J/XdeV5UHMwmSc1C/2wlaA/5nq9SPu0ogCjELF8m/1mE/RW3O7piOB0QrRzQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780296696; c=relaxed/simple; bh=x4rgUp/mVj2pfDU22FtK1/2AR5Xxc0PQDdzblyHnxfQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=iNM9CS+KJCKUOwe75vFad+l+g4Ym8c8hkVdiugSfZIdYivcunTqIduTebmLe+gztvxhMm2y9ifJwUpM3xXiIgxfoUcmKQg3tf7YHeW00n8o5uCMMZsIe+J9lTbbhfgUwS6sclXldIGEpVSOjMdGL78rUFdXwIKgduwSGVYwxQ6o= 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=KF6xLgFI; arc=none smtp.client-ip=209.85.210.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="KF6xLgFI" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-842264ce286so1235700b3a.0 for ; Sun, 31 May 2026 23:51:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780296692; x=1780901492; 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=6zWjUuiyTvzBfVRhWN5pZV2dCQqAFVFeSqiFeph+2d4=; b=KF6xLgFIT5NOzLeG+ishKxhQXtqU+A3y7f12BS+U20SAgA7Zw7lSrFYcBEksvOUodD M2vgAOvJIC8dRAd2Hwetq3iQ5gKh21u+jS+MKDGhZm9R/ipIPmKNwciKwkRzTX+L8L5N bH84nE+R0t/LTsd7kdcPWFkWWoS8l/AZX8v2ZNRy92VeRmLTd7MZd0vxxazPoG/j2zFQ 6FMCPboNabFdvT1C/KRYHydnM8z2FtAOJv3FkdiicdPPF5y7Nh1+leZlglxEuBluy53P eCbXRHBb9bd4JD+f9ilG7awNAVgMhDbFA1RZTEyRngGkIElFPjlNy6xncaUFnkHBWhhN Y1uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780296692; x=1780901492; 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=6zWjUuiyTvzBfVRhWN5pZV2dCQqAFVFeSqiFeph+2d4=; b=U+CI7EnDmmHJwsvPIL7yrs+hztWAkYt1ZQLD5m/sk2JE+5z8Ni5ZTpsLlwaTHCi+zZ ZAGNS8Z49HR5HUQrqWt7LtT40uTR5MmPMIIJpLVRySMGi+2xgwiytB5TdeLHGc9QGL1j YgLWTL7wyDzxSLFBZE1iaev4LtvA4uztzKxmZxvJeOC+PBcsrO3hkRABhwsONNciN2DW rajiuAcU69XCP6A5w7V2Mxvu34h4kHoERvOmYaOhIG/l/qUKfUhlz0K7L9MCM4Mg0q+x GqA8IfnEej1ORltFdJ+2BM6XmChLRGgQZzP4UfXl5j1uuP6rHARotMoYfIhf2b/S7bWs iTNg== X-Forwarded-Encrypted: i=1; AFNElJ9GsJnNX3G9b5eecth0Uur+aJGH3arjL+XJ1GAQH9NniUTeUrFNc4uBENmIeAviM/SjSzTC06ld9bnP9fM=@vger.kernel.org X-Gm-Message-State: AOJu0YwJIgw7RoG+j4mJ/VfT5jnz9V0cv4+HlRzHN560kcAYu/ig7Bfo cGhBR+peG+FY21llKPjFOuLxEduo/ahyeszgNBib28fYp1NtPDU7F0GU0jZZPXYV/Q46HbfbeJP kJw== X-Received: from pfco2.prod.google.com ([2002:a05:6a00:b902:b0:842:492e:19cb]) (user=wakel job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1ca8:b0:842:4f2d:c4e6 with SMTP id d2e1a72fcca58-8424f2dddeemr2371364b3a.9.1780296691790; Sun, 31 May 2026 23:51:31 -0700 (PDT) Date: Mon, 1 Jun 2026 06:51:20 +0000 In-Reply-To: <20260601065126.3623867-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: <20260601065126.3623867-1-wakel@google.com> X-Mailer: git-send-email 2.54.0.823.g6e5bcc1fc9-goog Message-ID: <20260601065126.3623867-2-wakel@google.com> Subject: [PATCH 1/7] selftests/futex: Migrate futex_requeue 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-Type: text/plain; charset="UTF-8" Migrate futex_requeue test to the kselftest harness framework, removing mixed legacy ksft_* API usages and ensuring proper thread joining. Signed-off-by: Wake Liu --- .../futex/functional/futex_requeue.c | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/futex/functional/futex_requeue.c b/tools/testing/selftests/futex/functional/futex_requeue.c index dcf0d5f2f312..76f0eb6756f8 100644 --- a/tools/testing/selftests/futex/functional/futex_requeue.c +++ b/tools/testing/selftests/futex/functional/futex_requeue.c @@ -7,6 +7,7 @@ #include #include +#include #include "futextest.h" #include "kselftest_harness.h" @@ -18,13 +19,18 @@ volatile futex_t *f1; void *waiterfn(void *arg) { + struct __test_metadata *_metadata = (struct __test_metadata *)arg; struct timespec to; + int res; to.tv_sec = 0; to.tv_nsec = timeout_ns; - if (futex_wait(f1, *f1, &to, 0)) - printf("waiter failed errno %d\n", errno); + res = futex_wait(f1, *f1, &to, 0); + if (res) { + EXPECT_EQ(res, 0) + TH_LOG("waiter failed errno %d: %s", errno, strerror(errno)); + } return NULL; } @@ -40,12 +46,15 @@ TEST(requeue_single) /* * Requeue a waiter from f1 to f2, and wake f2. */ - ASSERT_EQ(0, pthread_create(&waiter[0], NULL, waiterfn, NULL)); + ASSERT_EQ(pthread_create(&waiter[0], NULL, waiterfn, _metadata), 0) + TH_LOG("pthread_create failed"); usleep(WAKE_WAIT_US); - EXPECT_EQ(1, futex_cmp_requeue(f1, 0, &f2, 0, 1, 0)); - EXPECT_EQ(1, futex_wake(&f2, 1, 0)); + EXPECT_EQ(futex_cmp_requeue(f1, 0, &f2, 0, 1, 0), 1); + EXPECT_EQ(futex_wake(&f2, 1, 0), 1); + + pthread_join(waiter[0], NULL); } TEST(requeue_multiple) @@ -61,13 +70,18 @@ TEST(requeue_multiple) * Create 10 waiters at f1. At futex_requeue, wake 3 and requeue 7. * At futex_wake, wake INT_MAX (should be exactly 7). */ - for (i = 0; i < 10; i++) - ASSERT_EQ(0, pthread_create(&waiter[i], NULL, waiterfn, NULL)); + for (i = 0; i < 10; i++) { + ASSERT_EQ(pthread_create(&waiter[i], NULL, waiterfn, _metadata), 0) + TH_LOG("pthread_create failed for waiter %d", i); + } usleep(WAKE_WAIT_US); - EXPECT_EQ(10, futex_cmp_requeue(f1, 0, &f2, 3, 7, 0)); - EXPECT_EQ(7, futex_wake(&f2, INT_MAX, 0)); + EXPECT_EQ(futex_cmp_requeue(f1, 0, &f2, 3, 7, 0), 10); + EXPECT_EQ(futex_wake(&f2, INT_MAX, 0), 7); + + for (i = 0; i < 10; i++) + pthread_join(waiter[i], NULL); } TEST_HARNESS_MAIN -- 2.54.0.823.g6e5bcc1fc9-goog