diff mbox series

[v3] futex_waitv01: Add test verifies EAGIN/ETIMEDOUT

Message ID 20220608031953.152525-1-zhaogongyi@huawei.com
State Accepted
Headers show
Series [v3] futex_waitv01: Add test verifies EAGIN/ETIMEDOUT | expand

Commit Message

Zhao Gongyi June 8, 2022, 3:19 a.m. UTC 
Add test verifies EAGIN/ETIMEDOUT for futex_waitv according to
https://www.kernel.org/doc/html/latest/userspace-api/futex2.html.

Signed-off-by: Zhao Gongyi <zhaogongyi@huawei.com>
---
v2->v3:
	1. Replace CLOCK_REALTIME with CLOCK_MONOTONIC
	2. Change from 1s to 10ms for the timeout
 .../kernel/syscalls/futex/futex_waitv01.c     | 35 +++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

--
2.17.1

Comments

Cyril Hrubis June 9, 2022, 1:45 p.m. UTC | #1 
Hi!
Applied, thanks.
diff mbox series

Patch

diff --git a/testcases/kernel/syscalls/futex/futex_waitv01.c b/testcases/kernel/syscalls/futex/futex_waitv01.c
index f2c19b748..17b96738c 100644
--- a/testcases/kernel/syscalls/futex/futex_waitv01.c
+++ b/testcases/kernel/syscalls/futex/futex_waitv01.c
@@ -107,12 +107,41 @@  static void test_invalid_nr_futexes(void)
 	init_timeout(&to);

 	/* Valid nr_futexes is [1, 128] */
-	TST_EXP_FAIL(futex_waitv(waitv, 129, 0, &to, CLOCK_REALTIME), EINVAL,
+	TST_EXP_FAIL(futex_waitv(waitv, 129, 0, &to, CLOCK_MONOTONIC), EINVAL,
 		     "futex_waitv invalid nr_futexes");
-	TST_EXP_FAIL(futex_waitv(waitv, 0, 0, &to, CLOCK_REALTIME), EINVAL,
+	TST_EXP_FAIL(futex_waitv(waitv, 0, 0, &to, CLOCK_MONOTONIC), EINVAL,
 		     "futex_waitv invalid nr_futexes");
 }

+static void test_mismatch_between_uaddr_and_val(void)
+{
+	struct timespec to;
+
+	waitv->uaddr = (uintptr_t)futex;
+	waitv->flags = FUTEX_32 | FUTEX_PRIVATE_FLAG;
+	waitv->val = 1;
+
+	init_timeout(&to);
+
+	TST_EXP_FAIL(futex_waitv(waitv, 1, 0, &to, CLOCK_MONOTONIC), EAGAIN,
+		     "futex_waitv mismatch between value of uaddr and val");
+}
+
+static void test_timeout(void)
+{
+	struct timespec to;
+
+	waitv->uaddr = (uintptr_t)futex;
+	waitv->flags = FUTEX_32 | FUTEX_PRIVATE_FLAG;
+	waitv->val = 0;
+
+	SAFE_CLOCK_GETTIME(CLOCK_REALTIME, &to);
+	to = tst_timespec_add_us(to, 10000);
+
+	TST_EXP_FAIL(futex_waitv(waitv, 1, 0, &to, CLOCK_REALTIME), ETIMEDOUT,
+		     "futex_waitv timeout");
+}
+
 static void cleanup(void)
 {
 	free(futex);
@@ -126,6 +155,8 @@  static void run(void)
 	test_null_waiters();
 	test_invalid_clockid();
 	test_invalid_nr_futexes();
+	test_mismatch_between_uaddr_and_val();
+	test_timeout();
 }

 static struct tst_test test = {