selftests: futex: Test sys_futex_waitv() wouldblock

Test if futex_waitv() returns -EWOULDBLOCK correctly when the expected
value is different from the actual value for a waiter.

Signed-off-by: André Almeida <andrealmeid@collabora.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210923171111.300673-22-andrealmeid@collabora.com

diff --git a/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c
index 0ae390ff816449c88d0bb655a26eb014382c2b4f..7d7a6a06cdb75b0f46b6bfb9f668ca12a8f7db03 100644 (file)
--- a/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c
+++ b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <time.h>
 #include "futextest.h"
+#include "futex2test.h"
 #include "logging.h"
 
 #define TEST_NAME "futex-wait-wouldblock"
@@ -42,6 +43,12 @@ int main(int argc, char *argv[])
        futex_t f1 = FUTEX_INITIALIZER;
        int res, ret = RET_PASS;
        int c;
+       struct futex_waitv waitv = {
+                       .uaddr = (uintptr_t)&f1,
+                       .val = f1+1,
+                       .flags = FUTEX_32,
+                       .__reserved = 0
+               };
 
        while ((c = getopt(argc, argv, "cht:v:")) != -1) {
                switch (c) {
@@ -61,18 +68,44 @@ int main(int argc, char *argv[])
        }
 
        ksft_print_header();
-       ksft_set_plan(1);
+       ksft_set_plan(2);
        ksft_print_msg("%s: Test the unexpected futex value in FUTEX_WAIT\n",
               basename(argv[0]));
 
        info("Calling futex_wait on f1: %u @ %p with val=%u\n", f1, &f1, f1+1);
        res = futex_wait(&f1, f1+1, &to, FUTEX_PRIVATE_FLAG);
        if (!res || errno != EWOULDBLOCK) {
-               fail("futex_wait returned: %d %s\n",
-                    res ? errno : res, res ? strerror(errno) : "");
+               ksft_test_result_fail("futex_wait returned: %d %s\n",
+                                     res ? errno : res,
+                                     res ? strerror(errno) : "");
                ret = RET_FAIL;
+       } else {
+               ksft_test_result_pass("futex_wait\n");
        }
 
-       print_result(TEST_NAME, ret);
+       if (clock_gettime(CLOCK_MONOTONIC, &to)) {
+               error("clock_gettime failed\n", errno);
+               return errno;
+       }
+
+       to.tv_nsec += timeout_ns;
+
+       if (to.tv_nsec >= 1000000000) {
+               to.tv_sec++;
+               to.tv_nsec -= 1000000000;
+       }
+
+       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);
+       if (!res || errno != EWOULDBLOCK) {
+               ksft_test_result_pass("futex_waitv returned: %d %s\n",
+                                     res ? errno : res,
+                                     res ? strerror(errno) : "");
+               ret = RET_FAIL;
+       } else {
+               ksft_test_result_pass("futex_waitv\n");
+       }
+
+       ksft_print_cnts();
        return ret;
 }