From: Elizabeth Figura <zfigura@codeweavers.com>
To: Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jonathan Corbet <corbet@lwn.net>, Shuah Khan <shuah@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-api@vger.kernel.org,
wine-devel@winehq.org, "André Almeida" <andrealmeid@igalia.com>,
"Wolfram Sang" <wsa@kernel.org>,
"Arkadiusz Hiler" <ahiler@codeweavers.com>,
"Peter Zijlstra" <peterz@infradead.org>,
"Andy Lutomirski" <luto@kernel.org>,
linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org,
"Elizabeth Figura" <zfigura@codeweavers.com>
Subject: [PATCH 09/31] ntsync: Introduce NTSYNC_IOC_CREATE_EVENT.
Date: Wed, 14 Feb 2024 17:36:45 -0600 [thread overview]
Message-ID: <20240214233645.9273-10-zfigura@codeweavers.com> (raw)
In-Reply-To: <20240214233645.9273-1-zfigura@codeweavers.com>
This correspond to the NT syscall NtCreateEvent().
An NT event holds a single bit of state denoting whether it is signaled or
unsignaled.
There are two types of events: manual-reset and automatic-reset. When an
automatic-reset event is acquired via a wait function, its state is reset to
unsignaled. Manual-reset events are not affected by wait functions.
Whether the event is manual-reset, and its initial state, are specified at
creation time.
Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
---
drivers/misc/ntsync.c | 60 +++++++++++++++++++++++++++++++++++++
include/uapi/linux/ntsync.h | 7 +++++
2 files changed, 67 insertions(+)
diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c
index 8cb951c76aca..2a21e7b0982a 100644
--- a/drivers/misc/ntsync.c
+++ b/drivers/misc/ntsync.c
@@ -25,6 +25,7 @@
enum ntsync_type {
NTSYNC_TYPE_SEM,
NTSYNC_TYPE_MUTEX,
+ NTSYNC_TYPE_EVENT,
};
struct ntsync_obj {
@@ -46,6 +47,10 @@ struct ntsync_obj {
__u32 owner;
bool ownerdead;
} mutex;
+ struct {
+ bool manual;
+ bool signaled;
+ } event;
} u;
/*
@@ -130,6 +135,8 @@ static bool is_signaled(struct ntsync_obj *obj, __u32 owner)
if (obj->u.mutex.owner && obj->u.mutex.owner != owner)
return false;
return obj->u.mutex.count < UINT_MAX;
+ case NTSYNC_TYPE_EVENT:
+ return obj->u.event.signaled;
}
WARN(1, "bad object type %#x\n", obj->type);
@@ -179,6 +186,10 @@ static void try_wake_all(struct ntsync_device *dev, struct ntsync_q *q,
obj->u.mutex.count++;
obj->u.mutex.owner = q->owner;
break;
+ case NTSYNC_TYPE_EVENT:
+ if (!obj->u.event.manual)
+ obj->u.event.signaled = false;
+ break;
}
}
wake_up_process(q->task);
@@ -245,6 +256,26 @@ static void try_wake_any_mutex(struct ntsync_obj *mutex)
}
}
+static void try_wake_any_event(struct ntsync_obj *event)
+{
+ struct ntsync_q_entry *entry;
+
+ lockdep_assert_held(&event->lock);
+
+ list_for_each_entry(entry, &event->any_waiters, node) {
+ struct ntsync_q *q = entry->q;
+
+ if (!event->u.event.signaled)
+ break;
+
+ if (atomic_cmpxchg(&q->signaled, -1, entry->index) == -1) {
+ if (!event->u.event.manual)
+ event->u.event.signaled = false;
+ wake_up_process(q->task);
+ }
+ }
+}
+
/*
* Actually change the semaphore state, returning -EOVERFLOW if it is made
* invalid.
@@ -553,6 +584,30 @@ static int ntsync_create_mutex(struct ntsync_device *dev, void __user *argp)
return put_user(fd, &user_args->mutex);
}
+static int ntsync_create_event(struct ntsync_device *dev, void __user *argp)
+{
+ struct ntsync_event_args __user *user_args = argp;
+ struct ntsync_event_args args;
+ struct ntsync_obj *event;
+ int fd;
+
+ if (copy_from_user(&args, argp, sizeof(args)))
+ return -EFAULT;
+
+ event = ntsync_alloc_obj(dev, NTSYNC_TYPE_EVENT);
+ if (!event)
+ return -ENOMEM;
+ event->u.event.manual = args.manual;
+ event->u.event.signaled = args.signaled;
+ fd = ntsync_obj_get_fd(event);
+ if (fd < 0) {
+ kfree(event);
+ return fd;
+ }
+
+ return put_user(fd, &user_args->event);
+}
+
static struct ntsync_obj *get_obj(struct ntsync_device *dev, int fd)
{
struct file *file = fget(fd);
@@ -676,6 +731,9 @@ static void try_wake_any_obj(struct ntsync_obj *obj)
case NTSYNC_TYPE_MUTEX:
try_wake_any_mutex(obj);
break;
+ case NTSYNC_TYPE_EVENT:
+ try_wake_any_event(obj);
+ break;
}
}
@@ -864,6 +922,8 @@ static long ntsync_char_ioctl(struct file *file, unsigned int cmd,
void __user *argp = (void __user *)parm;
switch (cmd) {
+ case NTSYNC_IOC_CREATE_EVENT:
+ return ntsync_create_event(dev, argp);
case NTSYNC_IOC_CREATE_MUTEX:
return ntsync_create_mutex(dev, argp);
case NTSYNC_IOC_CREATE_SEM:
diff --git a/include/uapi/linux/ntsync.h b/include/uapi/linux/ntsync.h
index 3861397c6c2f..b8cf503365ef 100644
--- a/include/uapi/linux/ntsync.h
+++ b/include/uapi/linux/ntsync.h
@@ -22,6 +22,12 @@ struct ntsync_mutex_args {
__u32 count;
};
+struct ntsync_event_args {
+ __u32 event;
+ __u32 manual;
+ __u32 signaled;
+};
+
struct ntsync_wait_args {
__u64 timeout;
__u64 objs;
@@ -37,6 +43,7 @@ struct ntsync_wait_args {
#define NTSYNC_IOC_WAIT_ANY _IOWR('N', 0x82, struct ntsync_wait_args)
#define NTSYNC_IOC_WAIT_ALL _IOWR('N', 0x83, struct ntsync_wait_args)
#define NTSYNC_IOC_CREATE_MUTEX _IOWR('N', 0x84, struct ntsync_sem_args)
+#define NTSYNC_IOC_CREATE_EVENT _IOWR('N', 0x87, struct ntsync_event_args)
#define NTSYNC_IOC_SEM_POST _IOWR('N', 0x81, __u32)
#define NTSYNC_IOC_MUTEX_UNLOCK _IOWR('N', 0x85, struct ntsync_mutex_args)
--
2.43.0
next prev parent reply other threads:[~2024-02-14 23:53 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-14 23:36 [PATCH 00/31] NT synchronization primitive driver Elizabeth Figura
2024-02-14 23:36 ` [PATCH 01/31] ntsync: Introduce the ntsync driver and character device Elizabeth Figura
2024-02-15 1:57 ` Randy Dunlap
2024-02-15 19:04 ` Elizabeth Figura
2024-02-14 23:36 ` [PATCH 02/31] ntsync: Introduce NTSYNC_IOC_CREATE_SEM Elizabeth Figura
2024-02-15 7:28 ` Greg Kroah-Hartman
2024-02-15 19:22 ` Elizabeth Figura
2024-02-17 8:03 ` Greg Kroah-Hartman
2024-02-19 19:02 ` Elizabeth Figura
2024-02-14 23:36 ` [PATCH 03/31] ntsync: Introduce NTSYNC_IOC_SEM_POST Elizabeth Figura
2024-02-14 23:36 ` [PATCH 04/31] ntsync: Introduce NTSYNC_IOC_WAIT_ANY Elizabeth Figura
2024-02-14 23:36 ` [PATCH 05/31] ntsync: Introduce NTSYNC_IOC_WAIT_ALL Elizabeth Figura
2024-02-14 23:36 ` [PATCH 06/31] ntsync: Introduce NTSYNC_IOC_CREATE_MUTEX Elizabeth Figura
2024-02-14 23:36 ` [PATCH 07/31] ntsync: Introduce NTSYNC_IOC_MUTEX_UNLOCK Elizabeth Figura
2024-02-14 23:36 ` [PATCH 08/31] ntsync: Introduce NTSYNC_IOC_MUTEX_KILL Elizabeth Figura
2024-02-14 23:36 ` Elizabeth Figura [this message]
2024-02-14 23:52 ` [PATCH 10/31] ntsync: Introduce NTSYNC_IOC_EVENT_SET Elizabeth Figura
2024-02-14 23:52 ` [PATCH 11/31] ntsync: Introduce NTSYNC_IOC_EVENT_RESET Elizabeth Figura
2024-02-14 23:52 ` [PATCH 12/31] ntsync: Introduce NTSYNC_IOC_EVENT_PULSE Elizabeth Figura
2024-02-14 23:52 ` [PATCH 13/31] ntsync: Introduce NTSYNC_IOC_SEM_READ Elizabeth Figura
2024-02-14 23:52 ` [PATCH 14/31] ntsync: Introduce NTSYNC_IOC_MUTEX_READ Elizabeth Figura
2024-02-14 23:52 ` [PATCH 15/31] ntsync: Introduce NTSYNC_IOC_EVENT_READ Elizabeth Figura
2024-02-14 23:52 ` [PATCH 16/31] ntsync: Introduce alertable waits Elizabeth Figura
2024-02-14 23:52 ` [PATCH 17/31] ntsync: Allow waits to use the REALTIME clock Elizabeth Figura
2024-02-14 23:52 ` [PATCH 18/31] selftests: ntsync: Add some tests for semaphore state Elizabeth Figura
2024-02-14 23:52 ` [PATCH 19/31] selftests: ntsync: Add some tests for mutex state Elizabeth Figura
2024-02-14 23:52 ` [PATCH 20/31] selftests: ntsync: Add some tests for NTSYNC_IOC_WAIT_ANY Elizabeth Figura
2024-02-14 23:52 ` [PATCH 21/31] selftests: ntsync: Add some tests for NTSYNC_IOC_WAIT_ALL Elizabeth Figura
2024-02-14 23:52 ` [PATCH 22/31] selftests: ntsync: Add some tests for wakeup signaling with WINESYNC_IOC_WAIT_ANY Elizabeth Figura
2024-02-14 23:52 ` [PATCH 23/31] selftests: ntsync: Add some tests for wakeup signaling with WINESYNC_IOC_WAIT_ALL Elizabeth Figura
2024-02-14 23:52 ` [PATCH 24/31] selftests: ntsync: Add some tests for manual-reset event state Elizabeth Figura
2024-02-14 23:53 ` [PATCH 25/31] selftests: ntsync: Add some tests for auto-reset " Elizabeth Figura
2024-02-14 23:53 ` [PATCH 26/31] selftests: ntsync: Add some tests for wakeup signaling with events Elizabeth Figura
2024-02-14 23:53 ` [PATCH 27/31] selftests: ntsync: Add tests for alertable waits Elizabeth Figura
2024-02-14 23:53 ` [PATCH 28/31] selftests: ntsync: Add some tests for wakeup signaling via alerts Elizabeth Figura
2024-02-14 23:53 ` [PATCH 29/31] selftests: ntsync: Add a stress test for contended waits Elizabeth Figura
2024-02-14 23:53 ` [PATCH 30/31] maintainers: Add an entry for ntsync Elizabeth Figura
2024-02-14 23:53 ` [PATCH 31/31] docs: ntsync: Add documentation for the ntsync uAPI Elizabeth Figura
2024-02-15 0:01 ` [PATCH 00/31] NT synchronization primitive driver Elizabeth Figura
2024-02-15 7:24 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240214233645.9273-10-zfigura@codeweavers.com \
--to=zfigura@codeweavers.com \
--cc=ahiler@codeweavers.com \
--cc=andrealmeid@igalia.com \
--cc=arnd@arndb.de \
--cc=corbet@lwn.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=luto@kernel.org \
--cc=peterz@infradead.org \
--cc=shuah@kernel.org \
--cc=wine-devel@winehq.org \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).