[LTP] [PATCH v3] Add futex_waitv tests
Andrea Cervesato
andrea.cervesato@suse.de
Wed Feb 2 07:49:36 CET 2022
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.de>
---
In v3 fixed compiling after tst_syscall patch.
testcases/kernel/syscalls/futex/.gitignore | 3 +
testcases/kernel/syscalls/futex/futex2test.h | 23 ++++
.../kernel/syscalls/futex/futex_waitv01.c | 121 ++++++++++++++++++
.../kernel/syscalls/futex/futex_waitv02.c | 95 ++++++++++++++
.../kernel/syscalls/futex/futex_waitv03.c | 108 ++++++++++++++++
5 files changed, 350 insertions(+)
create mode 100644 testcases/kernel/syscalls/futex/futex2test.h
create mode 100644 testcases/kernel/syscalls/futex/futex_waitv01.c
create mode 100644 testcases/kernel/syscalls/futex/futex_waitv02.c
create mode 100644 testcases/kernel/syscalls/futex/futex_waitv03.c
diff --git a/testcases/kernel/syscalls/futex/.gitignore b/testcases/kernel/syscalls/futex/.gitignore
index 54cd02b02..9d08ba7d3 100644
--- a/testcases/kernel/syscalls/futex/.gitignore
+++ b/testcases/kernel/syscalls/futex/.gitignore
@@ -10,3 +10,6 @@
/futex_wake02
/futex_wake03
/futex_wake04
+/futex_waitv01
+/futex_waitv02
+/futex_waitv03
diff --git a/testcases/kernel/syscalls/futex/futex2test.h b/testcases/kernel/syscalls/futex/futex2test.h
new file mode 100644
index 000000000..634efae3b
--- /dev/null
+++ b/testcases/kernel/syscalls/futex/futex2test.h
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Futex2 library addons for futex tests
+ *
+ * Copyright 2021 Collabora Ltd.
+ * Copyright (C) 2021 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
+#include <stdint.h>
+#include "lapi/syscalls.h"
+#include "futextest.h"
+
+/**
+ * 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 tst_syscall(__NR_futex_waitv, waiters, nr_waiters, flags, timo, clockid);
+}
diff --git a/testcases/kernel/syscalls/futex/futex_waitv01.c b/testcases/kernel/syscalls/futex/futex_waitv01.c
new file mode 100644
index 000000000..64163148f
--- /dev/null
+++ b/testcases/kernel/syscalls/futex/futex_waitv01.c
@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2021 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
+
+/*\
+ * [Description]
+ *
+ * This test verifies EINVAL for futex_waitv syscall.
+ */
+
+#include <time.h>
+#include "tst_test.h"
+#include "lapi/futex.h"
+#include "futex2test.h"
+
+static char *str_numfutex;
+static int numfutex = 30;
+
+static uint32_t *futexes;
+static struct futex_waitv *waitv;
+
+static void setup(void)
+{
+ struct futex_test_variants tv;
+ int i;
+
+ tv = futex_variants();
+
+ tst_res(TINFO, "Testing variant: %s", tv.desc);
+ futex_supported_by_kernel(tv.fntype);
+
+ if (tst_parse_int(str_numfutex, &numfutex, 1, FUTEX_WAITV_MAX))
+ tst_brk(TBROK, "Invalid number of futexes '%s'", str_numfutex);
+
+ futexes = SAFE_MALLOC(sizeof(uint32_t) * numfutex);
+ memset(futexes, 0, numfutex);
+
+ waitv = SAFE_MALLOC(sizeof(struct futex_waitv) * numfutex);
+ for (i = 0; i < numfutex; i++) {
+ waitv[i].uaddr = (uintptr_t)&futexes[i];
+ waitv[i].flags = FUTEX_32 | FUTEX_PRIVATE_FLAG;
+ waitv[i].val = 0;
+ }
+}
+
+static void init_timeout(struct timespec *to)
+{
+ if (clock_gettime(CLOCK_MONOTONIC, to))
+ tst_brk(TBROK, "gettime64 failed");
+
+ to->tv_sec++;
+}
+
+static void run(void)
+{
+ struct timespec to;
+ int res;
+
+ /* Testing a waiter without FUTEX_32 flag */
+ waitv[0].flags = FUTEX_PRIVATE_FLAG;
+
+ init_timeout(&to);
+
+ res = futex_waitv(waitv, numfutex, 0, &to, CLOCK_MONOTONIC);
+ if (res == EINVAL)
+ tst_res(TFAIL, "futex_waitv private returned: %d %s", res, tst_strerrno(res));
+ else
+ tst_res(TPASS, "futex_waitv without FUTEX_32");
+
+ /* Testing a waiter with an unaligned address */
+ waitv[0].flags = FUTEX_PRIVATE_FLAG | FUTEX_32;
+ waitv[0].uaddr = 1;
+
+ init_timeout(&to);
+
+ res = futex_waitv(waitv, numfutex, 0, &to, CLOCK_MONOTONIC);
+ if (res == EINVAL)
+ tst_res(TFAIL, "futex_waitv private returned: %d %s", res, tst_strerrno(res));
+ else
+ tst_res(TPASS, "futex_waitv with an unaligned address");
+
+ /* Testing a NULL address for waiters.uaddr */
+ waitv[0].uaddr = 0x00000000;
+
+ init_timeout(&to);
+
+ res = futex_waitv(waitv, numfutex, 0, &to, CLOCK_MONOTONIC);
+ if (res == EINVAL)
+ tst_res(TFAIL, "futex_waitv private returned: %d %s", res, tst_strerrno(res));
+ else
+ tst_res(TPASS, "futex_waitv NULL address in waitv.uaddr");
+
+ /* Testing a NULL address for *waiters */
+ init_timeout(&to);
+
+ res = futex_waitv(NULL, numfutex, 0, &to, CLOCK_MONOTONIC);
+ if (res == EINVAL)
+ tst_res(TFAIL, "futex_waitv private returned: %d %s", res, tst_strerrno(res));
+ else
+ tst_res(TPASS, "futex_waitv NULL address in *waiters");
+
+ /* Testing an invalid clockid */
+ init_timeout(&to);
+
+ res = futex_waitv(NULL, numfutex, 0, &to, CLOCK_TAI);
+ if (res == EINVAL)
+ tst_res(TFAIL, "futex_waitv private returned: %d %s", res, tst_strerrno(res));
+ else
+ tst_res(TPASS, "futex_waitv invalid clockid");
+}
+
+static struct tst_test test = {
+ .test_all = run,
+ .setup = setup,
+ .min_kver = "5.16",
+ .options = (struct tst_option[]){
+ {"n:", &str_numfutex, "Number of futex (default 30)"},
+ {},
+ },
+};
diff --git a/testcases/kernel/syscalls/futex/futex_waitv02.c b/testcases/kernel/syscalls/futex/futex_waitv02.c
new file mode 100644
index 000000000..5bd8d3b40
--- /dev/null
+++ b/testcases/kernel/syscalls/futex/futex_waitv02.c
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2021 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
+
+/*\
+ * [Description]
+ *
+ * This test verifies futex_waitv syscall using private data.
+ */
+
+#include <time.h>
+#include "tst_test.h"
+#include "lapi/futex.h"
+#include "futex2test.h"
+#include "tst_safe_pthread.h"
+
+static char *str_numfutex;
+static int numfutex = 30;
+
+static uint32_t *futexes;
+static struct futex_waitv *waitv;
+
+static void setup(void)
+{
+ struct futex_test_variants tv;
+ int i;
+
+ tv = futex_variants();
+
+ tst_res(TINFO, "Testing variant: %s", tv.desc);
+ futex_supported_by_kernel(tv.fntype);
+
+ if (tst_parse_int(str_numfutex, &numfutex, 1, FUTEX_WAITV_MAX))
+ tst_brk(TBROK, "Invalid number of futexes '%s'", str_numfutex);
+
+ futexes = SAFE_MALLOC(sizeof(uint32_t) * numfutex);
+ memset(futexes, 0, numfutex);
+
+ waitv = SAFE_MALLOC(sizeof(struct futex_waitv) * numfutex);
+ for (i = 0; i < numfutex; i++) {
+ waitv[i].uaddr = (uintptr_t)&futexes[i];
+ waitv[i].flags = FUTEX_32 | FUTEX_PRIVATE_FLAG;
+ waitv[i].val = 0;
+ }
+}
+
+static void *threaded(void *arg)
+{
+ struct futex_test_variants tv;
+ int ret, pid = *(int *)arg;
+
+ tv = futex_variants();
+ TST_PROCESS_STATE_WAIT(pid, 'S', 0);
+
+ ret = futex_wake(tv.fntype, (void *)(uintptr_t)waitv[numfutex - 1].uaddr, 1, FUTEX_PRIVATE_FLAG);
+ if (ret < 0)
+ tst_brk(TBROK, "futex_wake private returned: %d %s", ret, tst_strerrno(-ret));
+
+ return NULL;
+}
+
+static void run(void)
+{
+ struct timespec to;
+ int ret, pid = getpid();
+ pthread_t t;
+
+ SAFE_PTHREAD_CREATE(&t, NULL, threaded, (void *)&pid);
+
+ /* setting absolute timeout for futex2 */
+ if (clock_gettime(CLOCK_MONOTONIC, &to))
+ tst_brk(TBROK, "gettime64 failed");
+
+ to.tv_sec++;
+
+ ret = futex_waitv(waitv, numfutex, 0, &to, CLOCK_MONOTONIC);
+ if (ret < 0)
+ tst_brk(TBROK, "futex_waitv returned: %d %s", ret, tst_strerrno(-ret));
+ else if (ret != numfutex - 1)
+ tst_res(TFAIL, "futex_waitv returned: %d, expecting %d", ret, numfutex - 1);
+
+ SAFE_PTHREAD_JOIN(t, NULL);
+ tst_res(TPASS, "futex_waitv returned correctly");
+}
+
+static struct tst_test test = {
+ .test_all = run,
+ .setup = setup,
+ .min_kver = "5.16",
+ .options = (struct tst_option[]){
+ {"n:", &str_numfutex, "Number of futex (default 30)"},
+ {},
+ },
+};
diff --git a/testcases/kernel/syscalls/futex/futex_waitv03.c b/testcases/kernel/syscalls/futex/futex_waitv03.c
new file mode 100644
index 000000000..9db42fa49
--- /dev/null
+++ b/testcases/kernel/syscalls/futex/futex_waitv03.c
@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2021 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
+
+/*\
+ * [Description]
+ *
+ * This test verifies futex_waitv syscall using shared data.
+ */
+
+#include <time.h>
+#include <sys/shm.h>
+#include "tst_test.h"
+#include "lapi/futex.h"
+#include "futex2test.h"
+#include "tst_safe_pthread.h"
+
+static char *str_numfutex;
+static int numfutex = 30;
+
+static struct futex_waitv *waitv;
+
+static void setup(void)
+{
+ struct futex_test_variants tv;
+ int shm_id;
+ int i;
+
+ tv = futex_variants();
+
+ tst_res(TINFO, "Testing variant: %s", tv.desc);
+ futex_supported_by_kernel(tv.fntype);
+
+ if (tst_parse_int(str_numfutex, &numfutex, 1, FUTEX_WAITV_MAX))
+ tst_brk(TBROK, "Invalid number of futexes '%s'", str_numfutex);
+
+ waitv = SAFE_MALLOC(sizeof(struct futex_waitv) * numfutex);
+ for (i = 0; i < numfutex; i++) {
+ shm_id = shmget(IPC_PRIVATE, 4096, IPC_CREAT | 0666);
+ if (shm_id < 0)
+ tst_brk(TBROK, "shmget");
+
+ unsigned int *shared_data = shmat(shm_id, NULL, 0);
+
+ waitv[i].uaddr = (uintptr_t)shared_data;
+ waitv[i].flags = FUTEX_32;
+ waitv[i].val = 0;
+ }
+}
+
+static void cleanup(void)
+{
+ int i;
+
+ for (i = 0; i < numfutex; i++)
+ shmdt((void *)(uintptr_t)waitv[i].uaddr);
+}
+
+static void *threaded(void *arg)
+{
+ struct futex_test_variants tv;
+ int ret, pid = *(int *)arg;
+
+ tv = futex_variants();
+ TST_PROCESS_STATE_WAIT(pid, 'S', 0);
+
+ ret = futex_wake(tv.fntype, (void *)(uintptr_t)waitv[numfutex - 1].uaddr, 1, 0);
+ if (ret < 0)
+ tst_brk(TBROK, "futex_wake private returned: %d %s", ret, tst_strerrno(-ret));
+
+ return NULL;
+}
+
+static void run(void)
+{
+ struct timespec to;
+ int ret, pid = getpid();
+ pthread_t t;
+
+ SAFE_PTHREAD_CREATE(&t, NULL, threaded, (void *)&pid);
+
+ /* setting absolute timeout for futex2 */
+ if (clock_gettime(CLOCK_MONOTONIC, &to))
+ tst_brk(TBROK, "gettime64 failed");
+
+ to.tv_sec++;
+
+ ret = futex_waitv(waitv, numfutex, 0, &to, CLOCK_MONOTONIC);
+ if (ret < 0)
+ tst_brk(TBROK, "futex_waitv returned: %d %s", ret, tst_strerrno(-ret));
+ else if (ret != numfutex - 1)
+ tst_res(TFAIL, "futex_waitv returned: %d, expecting %d", ret, numfutex - 1);
+
+ SAFE_PTHREAD_JOIN(t, NULL);
+ tst_res(TPASS, "futex_waitv returned correctly");
+}
+
+static struct tst_test test = {
+ .test_all = run,
+ .setup = setup,
+ .cleanup = cleanup,
+ .min_kver = "5.16",
+ .options = (struct tst_option[]){
+ {"n:", &str_numfutex, "Number of futex (default 30)"},
+ {},
+ },
+};
--
2.34.1
More information about the ltp
mailing list