| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20250704-tonyk-robust_test_cleanup-v1-12-c0ff4f24c4e1@igalia.com>
Date: Fri, 04 Jul 2025 12:05:16 -0300
From: André Almeida <andrealmeid@...lia.com>
To: Shuah Khan <shuah@...nel.org>, Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>, Peter Zijlstra <peterz@...radead.org>,
Darren Hart <dvhart@...radead.org>, Davidlohr Bueso <dave@...olabs.net>,
Sebastian Andrzej Siewior <bigeasy@...utronix.de>
Cc: linux-kselftest@...r.kernel.org, linux-kernel@...r.kernel.org,
kernel-dev@...lia.com,
André Almeida <andrealmeid@...lia.com>
Subject: [PATCH 12/15] selftests/futex: Refactor futex_priv_hash with
kselftest_harness.h
To reduce the boilerplate code, refactor futex_priv_hash test to use
kselftest_harness header instead of futex's logging header.
Use the fixture feature to run the same test with different parameters
(with global hash enabled and disabled).
Signed-off-by: André Almeida <andrealmeid@...lia.com>
---
.../selftests/futex/functional/futex_priv_hash.c | 79 ++++++++++------------
tools/testing/selftests/futex/functional/run.sh | 3 +-
2 files changed, 35 insertions(+), 47 deletions(-)
diff --git a/tools/testing/selftests/futex/functional/futex_priv_hash.c b/tools/testing/selftests/futex/functional/futex_priv_hash.c
index 24a92dc94eb86cc0e03ded5d6a4a0a96b0dc8a36..8ad7135cb59adc16bd2ff9ea57796a3a5c282ae5 100644
--- a/tools/testing/selftests/futex/functional/futex_priv_hash.c
+++ b/tools/testing/selftests/futex/functional/futex_priv_hash.c
@@ -14,7 +14,7 @@
#include <linux/prctl.h>
#include <sys/prctl.h>
-#include "logging.h"
+#include "../../kselftest_harness.h"
#define MAX_THREADS 64
@@ -111,50 +111,42 @@ static void join_max_threads(void)
}
}
-static void usage(char *prog)
+static const char *test_msg_auto_create = "Automatic hash bucket init on thread creation.\n";
+static const char *test_msg_auto_inc = "Automatic increase with more than 16 CPUs\n";
+
+FIXTURE(global_hash)
+{
+};
+
+FIXTURE_VARIANT(global_hash)
+{
+ bool use_global_hash;
+};
+
+FIXTURE_VARIANT_ADD(global_hash, enabled)
+{
+ .use_global_hash = true,
+};
+
+FIXTURE_VARIANT_ADD(global_hash, disabled)
+{
+ .use_global_hash = false,
+};
+
+FIXTURE_SETUP(global_hash)
{
- printf("Usage: %s\n", prog);
- printf(" -c Use color\n");
- printf(" -g Test global hash instead intead local immutable \n");
- printf(" -h Display this help message\n");
- printf(" -v L Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n",
- VQUIET, VCRITICAL, VINFO);
}
-static const char *test_msg_auto_create = "Automatic hash bucket init on thread creation.\n";
-static const char *test_msg_auto_inc = "Automatic increase with more than 16 CPUs\n";
+FIXTURE_TEARDOWN(global_hash)
+{
+}
-int main(int argc, char *argv[])
+TEST_F(global_hash, priv_hash)
{
int futex_slots1, futex_slotsn, online_cpus;
pthread_mutexattr_t mutex_attr_pi;
- int use_global_hash = 0;
+ int use_global_hash = variant->use_global_hash;
int ret;
- int c;
-
- while ((c = getopt(argc, argv, "cghv:")) != -1) {
- switch (c) {
- case 'c':
- log_color(1);
- break;
- case 'g':
- use_global_hash = 1;
- break;
- case 'h':
- usage(basename(argv[0]));
- exit(0);
- break;
- case 'v':
- log_verbosity(atoi(optarg));
- break;
- default:
- usage(basename(argv[0]));
- exit(1);
- }
- }
-
- ksft_print_header();
- ksft_set_plan(22);
ret = pthread_mutexattr_init(&mutex_attr_pi);
ret |= pthread_mutexattr_setprotocol(&mutex_attr_pi, PTHREAD_PRIO_INHERIT);
@@ -259,7 +251,7 @@ int main(int argc, char *argv[])
ksft_test_result(ret == 0, "Immutable resize to 4\n");
}
if (ret != 0)
- goto out;
+ return;
futex_hash_slots_set_must_fail(4, 0);
futex_hash_slots_set_must_fail(4, FH_FLAG_IMMUTABLE);
@@ -269,10 +261,9 @@ int main(int argc, char *argv[])
futex_hash_slots_set_must_fail(6, FH_FLAG_IMMUTABLE);
ret = pthread_barrier_init(&barrier_main, NULL, MAX_THREADS);
- if (ret != 0) {
+ if (ret != 0)
ksft_exit_fail_msg("pthread_barrier_init failed: %m\n");
- return 1;
- }
+
create_max_threads(thread_lock_fn);
join_max_threads();
@@ -285,8 +276,6 @@ int main(int argc, char *argv[])
ret = futex_hash_immutable_get();
ksft_test_result(ret == 1, "Hash reports to be immutable\n");
-
-out:
- ksft_finished();
- return 0;
}
+
+TEST_HARNESS_MAIN
diff --git a/tools/testing/selftests/futex/functional/run.sh b/tools/testing/selftests/futex/functional/run.sh
index 6086b5652687af3cd2d4e4bd56159149d5bb5fea..f725531f06c4a88e6d3ebbabb628a5d5009eaa3b 100755
--- a/tools/testing/selftests/futex/functional/run.sh
+++ b/tools/testing/selftests/futex/functional/run.sh
@@ -60,8 +60,7 @@ echo
./futex_waitv
echo
-./futex_priv_hash $COLOR
-./futex_priv_hash -g $COLOR
+./futex_priv_hash
echo
./futex_numa_mpol $COLOR
--
2.49.0
Powered by blists - more mailing lists