| 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: <20211126060024.3290177-6-alistair.francis@opensource.wdc.com>
Date: Fri, 26 Nov 2021 16:00:24 +1000
From: Alistair Francis <alistair.francis@...nsource.wdc.com>
To: linux-kernel@...r.kernel.org
Cc: tglx@...utronix.de, arnd@...db.de, namhyung@...nel.org,
peterz@...radead.org, alistair23@...il.com, jolsa@...hat.com,
dave@...olabs.net, mingo@...hat.com, dvhart@...radead.org,
acme@...nel.org, linux-perf-users@...r.kernel.org,
mark.rutland@....com, alexander.shishkin@...ux.intel.com,
Alistair Francis <alistair.francis@....com>
Subject: [PATCH v3 6/6] selftests: futex: Use futex_waitv helper function
From: Alistair Francis <alistair.francis@....com>
Use the publically exposed __kernel_futex_syscall_waitv() helper
function for the futex_waitv tests.
Signed-off-by: Alistair Francis <alistair.francis@....com>
---
.../futex/functional/futex_wait_timeout.c | 6 ++---
.../futex/functional/futex_wait_wouldblock.c | 4 ++--
.../selftests/futex/functional/futex_waitv.c | 16 ++++++++------
.../selftests/futex/include/futex2test.h | 22 -------------------
4 files changed, 14 insertions(+), 34 deletions(-)
delete mode 100644 tools/testing/selftests/futex/include/futex2test.h
diff --git a/tools/testing/selftests/futex/functional/futex_wait_timeout.c b/tools/testing/selftests/futex/functional/futex_wait_timeout.c
index 3651ce17beeb..f25e3bd8222e 100644
--- a/tools/testing/selftests/futex/functional/futex_wait_timeout.c
+++ b/tools/testing/selftests/futex/functional/futex_wait_timeout.c
@@ -15,9 +15,9 @@
*
*****************************************************************************/
+#include <linux/futex_syscall.h>
#include <pthread.h>
#include "futextest.h"
-#include "futex2test.h"
#include "logging.h"
#define TEST_NAME "futex-wait-timeout"
@@ -185,13 +185,13 @@ int main(int argc, char *argv[])
/* futex_waitv with CLOCK_MONOTONIC */
if (futex_get_abs_timeout(CLOCK_MONOTONIC, &to, timeout_ns))
return RET_FAIL;
- res = futex_waitv(&waitv, 1, 0, &to, CLOCK_MONOTONIC);
+ res = __kernel_futex_syscall_waitv(&waitv, 1, 0, &to, CLOCK_MONOTONIC);
test_timeout(res, &ret, "futex_waitv monotonic", ETIMEDOUT);
/* futex_waitv with CLOCK_REALTIME */
if (futex_get_abs_timeout(CLOCK_REALTIME, &to, timeout_ns))
return RET_FAIL;
- res = futex_waitv(&waitv, 1, 0, &to, CLOCK_REALTIME);
+ res = __kernel_futex_syscall_waitv(&waitv, 1, 0, &to, CLOCK_REALTIME);
test_timeout(res, &ret, "futex_waitv realtime", ETIMEDOUT);
ksft_print_cnts();
diff --git a/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c
index 7d7a6a06cdb7..399ac636524b 100644
--- a/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c
+++ b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c
@@ -17,12 +17,12 @@
#include <errno.h>
#include <getopt.h>
+#include <linux/futex_syscall.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include "futextest.h"
-#include "futex2test.h"
#include "logging.h"
#define TEST_NAME "futex-wait-wouldblock"
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
}
info("Calling futex_waitv on f1: %u @ %p with val=%u\n", f1, &f1, f1+1);
- res = futex_waitv(&waitv, 1, 0, &to, CLOCK_MONOTONIC);
+ res = __kernel_futex_syscall_waitv(&waitv, 1, 0, &to, CLOCK_MONOTONIC);
if (!res || errno != EWOULDBLOCK) {
ksft_test_result_pass("futex_waitv returned: %d %s\n",
res ? errno : res,
diff --git a/tools/testing/selftests/futex/functional/futex_waitv.c b/tools/testing/selftests/futex/functional/futex_waitv.c
index a94337f677e1..8ba45363c094 100644
--- a/tools/testing/selftests/futex/functional/futex_waitv.c
+++ b/tools/testing/selftests/futex/functional/futex_waitv.c
@@ -8,6 +8,7 @@
#include <errno.h>
#include <error.h>
#include <getopt.h>
+#include <linux/futex_syscall.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -16,7 +17,6 @@
#include <stdint.h>
#include <sys/shm.h>
#include "futextest.h"
-#include "futex2test.h"
#include "logging.h"
#define TEST_NAME "futex-wait"
@@ -25,6 +25,8 @@
static struct futex_waitv waitv[NR_FUTEXES];
u_int32_t futexes[NR_FUTEXES] = {0};
+#define u64_to_ptr(x) ((void *)(uintptr_t)(x))
+
void usage(char *prog)
{
printf("Usage: %s\n", prog);
@@ -45,7 +47,7 @@ void *waiterfn(void *arg)
to.tv_sec++;
- res = futex_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC);
+ res = __kernel_futex_syscall_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC);
if (res < 0) {
ksft_test_result_fail("futex_waitv returned: %d %s\n",
errno, strerror(errno));
@@ -153,7 +155,7 @@ int main(int argc, char *argv[])
to.tv_sec++;
- res = futex_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC);
+ res = __kernel_futex_syscall_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC);
if (res == EINVAL) {
ksft_test_result_fail("futex_waitv private returned: %d %s\n",
res ? errno : res,
@@ -172,7 +174,7 @@ int main(int argc, char *argv[])
to.tv_sec++;
- res = futex_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC);
+ res = __kernel_futex_syscall_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC);
if (res == EINVAL) {
ksft_test_result_fail("futex_wake private returned: %d %s\n",
res ? errno : res,
@@ -190,7 +192,7 @@ int main(int argc, char *argv[])
to.tv_sec++;
- res = futex_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC);
+ res = __kernel_futex_syscall_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC);
if (res == EINVAL) {
ksft_test_result_fail("futex_waitv private returned: %d %s\n",
res ? errno : res,
@@ -206,7 +208,7 @@ int main(int argc, char *argv[])
to.tv_sec++;
- res = futex_waitv(NULL, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC);
+ res = __kernel_futex_syscall_waitv(NULL, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC);
if (res == EINVAL) {
ksft_test_result_fail("futex_waitv private returned: %d %s\n",
res ? errno : res,
@@ -222,7 +224,7 @@ int main(int argc, char *argv[])
to.tv_sec++;
- res = futex_waitv(NULL, NR_FUTEXES, 0, &to, CLOCK_TAI);
+ res = __kernel_futex_syscall_waitv(NULL, NR_FUTEXES, 0, &to, CLOCK_TAI);
if (res == EINVAL) {
ksft_test_result_fail("futex_waitv private returned: %d %s\n",
res ? errno : res,
diff --git a/tools/testing/selftests/futex/include/futex2test.h b/tools/testing/selftests/futex/include/futex2test.h
deleted file mode 100644
index 9d305520e849..000000000000
--- a/tools/testing/selftests/futex/include/futex2test.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Futex2 library addons for futex tests
- *
- * Copyright 2021 Collabora Ltd.
- */
-#include <stdint.h>
-
-#define u64_to_ptr(x) ((void *)(uintptr_t)(x))
-
-/**
- * futex_waitv - Wait at multiple futexes, wake on any
- * @waiters: Array of waiters
- * @nr_waiters: Length of waiters array
- * @flags: Operation flags
- * @timo: Optional timeout for operation
- */
-static inline int futex_waitv(volatile struct futex_waitv *waiters, unsigned long nr_waiters,
- unsigned long flags, struct timespec *timo, clockid_t clockid)
-{
- return syscall(__NR_futex_waitv, waiters, nr_waiters, flags, timo, clockid);
-}
--
2.31.1
Powered by blists - more mailing lists