diff mbox series

[v2,12/31] ntsync: Introduce NTSYNC_IOC_EVENT_PULSE.

Message ID	20240219223833.95710-13-zfigura@codeweavers.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel+bounces-72085-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; 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, =?utf-8?q?Andr=C3=A9_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, Randy Dunlap <rdunlap@infradead.org>, Elizabeth Figura <zfigura@codeweavers.com> Subject: [PATCH v2 12/31] ntsync: Introduce NTSYNC_IOC_EVENT_PULSE. Date: Mon, 19 Feb 2024 16:38:14 -0600 Message-ID: <20240219223833.95710-13-zfigura@codeweavers.com> In-Reply-To: <20240219223833.95710-1-zfigura@codeweavers.com> References: <20240219223833.95710-1-zfigura@codeweavers.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX
Series	NT synchronization primitive driver \| [v2,00/31] NT synchronization primitive driver [v2,01/31] ntsync: Introduce the ntsync driver and character device. [v2,02/31] ntsync: Introduce NTSYNC_IOC_CREATE_SEM. [v2,03/31] ntsync: Introduce NTSYNC_IOC_SEM_POST. [v2,04/31] ntsync: Introduce NTSYNC_IOC_WAIT_ANY. [v2,05/31] ntsync: Introduce NTSYNC_IOC_WAIT_ALL. [v2,06/31] ntsync: Introduce NTSYNC_IOC_CREATE_MUTEX. [v2,07/31] ntsync: Introduce NTSYNC_IOC_MUTEX_UNLOCK. [v2,08/31] ntsync: Introduce NTSYNC_IOC_MUTEX_KILL. [v2,09/31] ntsync: Introduce NTSYNC_IOC_CREATE_EVENT. [v2,10/31] ntsync: Introduce NTSYNC_IOC_EVENT_SET. [v2,11/31] ntsync: Introduce NTSYNC_IOC_EVENT_RESET. [v2,12/31] ntsync: Introduce NTSYNC_IOC_EVENT_PULSE. [v2,13/31] ntsync: Introduce NTSYNC_IOC_SEM_READ. [v2,14/31] ntsync: Introduce NTSYNC_IOC_MUTEX_READ. [v2,15/31] ntsync: Introduce NTSYNC_IOC_EVENT_READ. [v2,16/31] ntsync: Introduce alertable waits. [v2,17/31] ntsync: Allow waits to use the REALTIME clock. [v2,18/31] selftests: ntsync: Add some tests for semaphore state. [v2,19/31] selftests: ntsync: Add some tests for mutex state. [v2,20/31] selftests: ntsync: Add some tests for NTSYNC_IOC_WAIT_ANY. [v2,21/31] selftests: ntsync: Add some tests for NTSYNC_IOC_WAIT_ALL. [v2,22/31] selftests: ntsync: Add some tests for wakeup signaling with WINESYNC_IOC_WAIT_ANY. [v2,23/31] selftests: ntsync: Add some tests for wakeup signaling with WINESYNC_IOC_WAIT_ALL. [v2,24/31] selftests: ntsync: Add some tests for manual-reset event state. [v2,25/31] selftests: ntsync: Add some tests for auto-reset event state. [v2,26/31] selftests: ntsync: Add some tests for wakeup signaling with events. [v2,27/31] selftests: ntsync: Add tests for alertable waits. [v2,28/31] selftests: ntsync: Add some tests for wakeup signaling via alerts. [v2,29/31] selftests: ntsync: Add a stress test for contended waits. [v2,30/31] maintainers: Add an entry for ntsync. [v2,31/31] docs: ntsync: Add documentation for the ntsync uAPI.

Commit Message

Elizabeth Figura Feb. 19, 2024, 10:38 p.m. UTC

  This corresponds to the NT syscall NtPulseEvent().

This wakes up any waiters as if the event had been set, but does not set the
event, instead resetting it if it had been signalled. Thus, for a manual-reset
event, all waiters are woken, whereas for an auto-reset event, at most one
waiter is woken.

Signed-off-by: Elizabeth Figura <zfigura@codeweavers.com>
---
 drivers/misc/ntsync.c       | 10 ++++++++--
 include/uapi/linux/ntsync.h |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c
index fa4c3fa1e496..b9b4127a6c9f 100644
--- a/drivers/misc/ntsync.c
+++ b/drivers/misc/ntsync.c
@@ -469,7 +469,7 @@  static int ntsync_mutex_kill(struct ntsync_obj *mutex, void __user *argp)
 	return ret;
 }
 
-static int ntsync_event_set(struct ntsync_obj *event, void __user *argp)
+static int ntsync_event_set(struct ntsync_obj *event, void __user *argp, bool pulse)
 {
 	struct ntsync_device *dev = event->dev;
 	__u32 prev_state;
@@ -485,6 +485,8 @@  static int ntsync_event_set(struct ntsync_obj *event, void __user *argp)
 		event->u.event.signaled = true;
 		try_wake_all_obj(dev, event);
 		try_wake_any_event(event);
+		if (pulse)
+			event->u.event.signaled = false;
 
 		spin_unlock(&event->lock);
 		spin_unlock(&dev->wait_all_lock);
@@ -494,6 +496,8 @@  static int ntsync_event_set(struct ntsync_obj *event, void __user *argp)
 		prev_state = event->u.event.signaled;
 		event->u.event.signaled = true;
 		try_wake_any_event(event);
+		if (pulse)
+			event->u.event.signaled = false;
 
 		spin_unlock(&event->lock);
 	}
@@ -548,9 +552,11 @@  static long ntsync_obj_ioctl(struct file *file, unsigned int cmd,
 	case NTSYNC_IOC_MUTEX_KILL:
 		return ntsync_mutex_kill(obj, argp);
 	case NTSYNC_IOC_EVENT_SET:
-		return ntsync_event_set(obj, argp);
+		return ntsync_event_set(obj, argp, false);
 	case NTSYNC_IOC_EVENT_RESET:
 		return ntsync_event_reset(obj, argp);
+	case NTSYNC_IOC_EVENT_PULSE:
+		return ntsync_event_set(obj, argp, true);
 	default:
 		return -ENOIOCTLCMD;
 	}
diff --git a/include/uapi/linux/ntsync.h b/include/uapi/linux/ntsync.h
index 6963356ee3f7..72047f36c45d 100644
--- a/include/uapi/linux/ntsync.h
+++ b/include/uapi/linux/ntsync.h
@@ -50,5 +50,6 @@  struct ntsync_wait_args {
 #define NTSYNC_IOC_MUTEX_KILL		_IOW ('N', 0x86, __u32)
 #define NTSYNC_IOC_EVENT_SET		_IOR ('N', 0x88, __u32)
 #define NTSYNC_IOC_EVENT_RESET		_IOR ('N', 0x89, __u32)
+#define NTSYNC_IOC_EVENT_PULSE		_IOR ('N', 0x8a, __u32)
 
 #endif