selftests: ntsync: Add some tests for wakeup signaling with events.

Expand the contended wait tests, which previously only covered events and
semaphores, to cover events as well.

Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
Link: https://lore.kernel.org/r/20241213193511.457338-25-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 66a096cb204565ebd5772c70c1c5d5c6a3f36cc1..33348f0b621f295d6e051aac94eb8a1fe3e81d90 100644 (file)
--- a/tools/testing/selftests/drivers/ntsync/ntsync.c
+++ b/tools/testing/selftests/drivers/ntsync/ntsync.c
@@ -598,6 +598,7 @@ TEST(test_wait_any)
 
 TEST(test_wait_all)
 {
+       struct ntsync_event_args event_args = {0};
        struct ntsync_mutex_args mutex_args = {0};
        struct ntsync_sem_args sem_args = {0};
        __u32 owner, index, count;
@@ -663,6 +664,19 @@ TEST(test_wait_all)
 
        close(objs[1]);
 
+       event_args.manual = true;
+       event_args.signaled = true;
+       objs[1] = ioctl(fd, NTSYNC_IOC_CREATE_EVENT, &event_args);
+       EXPECT_LE(0, objs[1]);
+
+       ret = wait_all(fd, 2, objs, 123, &index);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(0, index);
+       check_sem_state(objs[0], 0, 3);
+       check_event_state(objs[1], 1, 1);
+
+       close(objs[1]);
+
        /* test waiting on the same object twice */
        objs[1] = objs[0];
        ret = wait_all(fd, 2, objs, 123, &index);
@@ -716,12 +730,13 @@ static int wait_for_thread(pthread_t thread, unsigned int ms)
 
 TEST(wake_any)
 {
+       struct ntsync_event_args event_args = {0};
        struct ntsync_mutex_args mutex_args = {0};
        struct ntsync_wait_args wait_args = {0};
        struct ntsync_sem_args sem_args = {0};
        struct wait_args thread_args;
+       __u32 count, index, signaled;
        int objs[2], fd, ret;
-       __u32 count, index;
        pthread_t thread;
 
        fd = open("/dev/ntsync", O_CLOEXEC | O_RDONLY);
@@ -796,6 +811,94 @@ TEST(wake_any)
        EXPECT_EQ(0, thread_args.ret);
        EXPECT_EQ(1, wait_args.index);
 
+       close(objs[1]);
+
+       /* test waking events */
+
+       event_args.manual = false;
+       event_args.signaled = false;
+       objs[1] = ioctl(fd, NTSYNC_IOC_CREATE_EVENT, &event_args);
+       EXPECT_LE(0, objs[1]);
+
+       wait_args.timeout = get_abs_timeout(1000);
+       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(objs[1], NTSYNC_IOC_EVENT_SET, &signaled);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(0, signaled);
+       check_event_state(objs[1], 0, 0);
+
+       ret = wait_for_thread(thread, 100);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(0, thread_args.ret);
+       EXPECT_EQ(1, wait_args.index);
+
+       wait_args.timeout = get_abs_timeout(1000);
+       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(objs[1], NTSYNC_IOC_EVENT_PULSE, &signaled);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(0, signaled);
+       check_event_state(objs[1], 0, 0);
+
+       ret = wait_for_thread(thread, 100);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(0, thread_args.ret);
+       EXPECT_EQ(1, wait_args.index);
+
+       close(objs[1]);
+
+       event_args.manual = true;
+       event_args.signaled = false;
+       objs[1] = ioctl(fd, NTSYNC_IOC_CREATE_EVENT, &event_args);
+       EXPECT_LE(0, objs[1]);
+
+       wait_args.timeout = get_abs_timeout(1000);
+       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(objs[1], NTSYNC_IOC_EVENT_SET, &signaled);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(0, signaled);
+       check_event_state(objs[1], 1, 1);
+
+       ret = wait_for_thread(thread, 100);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(0, thread_args.ret);
+       EXPECT_EQ(1, wait_args.index);
+
+       ret = ioctl(objs[1], NTSYNC_IOC_EVENT_RESET, &signaled);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(1, signaled);
+
+       wait_args.timeout = get_abs_timeout(1000);
+       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(objs[1], NTSYNC_IOC_EVENT_PULSE, &signaled);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(0, signaled);
+       check_event_state(objs[1], 0, 1);
+
+       ret = wait_for_thread(thread, 100);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(0, thread_args.ret);
+       EXPECT_EQ(1, wait_args.index);
+
        /* delete an object while it's being waited on */
 
        wait_args.timeout = get_abs_timeout(200);
@@ -819,12 +922,14 @@ TEST(wake_any)
 
 TEST(wake_all)
 {
+       struct ntsync_event_args manual_event_args = {0};
+       struct ntsync_event_args auto_event_args = {0};
        struct ntsync_mutex_args mutex_args = {0};
        struct ntsync_wait_args wait_args = {0};
        struct ntsync_sem_args sem_args = {0};
        struct wait_args thread_args;
-       int objs[2], fd, ret;
-       __u32 count, index;
+       __u32 count, index, signaled;
+       int objs[4], fd, ret;
        pthread_t thread;
 
        fd = open("/dev/ntsync", O_CLOEXEC | O_RDONLY);
@@ -840,9 +945,19 @@ TEST(wake_all)
        objs[1] = ioctl(fd, NTSYNC_IOC_CREATE_MUTEX, &mutex_args);
        EXPECT_LE(0, objs[1]);
 
+       manual_event_args.manual = true;
+       manual_event_args.signaled = true;
+       objs[2] = ioctl(fd, NTSYNC_IOC_CREATE_EVENT, &manual_event_args);
+       EXPECT_LE(0, objs[2]);
+
+       auto_event_args.manual = false;
+       auto_event_args.signaled = true;
+       objs[3] = ioctl(fd, NTSYNC_IOC_CREATE_EVENT, &auto_event_args);
+       EXPECT_EQ(0, objs[3]);
+
        wait_args.timeout = get_abs_timeout(1000);
        wait_args.objs = (uintptr_t)objs;
-       wait_args.count = 2;
+       wait_args.count = 4;
        wait_args.owner = 456;
        thread_args.fd = fd;
        thread_args.args = &wait_args;
@@ -876,12 +991,32 @@ TEST(wake_all)
 
        check_mutex_state(objs[1], 0, 0);
 
+       ret = ioctl(objs[2], NTSYNC_IOC_EVENT_RESET, &signaled);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(1, signaled);
+
        count = 2;
        ret = release_sem(objs[0], &count);
        EXPECT_EQ(0, ret);
        EXPECT_EQ(0, count);
+       check_sem_state(objs[0], 2, 3);
+
+       ret = ioctl(objs[3], NTSYNC_IOC_EVENT_RESET, &signaled);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(1, signaled);
+
+       ret = ioctl(objs[2], NTSYNC_IOC_EVENT_SET, &signaled);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(0, signaled);
+
+       ret = ioctl(objs[3], NTSYNC_IOC_EVENT_SET, &signaled);
+       EXPECT_EQ(0, ret);
+       EXPECT_EQ(0, signaled);
+
        check_sem_state(objs[0], 1, 3);
        check_mutex_state(objs[1], 1, 456);
+       check_event_state(objs[2], 1, 1);
+       check_event_state(objs[3], 0, 0);
 
        ret = wait_for_thread(thread, 100);
        EXPECT_EQ(0, ret);
@@ -899,6 +1034,8 @@ TEST(wake_all)
 
        close(objs[0]);
        close(objs[1]);
+       close(objs[2]);
+       close(objs[3]);
 
        ret = wait_for_thread(thread, 200);
        EXPECT_EQ(0, ret);