Linux Kernel Selftest development
 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,
	"Elizabeth Figura" <zfigura@codeweavers.com>
Subject: [PATCH 07/31] ntsync: Introduce NTSYNC_IOC_MUTEX_UNLOCK.
Date: Wed, 14 Feb 2024 17:36:43 -0600	[thread overview]
Message-ID: <20240214233645.9273-8-zfigura@codeweavers.com> (raw)
In-Reply-To: <20240214233645.9273-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 5b7f93709587..42041afd8d15 100644
--- a/drivers/misc/ntsync.c
+++ b/drivers/misc/ntsync.c
@@ -299,6 +299,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;
@@ -318,6 +380,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 d68f24fd75a2..a3f5f4f13798 100644
--- a/include/uapi/linux/ntsync.h
+++ b/include/uapi/linux/ntsync.h
@@ -39,5 +39,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-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 ` Elizabeth Figura [this message]
2024-02-14 23:36 ` [PATCH 08/31] ntsync: Introduce NTSYNC_IOC_MUTEX_KILL Elizabeth Figura
2024-02-14 23:36 ` [PATCH 09/31] ntsync: Introduce NTSYNC_IOC_CREATE_EVENT Elizabeth Figura
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-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=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