From: Alistair Francis <alistair.francis@opensource.wdc.com>
To: linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de, arnd@arndb.de, namhyung@kernel.org,
peterz@infradead.org, alistair23@gmail.com, jolsa@redhat.com,
dave@stgolabs.net, mingo@redhat.com, dvhart@infradead.org,
acme@kernel.org, linux-perf-users@vger.kernel.org,
mark.rutland@arm.com, alexander.shishkin@linux.intel.com,
Alistair Francis <alistair.francis@wdc.com>
Subject: [PATCH v3 6/6] selftests: futex: Use futex_waitv helper function
Date: Fri, 26 Nov 2021 16:00:24 +1000 [thread overview]
Message-ID: <20211126060024.3290177-6-alistair.francis@opensource.wdc.com> (raw)
In-Reply-To: <20211126060024.3290177-1-alistair.francis@opensource.wdc.com>
From: Alistair Francis <alistair.francis@wdc.com>
Use the publically exposed __kernel_futex_syscall_waitv() helper
function for the futex_waitv tests.
Signed-off-by: Alistair Francis <alistair.francis@wdc.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
next prev parent reply other threads:[~2021-11-26 6:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-26 6:00 [PATCH v3 1/6] perf bench futex: Add support for 32-bit systems with 64-bit time_t Alistair Francis
2021-11-26 6:00 ` [PATCH v3 2/6] selftests: futex: Call the futex syscall from a function Alistair Francis
2021-11-26 6:00 ` [PATCH v3 3/6] uapi: futex: Add a futex syscall Alistair Francis
2021-11-26 7:24 ` Arnd Bergmann
2021-11-27 8:41 ` kernel test robot
2021-11-26 6:00 ` [PATCH v3 4/6] selftests: futex: Add support for 32-bit systems with 64-bit time_t Alistair Francis
2021-11-26 7:36 ` Arnd Bergmann
2021-11-26 6:00 ` [PATCH v3 5/6] uapi: futex: Add a futex waitv syscall Alistair Francis
2021-11-26 7:27 ` Arnd Bergmann
2021-11-26 6:00 ` Alistair Francis [this message]
2021-11-26 7:33 ` [PATCH v3 6/6] selftests: futex: Use futex_waitv helper function Arnd Bergmann
2021-11-26 7:19 ` [PATCH v3 1/6] perf bench futex: Add support for 32-bit systems with 64-bit time_t Arnd Bergmann
2022-02-26 11:47 ` Arnaldo Carvalho de Melo
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=20211126060024.3290177-6-alistair.francis@opensource.wdc.com \
--to=alistair.francis@opensource.wdc.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=alistair.francis@wdc.com \
--cc=alistair23@gmail.com \
--cc=arnd@arndb.de \
--cc=dave@stgolabs.net \
--cc=dvhart@infradead.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).