selftests: ntsync: Add some tests for wakeup signaling via alerts.

Expand the alert tests to cover alerting a thread mid-wait, to test that the
relevant scheduling logic works correctly.

Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
Link: https://lore.kernel.org/r/20241213193511.457338-27-zfigura@codeweavers.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/tools/testing/selftests/drivers/ntsync/ntsync.c b/tools/testing/selftests/drivers/ntsync/ntsync.c
index 72f078dde444bebc43ac3fb7851d0b5683664382..298b279729aa867887a504a476bf73ae2b2f61d7 100644 (file)
--- a/tools/testing/selftests/drivers/ntsync/ntsync.c
+++ b/tools/testing/selftests/drivers/ntsync/ntsync.c
@@ -1063,9 +1063,12 @@ TEST(wake_all)
 TEST(alert_any)
 {
        struct ntsync_event_args event_args = {0};
+       struct ntsync_wait_args wait_args = {0};
        struct ntsync_sem_args sem_args = {0};
        __u32 index, count, signaled;
+       struct wait_args thread_args;
        int objs[2], event, fd, ret;
+       pthread_t thread;
 
        fd = open("/dev/ntsync", O_CLOEXEC | O_RDONLY);
        ASSERT_LE(0, fd);
@@ -1107,6 +1110,34 @@ TEST(alert_any)
        EXPECT_EQ(0, ret);
        EXPECT_EQ(2, index);
 
+       /* test wakeup via alert */
+
+       ret = ioctl(event, NTSYNC_IOC_EVENT_RESET, &signaled);
+       EXPECT_EQ(0, ret);
+
+       wait_args.timeout = get_abs_timeout(1000);
+       wait_args.objs = (uintptr_t)objs;
+       wait_args.count = 2;
+       wait_args.owner = 123;
+       wait_args.index = 0xdeadbeef;
+       wait_args.alert = event;
+       thread_args.fd = fd;
+       thread_args.args = &wait_args;
+       thread_args.request = NTSYNC_IOC_WAIT_ANY;
+       ret = pthread_create(&thread, NULL, wait_thread, &thread_args);
+       EXPECT_EQ(0, ret);
+
+       ret = wait_for_thread(thread, 100);
+       EXPECT_EQ(ETIMEDOUT, ret);
+
+       ret = ioctl(event, NTSYNC_IOC_EVENT_SET, &signaled);
+       EXPECT_EQ(0, ret);
+
+       ret = wait_for_thread(thread, 100);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(0, thread_args.ret);
+       EXPECT_EQ(2, wait_args.index);
+
        close(event);
 
        /* test with an auto-reset event */
@@ -1143,9 +1174,12 @@ TEST(alert_any)
 TEST(alert_all)
 {
        struct ntsync_event_args event_args = {0};
+       struct ntsync_wait_args wait_args = {0};
        struct ntsync_sem_args sem_args = {0};
+       struct wait_args thread_args;
        __u32 index, count, signaled;
        int objs[2], event, fd, ret;
+       pthread_t thread;
 
        fd = open("/dev/ntsync", O_CLOEXEC | O_RDONLY);
        ASSERT_LE(0, fd);
@@ -1173,6 +1207,34 @@ TEST(alert_all)
        EXPECT_EQ(0, ret);
        EXPECT_EQ(2, index);
 
+       /* test wakeup via alert */
+
+       ret = ioctl(event, NTSYNC_IOC_EVENT_RESET, &signaled);
+       EXPECT_EQ(0, ret);
+
+       wait_args.timeout = get_abs_timeout(1000);
+       wait_args.objs = (uintptr_t)objs;
+       wait_args.count = 2;
+       wait_args.owner = 123;
+       wait_args.index = 0xdeadbeef;
+       wait_args.alert = event;
+       thread_args.fd = fd;
+       thread_args.args = &wait_args;
+       thread_args.request = NTSYNC_IOC_WAIT_ALL;
+       ret = pthread_create(&thread, NULL, wait_thread, &thread_args);
+       EXPECT_EQ(0, ret);
+
+       ret = wait_for_thread(thread, 100);
+       EXPECT_EQ(ETIMEDOUT, ret);
+
+       ret = ioctl(event, NTSYNC_IOC_EVENT_SET, &signaled);
+       EXPECT_EQ(0, ret);
+
+       ret = wait_for_thread(thread, 100);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(0, thread_args.ret);
+       EXPECT_EQ(2, wait_args.index);
+
        close(event);
 
        /* test with an auto-reset event */