All of lore.kernel.org
 help / color / mirror / Atom feed
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,
	"Randy Dunlap" <rdunlap@infradead.org>,
	"Elizabeth Figura" <zfigura@codeweavers.com>
Subject: [PATCH v3 07/30] ntsync: Introduce NTSYNC_IOC_MUTEX_UNLOCK.
Date: Thu, 28 Mar 2024 19:05:58 -0500	[thread overview]
Message-ID: <20240329000621.148791-8-zfigura@codeweavers.com> (raw)
In-Reply-To: <20240329000621.148791-1-zfigura@codeweavers.com>

This corresponds to the NT syscall NtReleaseMutant().

This syscall decrements the mutex's recursion count by one, and returns the
previous value. If the mutex is not owned by the given owner ID, the function
instead fails and returns -EPERM.

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

diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c
index 173513aeeacc..f7911ef78d5b 100644
--- a/drivers/misc/ntsync.c
+++ b/drivers/misc/ntsync.c
@@ -315,6 +315,68 @@ static int ntsync_sem_post(struct ntsync_obj *sem, void __user *argp)
 	return ret;
 }
 
+/*
+ * Actually change the mutex state, returning -EPERM if not the owner.
+ */
+static int unlock_mutex_state(struct ntsync_obj *mutex,
+			      const struct ntsync_mutex_args *args)
+{
+	lockdep_assert_held(&mutex->lock);
+
+	if (mutex->u.mutex.owner != args->owner)
+		return -EPERM;
+
+	if (!--mutex->u.mutex.count)
+		mutex->u.mutex.owner = 0;
+	return 0;
+}
+
+static int ntsync_mutex_unlock(struct ntsync_obj *mutex, void __user *argp)
+{
+	struct ntsync_mutex_args __user *user_args = argp;
+	struct ntsync_device *dev = mutex->dev;
+	struct ntsync_mutex_args args;
+	__u32 prev_count;
+	int ret;
+
+	if (copy_from_user(&args, argp, sizeof(args)))
+		return -EFAULT;
+	if (!args.owner)
+		return -EINVAL;
+
+	if (mutex->type != NTSYNC_TYPE_MUTEX)
+		return -EINVAL;
+
+	if (atomic_read(&mutex->all_hint) > 0) {
+		spin_lock(&dev->wait_all_lock);
+		spin_lock_nest_lock(&mutex->lock, &dev->wait_all_lock);
+
+		prev_count = mutex->u.mutex.count;
+		ret = unlock_mutex_state(mutex, &args);
+		if (!ret) {
+			try_wake_all_obj(dev, mutex);
+			try_wake_any_mutex(mutex);
+		}
+
+		spin_unlock(&mutex->lock);
+		spin_unlock(&dev->wait_all_lock);
+	} else {
+		spin_lock(&mutex->lock);
+
+		prev_count = mutex->u.mutex.count;
+		ret = unlock_mutex_state(mutex, &args);
+		if (!ret)
+			try_wake_any_mutex(mutex);
+
+		spin_unlock(&mutex->lock);
+	}
+
+	if (!ret && put_user(prev_count, &user_args->count))
+		ret = -EFAULT;
+
+	return ret;
+}
+
 static int ntsync_obj_release(struct inode *inode, struct file *file)
 {
 	struct ntsync_obj *obj = file->private_data;
@@ -334,6 +396,8 @@ static long ntsync_obj_ioctl(struct file *file, unsigned int cmd,
 	switch (cmd) {
 	case NTSYNC_IOC_SEM_POST:
 		return ntsync_sem_post(obj, argp);
+	case NTSYNC_IOC_MUTEX_UNLOCK:
+		return ntsync_mutex_unlock(obj, argp);
 	default:
 		return -ENOIOCTLCMD;
 	}
diff --git a/include/uapi/linux/ntsync.h b/include/uapi/linux/ntsync.h
index cd7841cdba49..fa2c9f638d77 100644
--- a/include/uapi/linux/ntsync.h
+++ b/include/uapi/linux/ntsync.h
@@ -43,5 +43,6 @@ struct ntsync_wait_args {
 #define NTSYNC_IOC_CREATE_MUTEX		_IOWR('N', 0x84, struct ntsync_sem_args)
 
 #define NTSYNC_IOC_SEM_POST		_IOWR('N', 0x81, __u32)
+#define NTSYNC_IOC_MUTEX_UNLOCK		_IOWR('N', 0x85, struct ntsync_mutex_args)
 
 #endif
-- 
2.43.0


  parent reply	other threads:[~2024-03-29  0:23 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-29  0:05 [PATCH v3 00/30] NT synchronization primitive driver Elizabeth Figura
2024-03-29  0:05 ` [PATCH v3 01/30] ntsync: Introduce the ntsync driver and character device Elizabeth Figura
2024-03-29  0:05 ` [PATCH v3 02/30] ntsync: Introduce NTSYNC_IOC_CREATE_SEM Elizabeth Figura
2024-03-29  0:05 ` [PATCH v3 03/30] ntsync: Introduce NTSYNC_IOC_SEM_POST Elizabeth Figura
2024-04-11 13:35   ` Greg Kroah-Hartman
2024-03-29  0:05 ` [PATCH v3 04/30] ntsync: Introduce NTSYNC_IOC_WAIT_ANY Elizabeth Figura
2024-04-11 13:34   ` Greg Kroah-Hartman
2024-04-12  0:33     ` Elizabeth Figura
2024-04-12  6:16       ` Greg Kroah-Hartman
2024-03-29  0:05 ` [PATCH v3 05/30] ntsync: Introduce NTSYNC_IOC_WAIT_ALL Elizabeth Figura
2024-03-29  0:05 ` [PATCH v3 06/30] ntsync: Introduce NTSYNC_IOC_CREATE_MUTEX Elizabeth Figura
2024-03-29  0:05 ` Elizabeth Figura [this message]
2024-03-29  0:05 ` [PATCH v3 08/30] ntsync: Introduce NTSYNC_IOC_MUTEX_KILL Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 09/30] ntsync: Introduce NTSYNC_IOC_CREATE_EVENT Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 10/30] ntsync: Introduce NTSYNC_IOC_EVENT_SET Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 11/30] ntsync: Introduce NTSYNC_IOC_EVENT_RESET Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 12/30] ntsync: Introduce NTSYNC_IOC_EVENT_PULSE Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 13/30] ntsync: Introduce NTSYNC_IOC_SEM_READ Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 14/30] ntsync: Introduce NTSYNC_IOC_MUTEX_READ Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 15/30] ntsync: Introduce NTSYNC_IOC_EVENT_READ Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 16/30] ntsync: Introduce alertable waits Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 17/30] selftests: ntsync: Add some tests for semaphore state Elizabeth Figura
2024-03-29 20:07   ` Muhammad Usama Anjum
2024-03-29  0:06 ` [PATCH v3 18/30] selftests: ntsync: Add some tests for mutex state Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 19/30] selftests: ntsync: Add some tests for NTSYNC_IOC_WAIT_ANY Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 20/30] selftests: ntsync: Add some tests for NTSYNC_IOC_WAIT_ALL Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 21/30] selftests: ntsync: Add some tests for wakeup signaling with WINESYNC_IOC_WAIT_ANY Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 22/30] selftests: ntsync: Add some tests for wakeup signaling with WINESYNC_IOC_WAIT_ALL Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 23/30] selftests: ntsync: Add some tests for manual-reset event state Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 24/30] selftests: ntsync: Add some tests for auto-reset " Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 25/30] selftests: ntsync: Add some tests for wakeup signaling with events Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 26/30] selftests: ntsync: Add tests for alertable waits Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 27/30] selftests: ntsync: Add some tests for wakeup signaling via alerts Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 28/30] selftests: ntsync: Add a stress test for contended waits Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 29/30] maintainers: Add an entry for ntsync Elizabeth Figura
2024-03-29  0:06 ` [PATCH v3 30/30] docs: ntsync: Add documentation for the ntsync uAPI Elizabeth Figura
2024-04-12  5:52   ` Bagas Sanjaya

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=20240329000621.148791-8-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=rdunlap@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.