Wire up PR_FUTEX_HASH to futex-hash. Use the `-b' argument to specify
the number of buckets. Read it back and show during invocation.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
tools/perf/bench/futex-hash.c | 19 +++++++++++++++++--
tools/perf/bench/futex.h | 1 +
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/tools/perf/bench/futex-hash.c b/tools/perf/bench/futex-hash.c
index b472eded521b1..1f7a33f8d078e 100644
--- a/tools/perf/bench/futex-hash.c
+++ b/tools/perf/bench/futex-hash.c
@@ -22,6 +22,7 @@
#include <sys/time.h>
#include <sys/mman.h>
#include <perf/cpumap.h>
+#include <sys/prctl.h>
#include "../util/mutex.h"
#include "../util/stat.h"
@@ -53,6 +54,7 @@ static struct bench_futex_parameters params = {
};
static const struct option options[] = {
+ OPT_UINTEGER('b', "buckets", ¶ms.nbuckets, "Task local futex buckets to allocate"),
OPT_UINTEGER('t', "threads", ¶ms.nthreads, "Specify amount of threads"),
OPT_UINTEGER('r', "runtime", ¶ms.runtime, "Specify runtime (in seconds)"),
OPT_UINTEGER('f', "futexes", ¶ms.nfutexes, "Specify amount of futexes per threads"),
@@ -120,6 +122,10 @@ static void print_summary(void)
(int)bench__runtime.tv_sec);
}
+#define PR_FUTEX_HASH 74
+# define PR_FUTEX_HASH_SET_SLOTS 1
+# define PR_FUTEX_HASH_GET_SLOTS 2
+
int bench_futex_hash(int argc, const char **argv)
{
int ret = 0;
@@ -131,6 +137,7 @@ int bench_futex_hash(int argc, const char **argv)
struct perf_cpu_map *cpu;
int nrcpus;
size_t size;
+ int num_buckets;
argc = parse_options(argc, argv, options, bench_futex_hash_usage, 0);
if (argc) {
@@ -147,6 +154,14 @@ int bench_futex_hash(int argc, const char **argv)
act.sa_sigaction = toggle_done;
sigaction(SIGINT, &act, NULL);
+ ret = prctl(PR_FUTEX_HASH, PR_FUTEX_HASH_SET_SLOTS, params.nbuckets);
+ if (ret) {
+ printf("Allocation of %u hash buckets failed: %d/%m\n",
+ params.nbuckets, ret);
+ goto errmem;
+ }
+ num_buckets = prctl(PR_FUTEX_HASH, PR_FUTEX_HASH_GET_SLOTS);
+
if (params.mlockall) {
if (mlockall(MCL_CURRENT | MCL_FUTURE))
err(EXIT_FAILURE, "mlockall");
@@ -162,8 +177,8 @@ int bench_futex_hash(int argc, const char **argv)
if (!params.fshared)
futex_flag = FUTEX_PRIVATE_FLAG;
- printf("Run summary [PID %d]: %d threads, each operating on %d [%s] futexes for %d secs.\n\n",
- getpid(), params.nthreads, params.nfutexes, params.fshared ? "shared":"private", params.runtime);
+ printf("Run summary [PID %d]: %d threads, hash slots: %d each operating on %d [%s] futexes for %d secs.\n\n",
+ getpid(), params.nthreads, num_buckets, params.nfutexes, params.fshared ? "shared":"private", params.runtime);
init_stats(&throughput_stats);
mutex_init(&thread_lock);
diff --git a/tools/perf/bench/futex.h b/tools/perf/bench/futex.h
index ebdc2b032afc1..abc353c63a9a4 100644
--- a/tools/perf/bench/futex.h
+++ b/tools/perf/bench/futex.h
@@ -20,6 +20,7 @@ struct bench_futex_parameters {
bool multi; /* lock-pi */
bool pi; /* requeue-pi */
bool broadcast; /* requeue */
+ unsigned int nbuckets;
unsigned int runtime; /* seconds*/
unsigned int nthreads;
unsigned int nfutexes;
--
2.45.2