public inbox for linux-kernel@vger.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>,
	"Ingo Molnar" <mingo@redhat.com>, "Will Deacon" <will@kernel.org>,
	"Waiman Long" <longman@redhat.com>,
	"Boqun Feng" <boqun.feng@gmail.com>,
	"Elizabeth Figura" <zfigura@codeweavers.com>
Subject: [PATCH v6 04/28] ntsync: Introduce NTSYNC_IOC_MUTEX_UNLOCK.
Date: Mon,  9 Dec 2024 12:58:40 -0600	[thread overview]
Message-ID: <20241209185904.507350-5-zfigura@codeweavers.com> (raw)
In-Reply-To: <20241209185904.507350-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 current task, the function
instead fails and returns -EPERM.

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

diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c
index 30c0bbb442da..6ed278c17be9 100644
--- a/drivers/misc/ntsync.c
+++ b/drivers/misc/ntsync.c
@@ -396,6 +396,57 @@ 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)
+{
+	ntsync_assert_held(mutex);
+
+	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;
+	bool all;
+	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;
+
+	all = ntsync_lock_obj(dev, mutex);
+
+	prev_count = mutex->u.mutex.count;
+	ret = unlock_mutex_state(mutex, &args);
+	if (!ret) {
+		if (all)
+			try_wake_all_obj(dev, mutex);
+		try_wake_any_mutex(mutex);
+	}
+
+	ntsync_unlock_obj(dev, mutex, all);
+
+	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;
@@ -415,6 +466,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 d5e5a2fbcb4d..a633db34f284 100644
--- a/include/uapi/linux/ntsync.h
+++ b/include/uapi/linux/ntsync.h
@@ -42,5 +42,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.45.2


  parent reply	other threads:[~2024-12-09 19:03 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-09 18:58 [PATCH v6 00/28] NT synchronization primitive driver Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 01/28] ntsync: Introduce NTSYNC_IOC_WAIT_ANY Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 02/28] ntsync: Introduce NTSYNC_IOC_WAIT_ALL Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 03/28] ntsync: Introduce NTSYNC_IOC_CREATE_MUTEX Elizabeth Figura
2024-12-09 18:58 ` Elizabeth Figura [this message]
2024-12-09 18:58 ` [PATCH v6 05/28] ntsync: Introduce NTSYNC_IOC_MUTEX_KILL Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 06/28] ntsync: Introduce NTSYNC_IOC_CREATE_EVENT Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 07/28] ntsync: Introduce NTSYNC_IOC_EVENT_SET Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 08/28] ntsync: Introduce NTSYNC_IOC_EVENT_RESET Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 09/28] ntsync: Introduce NTSYNC_IOC_EVENT_PULSE Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 10/28] ntsync: Introduce NTSYNC_IOC_SEM_READ Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 11/28] ntsync: Introduce NTSYNC_IOC_MUTEX_READ Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 12/28] ntsync: Introduce NTSYNC_IOC_EVENT_READ Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 13/28] ntsync: Introduce alertable waits Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 14/28] selftests: ntsync: Add some tests for semaphore state Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 15/28] selftests: ntsync: Add some tests for mutex state Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 16/28] selftests: ntsync: Add some tests for NTSYNC_IOC_WAIT_ANY Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 17/28] selftests: ntsync: Add some tests for NTSYNC_IOC_WAIT_ALL Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 18/28] selftests: ntsync: Add some tests for wakeup signaling with WINESYNC_IOC_WAIT_ANY Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 19/28] selftests: ntsync: Add some tests for wakeup signaling with WINESYNC_IOC_WAIT_ALL Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 20/28] selftests: ntsync: Add some tests for manual-reset event state Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 21/28] selftests: ntsync: Add some tests for auto-reset " Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 22/28] selftests: ntsync: Add some tests for wakeup signaling with events Elizabeth Figura
2024-12-09 18:58 ` [PATCH v6 23/28] selftests: ntsync: Add tests for alertable waits Elizabeth Figura
2024-12-09 18:59 ` [PATCH v6 24/28] selftests: ntsync: Add some tests for wakeup signaling via alerts Elizabeth Figura
2024-12-09 18:59 ` [PATCH v6 25/28] selftests: ntsync: Add a stress test for contended waits Elizabeth Figura
2024-12-09 18:59 ` [PATCH v6 26/28] maintainers: Add an entry for ntsync Elizabeth Figura
2024-12-09 18:59 ` [PATCH v6 27/28] docs: ntsync: Add documentation for the ntsync uAPI Elizabeth Figura
2024-12-09 18:59 ` [PATCH v6 28/28] ntsync: No longer depend on BROKEN Elizabeth Figura
2024-12-12  4:52   ` kernel test robot
2024-12-12  7:18     ` Arnd Bergmann
2024-12-09 20:24 ` [PATCH v6 00/28] NT synchronization primitive driver Arnd Bergmann
2024-12-09 22:08   ` Elizabeth Figura
2024-12-12 12:01 ` Peter Zijlstra

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=20241209185904.507350-5-zfigura@codeweavers.com \
    --to=zfigura@codeweavers.com \
    --cc=ahiler@codeweavers.com \
    --cc=andrealmeid@igalia.com \
    --cc=arnd@arndb.de \
    --cc=boqun.feng@gmail.com \
    --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=longman@redhat.com \
    --cc=luto@kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=rdunlap@infradead.org \
    --cc=shuah@kernel.org \
    --cc=will@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