mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for André Almeida" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: andrealmeid@igalia.com, Thomas Gleixner <tglx@linutronix.de>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: locking/futex] selftests/futex: Refactor futex_wait with kselftest_harness.h
Date: Sat, 20 Sep 2025 16:27:46 -0000	[thread overview]
Message-ID: <175838566654.709179.14223868025194566065.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250917-tonyk-robust_test_cleanup-v3-9-306b373c244d@igalia.com>

The following commit has been merged into the locking/futex branch of tip:

Commit-ID:     e5c04d0f3ea0dfa4858a449ff3153bc3cef6a140
Gitweb:        https://git.kernel.org/tip/e5c04d0f3ea0dfa4858a449ff3153bc3cef6a140
Author:        André Almeida <andrealmeid@igalia.com>
AuthorDate:    Wed, 17 Sep 2025 18:21:48 -03:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Sat, 20 Sep 2025 18:11:55 +02:00

selftests/futex: Refactor futex_wait with kselftest_harness.h

To reduce the boilerplate code, refactor futex_wait test to use
kselftest_harness header instead of futex's logging header.

Signed-off-by: André Almeida <andrealmeid@igalia.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 tools/testing/selftests/futex/functional/futex_wait.c | 103 +++------
 tools/testing/selftests/futex/functional/run.sh       |   2 +-
 2 files changed, 39 insertions(+), 66 deletions(-)

diff --git a/tools/testing/selftests/futex/functional/futex_wait.c b/tools/testing/selftests/futex/functional/futex_wait.c
index 685140d..152ca46 100644
--- a/tools/testing/selftests/futex/functional/futex_wait.c
+++ b/tools/testing/selftests/futex/functional/futex_wait.c
@@ -9,25 +9,16 @@
 #include <sys/shm.h>
 #include <sys/mman.h>
 #include <fcntl.h>
-#include "logging.h"
+
 #include "futextest.h"
+#include "../../kselftest_harness.h"
 
-#define TEST_NAME "futex-wait"
 #define timeout_ns  30000000
 #define WAKE_WAIT_US 10000
 #define SHM_PATH "futex_shm_file"
 
 void *futex;
 
-void usage(char *prog)
-{
-	printf("Usage: %s\n", prog);
-	printf("  -c	Use color\n");
-	printf("  -h	Display this help message\n");
-	printf("  -v L	Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n",
-	       VQUIET, VCRITICAL, VINFO);
-}
-
 static void *waiterfn(void *arg)
 {
 	struct timespec to;
@@ -45,53 +36,37 @@ static void *waiterfn(void *arg)
 	return NULL;
 }
 
-int main(int argc, char *argv[])
+TEST(private_futex)
 {
-	int res, ret = RET_PASS, fd, c, shm_id;
-	u_int32_t f_private = 0, *shared_data;
 	unsigned int flags = FUTEX_PRIVATE_FLAG;
+	u_int32_t f_private = 0;
 	pthread_t waiter;
-	void *shm;
+	int res;
 
 	futex = &f_private;
 
-	while ((c = getopt(argc, argv, "cht:v:")) != -1) {
-		switch (c) {
-		case 'c':
-			log_color(1);
-			break;
-		case 'h':
-			usage(basename(argv[0]));
-			exit(0);
-		case 'v':
-			log_verbosity(atoi(optarg));
-			break;
-		default:
-			usage(basename(argv[0]));
-			exit(1);
-		}
-	}
-
-	ksft_print_header();
-	ksft_set_plan(3);
-	ksft_print_msg("%s: Test futex_wait\n", basename(argv[0]));
-
 	/* Testing a private futex */
-	info("Calling private futex_wait on futex: %p\n", futex);
+	ksft_print_dbg_msg("Calling private futex_wait on futex: %p\n", futex);
 	if (pthread_create(&waiter, NULL, waiterfn, (void *) &flags))
-		error("pthread_create failed\n", errno);
+		ksft_exit_fail_msg("pthread_create failed\n");
 
 	usleep(WAKE_WAIT_US);
 
-	info("Calling private futex_wake on futex: %p\n", futex);
+	ksft_print_dbg_msg("Calling private futex_wake on futex: %p\n", futex);
 	res = futex_wake(futex, 1, FUTEX_PRIVATE_FLAG);
 	if (res != 1) {
 		ksft_test_result_fail("futex_wake private returned: %d %s\n",
 				      errno, strerror(errno));
-		ret = RET_FAIL;
 	} else {
 		ksft_test_result_pass("futex_wake private succeeds\n");
 	}
+}
+
+TEST(anon_page)
+{
+	u_int32_t *shared_data;
+	pthread_t waiter;
+	int res, shm_id;
 
 	/* Testing an anon page shared memory */
 	shm_id = shmget(IPC_PRIVATE, 4096, IPC_CREAT | 0666);
@@ -105,67 +80,65 @@ int main(int argc, char *argv[])
 	*shared_data = 0;
 	futex = shared_data;
 
-	info("Calling shared (page anon) futex_wait on futex: %p\n", futex);
+	ksft_print_dbg_msg("Calling shared (page anon) futex_wait on futex: %p\n", futex);
 	if (pthread_create(&waiter, NULL, waiterfn, NULL))
-		error("pthread_create failed\n", errno);
+		ksft_exit_fail_msg("pthread_create failed\n");
 
 	usleep(WAKE_WAIT_US);
 
-	info("Calling shared (page anon) futex_wake on futex: %p\n", futex);
+	ksft_print_dbg_msg("Calling shared (page anon) futex_wake on futex: %p\n", futex);
 	res = futex_wake(futex, 1, 0);
 	if (res != 1) {
 		ksft_test_result_fail("futex_wake shared (page anon) returned: %d %s\n",
 				      errno, strerror(errno));
-		ret = RET_FAIL;
 	} else {
 		ksft_test_result_pass("futex_wake shared (page anon) succeeds\n");
 	}
 
+	shmdt(shared_data);
+}
+
+TEST(file_backed)
+{
+	u_int32_t f_private = 0;
+	pthread_t waiter;
+	int res, fd;
+	void *shm;
 
 	/* Testing a file backed shared memory */
 	fd = open(SHM_PATH, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
-	if (fd < 0) {
-		perror("open");
-		exit(1);
-	}
+	if (fd < 0)
+		ksft_exit_fail_msg("open");
 
-	if (ftruncate(fd, sizeof(f_private))) {
-		perror("ftruncate");
-		exit(1);
-	}
+	if (ftruncate(fd, sizeof(f_private)))
+		ksft_exit_fail_msg("ftruncate");
 
 	shm = mmap(NULL, sizeof(f_private), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-	if (shm == MAP_FAILED) {
-		perror("mmap");
-		exit(1);
-	}
+	if (shm == MAP_FAILED)
+		ksft_exit_fail_msg("mmap");
 
 	memcpy(shm, &f_private, sizeof(f_private));
 
 	futex = shm;
 
-	info("Calling shared (file backed) futex_wait on futex: %p\n", futex);
+	ksft_print_dbg_msg("Calling shared (file backed) futex_wait on futex: %p\n", futex);
 	if (pthread_create(&waiter, NULL, waiterfn, NULL))
-		error("pthread_create failed\n", errno);
+		ksft_exit_fail_msg("pthread_create failed\n");
 
 	usleep(WAKE_WAIT_US);
 
-	info("Calling shared (file backed) futex_wake on futex: %p\n", futex);
+	ksft_print_dbg_msg("Calling shared (file backed) futex_wake on futex: %p\n", futex);
 	res = futex_wake(shm, 1, 0);
 	if (res != 1) {
 		ksft_test_result_fail("futex_wake shared (file backed) returned: %d %s\n",
 				      errno, strerror(errno));
-		ret = RET_FAIL;
 	} else {
 		ksft_test_result_pass("futex_wake shared (file backed) succeeds\n");
 	}
 
-	/* Freeing resources */
-	shmdt(shared_data);
 	munmap(shm, sizeof(f_private));
 	remove(SHM_PATH);
 	close(fd);
-
-	ksft_print_cnts();
-	return ret;
 }
+
+TEST_HARNESS_MAIN
diff --git a/tools/testing/selftests/futex/functional/run.sh b/tools/testing/selftests/futex/functional/run.sh
index 87666f2..1ce0f20 100755
--- a/tools/testing/selftests/futex/functional/run.sh
+++ b/tools/testing/selftests/futex/functional/run.sh
@@ -51,7 +51,7 @@ echo
 ./futex_wait_private_mapped_file
 
 echo
-./futex_wait $COLOR
+./futex_wait
 
 echo
 ./futex_requeue $COLOR

  reply	other threads:[~2025-09-20 16:27 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-17 21:21 [PATCH v3 00/15] selftests/futex: Refactor tests to use kselftest_harness.h André Almeida
2025-09-17 21:21 ` [PATCH v3 01/15] selftests: kselftest: Create ksft_print_dbg_msg() André Almeida
2025-09-20 16:27   ` [tip: locking/futex] " tip-bot2 for André Almeida
2025-09-25 11:47     ` Mark Brown
2025-09-25 14:14       ` [PATCH] tools/nolibc: Add stdbool.h to nolibc includes André Almeida
2025-09-25 14:24         ` Mark Brown
2025-09-25 14:37           ` André Almeida
2025-09-25 14:45             ` Mark Brown
2025-09-25 14:48               ` Thomas Weißschuh
2025-09-25 14:46             ` Thomas Weißschuh
2025-09-25 16:15         ` Thomas Weißschuh
2025-09-25 16:24           ` Mark Brown
2025-09-25 16:49             ` Thomas Weißschuh
2025-09-17 21:21 ` [PATCH v3 02/15] selftests/futex: Refactor futex_requeue_pi with kselftest_harness.h André Almeida
2025-09-20 16:27   ` [tip: locking/futex] " tip-bot2 for André Almeida
2025-09-17 21:21 ` [PATCH v3 03/15] selftests/futex: Refactor futex_requeue_pi_mismatched_ops " André Almeida
2025-09-20 16:27   ` [tip: locking/futex] " tip-bot2 for André Almeida
2025-09-17 21:21 ` [PATCH v3 04/15] selftests/futex: Refactor futex_requeue_pi_signal_restart " André Almeida
2025-09-20 16:27   ` [tip: locking/futex] " tip-bot2 for André Almeida
2025-09-17 21:21 ` [PATCH v3 05/15] selftests/futex: Refactor futex_wait_timeout " André Almeida
2025-09-20 16:27   ` [tip: locking/futex] " tip-bot2 for André Almeida
2025-09-17 21:21 ` [PATCH v3 06/15] selftests/futex: Refactor futex_wait_wouldblock " André Almeida
2025-09-20 16:27   ` [tip: locking/futex] " tip-bot2 for André Almeida
2025-09-17 21:21 ` [PATCH v3 07/15] selftests/futex: Refactor futex_wait_unitialized_heap " André Almeida
2025-09-20 16:27   ` [tip: locking/futex] " tip-bot2 for André Almeida
2025-09-17 21:21 ` [PATCH v3 08/15] selftests/futex: Refactor futex_wait_private_mapped_file " André Almeida
2025-09-20 16:27   ` [tip: locking/futex] " tip-bot2 for André Almeida
2025-09-17 21:21 ` [PATCH v3 09/15] selftests/futex: Refactor futex_wait " André Almeida
2025-09-20 16:27   ` tip-bot2 for André Almeida [this message]
2025-09-17 21:21 ` [PATCH v3 10/15] selftests/futex: Refactor futex_requeue " André Almeida
2025-09-20 16:27   ` [tip: locking/futex] " tip-bot2 for André Almeida
2025-09-17 21:21 ` [PATCH v3 11/15] selftests/futex: Refactor futex_waitv " André Almeida
2025-09-20 16:27   ` [tip: locking/futex] " tip-bot2 for André Almeida
2025-09-17 21:21 ` [PATCH v3 12/15] selftests/futex: Refactor futex_priv_hash " André Almeida
2025-09-20 16:27   ` [tip: locking/futex] " tip-bot2 for André Almeida
2025-09-17 21:21 ` [PATCH v3 13/15] selftests/futex: Refactor futex_numa_mpol " André Almeida
2025-09-20 16:27   ` [tip: locking/futex] " tip-bot2 for André Almeida
2025-09-17 21:21 ` [PATCH v3 14/15] selftests/futex: Drop logging.h include from futex_numa André Almeida
2025-09-20 16:27   ` [tip: locking/futex] " tip-bot2 for André Almeida
2025-09-17 21:21 ` [PATCH v3 15/15] selftests/futex: Remove logging.h file André Almeida
2025-09-20 16:27   ` [tip: locking/futex] " tip-bot2 for André Almeida

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=175838566654.709179.14223868025194566065.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=andrealmeid@igalia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.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

all inboxes | Powered by JetHome®