Received: by 2002:ab2:69cc:0:b0:1f4:be93:e15a with SMTP id n12csp1779273lqp; Mon, 15 Apr 2024 18:11:26 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWWzJlBciEVKhBIprtOKDeeDOlpZ+7ll3bNzjvogZpnawXvz+dv5rGCFg7AqiYkaFaWRhDrddrbjE6c2v145Nowa40JFRQVfTBhBlv+kA== X-Google-Smtp-Source: AGHT+IHY6etopiO5C6/NY21NsS8C8jYNcY07p35OpuHvGrxR6y8tJOIBBBxbKwMzGSH2IE4z1Xyl X-Received: by 2002:a05:620a:1372:b0:78d:73d4:435b with SMTP id d18-20020a05620a137200b0078d73d4435bmr11909512qkl.32.1713229886439; Mon, 15 Apr 2024 18:11:26 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713229886; cv=pass; d=google.com; s=arc-20160816; b=pC1KabAydGARdxNjjVE0LeF87NSIAAk2H7PVLEMPk7J95EGZZwx3pjedFSrT+Qf4nH CV9vFnx6Yh3FdIDtF+UrJHyypcIx/bGHzneok+SddEBwdnI+i2bTEp4G7cxZdLzCruTQ xRA32uJllx5/Zfn28TS5KvooPYktiaHWaO4pHiMLQ+99yX8r1DBALx7XDPZS3pHRItk6 +cFsdOSf3HaVpCHsXa7bac4i2B63i09QkAZFOUtM4e2EOYAWK+G9Fl5kg6eeHe1xy7JD KMWsqHmhDFuyslMIlzmgEwJ+ilKnEdyYmbmE2d3Q24bp/KX7epuEYajJ0gta/2xzvbps IVAw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=6vzyn21Yvsf91uCotryrtUtNtD1ulA2lMPCtNFDbJYU=; fh=eVY06L/C5FDTmF2RNqfudsnjwkB3tbhT/y33cGhZc0I=; b=mLuVt8wjkKoyEUkHHHO3xEY3GnEmK3adZO+AyZZ2p+cgxkT3HamA4TkZ1YfbUwOvgn +TkxQlfVDw+F8TLIXvtvWzWaqcvD2cWbmU1X0f0RZNN8lL8pDyT7ekFEJCaZnkIkMWbA RjEgYXzL+smfJf1F+aSNl+VYugIN8c+Swh6ER2gFHK8ZalaNXpnrFuj/IA5ALsmtMzYP iny3yAtGCXJGGIuJaJN6LuPEuopnnLhTnJLta8ly/Nsk5Y4OJPPNlwYSII1fP7eZP/8J /lVQwENoG7wAU+oqFZYi5N+9Ko5fdjfsNsVhMr4sUKkJUFHvTEt4AYZ1E8uRtcWVfr4u APyQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@codeweavers.com header.s=s1 header.b=URB5RtZ5; arc=pass (i=1 spf=pass spfdomain=codeweavers.com dkim=pass dkdomain=codeweavers.com dmarc=pass fromdomain=codeweavers.com); spf=pass (google.com: domain of linux-kernel+bounces-146058-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-146058-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=codeweavers.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id vw18-20020a05620a565200b0078d61cefbaesi11626103qkn.441.2024.04.15.18.11.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 18:11:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-146058-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@codeweavers.com header.s=s1 header.b=URB5RtZ5; arc=pass (i=1 spf=pass spfdomain=codeweavers.com dkim=pass dkdomain=codeweavers.com dmarc=pass fromdomain=codeweavers.com); spf=pass (google.com: domain of linux-kernel+bounces-146058-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-146058-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=codeweavers.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 191031C20CA0 for ; Tue, 16 Apr 2024 01:11:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A9F3121342; Tue, 16 Apr 2024 01:10:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=codeweavers.com header.i=@codeweavers.com header.b="URB5RtZ5" Received: from mail.codeweavers.com (mail.codeweavers.com [4.36.192.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFFD04C7E; Tue, 16 Apr 2024 01:10:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=4.36.192.163 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713229830; cv=none; b=aSJrzrd40HOtE1Bv+vTtuYLtawT7+tGZnhIQYa8WhD/M36zG17pff8Wz6p+coixqw66Zv+y+rJ6nXwTYDa33RQYUZDEeKdDUdOkdAa0HEXkhjzn5YhLHlPDjmSfw47vB1ifqpeb1wQMQWawojLhuPFLMnjUiiLGOQAj+B7hSKEo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713229830; c=relaxed/simple; bh=eaBYY3vipGlHits3xyZ/UNe7G4SCN98gS9e1fNOpl54=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AC0dZOz+2mDy1X6ApH8FYX+PNpWHv9vS6nR96pz/I/Zi2zuF+exIExCyNtrIIYJ1Cr8xmBwI/J+TebBS+rchEzF5bZxa1InDTXfoG6wxLiIZiw6hvwl/zJWVxM+G7ISEegEENRvdPawmWIfHahaggkztGTddNttLdyChsHKEuo0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeweavers.com; spf=pass smtp.mailfrom=codeweavers.com; dkim=pass (2048-bit key) header.d=codeweavers.com header.i=@codeweavers.com header.b=URB5RtZ5; arc=none smtp.client-ip=4.36.192.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeweavers.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=codeweavers.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=codeweavers.com; s=s1; h=Message-ID:Date:Subject:Cc:To:From:Sender; bh=6vzyn21Yvsf91uCotryrtUtNtD1ulA2lMPCtNFDbJYU=; b=URB5RtZ573yao/Fe+OtHgo7fXF lEsyjModPxxHZUCluDp1bFvf6VUAmcSO+ugIyfXQJSu2FTu+bT6TQMhieL2IvmVAh34rkii1QDf9I Pe/6EZ6mDsVJ6Lk6trQkB2ODFZRkdEulyQHqCmP+LIN3p4vMGMPVLZNlXDGVFWz0k2LRexUAugCA1 C0GOuPcVJ5sjW0E8VgZFGrCTeEECj47OArIrWEGUjUmMJgJysBEcen2GcPhcAW7gpRUcfFQz33BoP p1tWyiAlRB8z819wjt2A4oyXTkarcIXzhky8KZnf5C6nRFkxpnPtMqIGrJQ8irglRrsHkgruRXXib 6m9+mAQg==; Received: from cw137ip160.mn.codeweavers.com ([10.69.137.160] helo=camazotz.mn.codeweavers.com) by mail.codeweavers.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rwXKy-00FbQv-2H; Mon, 15 Apr 2024 20:10:16 -0500 From: Elizabeth Figura To: Arnd Bergmann , Greg Kroah-Hartman , Jonathan Corbet , Shuah Khan Cc: linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, wine-devel@winehq.org, =?UTF-8?q?Andr=C3=A9=20Almeida?= , Wolfram Sang , Arkadiusz Hiler , Peter Zijlstra , Andy Lutomirski , linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, Randy Dunlap , Ingo Molnar , Will Deacon , Waiman Long , Boqun Feng , Elizabeth Figura Subject: [PATCH v4 03/27] ntsync: Introduce NTSYNC_IOC_CREATE_MUTEX. Date: Mon, 15 Apr 2024 20:08:13 -0500 Message-ID: <20240416010837.333694-4-zfigura@codeweavers.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240416010837.333694-1-zfigura@codeweavers.com> References: <20240416010837.333694-1-zfigura@codeweavers.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This corresponds to the NT syscall NtCreateMutant(). An NT mutex is recursive, with a 32-bit recursion counter. When acquired via NtWaitForMultipleObjects(), the recursion counter is incremented by one. The OS records the thread which acquired it. However, in order to keep this driver self-contained, the owning thread ID is managed by user-space, and passed as a parameter to all relevant ioctls. The initial owner and recursion count, if any, are specified when the mutex is created. Signed-off-by: Elizabeth Figura --- drivers/misc/ntsync.c | 68 +++++++++++++++++++++++++++++++++++++ include/uapi/linux/ntsync.h | 7 ++++ 2 files changed, 75 insertions(+) diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c index e914d626465a..173513aeeacc 100644 --- a/drivers/misc/ntsync.c +++ b/drivers/misc/ntsync.c @@ -24,6 +24,7 @@ enum ntsync_type { NTSYNC_TYPE_SEM, + NTSYNC_TYPE_MUTEX, }; /* @@ -53,6 +54,10 @@ struct ntsync_obj { __u32 count; __u32 max; } sem; + struct { + __u32 count; + __u32 owner; + } mutex; } u; /* @@ -132,6 +137,10 @@ static bool is_signaled(struct ntsync_obj *obj, __u32 owner) switch (obj->type) { case NTSYNC_TYPE_SEM: return !!obj->u.sem.count; + case NTSYNC_TYPE_MUTEX: + if (obj->u.mutex.owner && obj->u.mutex.owner != owner) + return false; + return obj->u.mutex.count < UINT_MAX; } WARN(1, "bad object type %#x\n", obj->type); @@ -175,6 +184,10 @@ static void try_wake_all(struct ntsync_device *dev, struct ntsync_q *q, case NTSYNC_TYPE_SEM: obj->u.sem.count--; break; + case NTSYNC_TYPE_MUTEX: + obj->u.mutex.count++; + obj->u.mutex.owner = q->owner; + break; } } wake_up_process(q->task); @@ -217,6 +230,29 @@ static void try_wake_any_sem(struct ntsync_obj *sem) } } +static void try_wake_any_mutex(struct ntsync_obj *mutex) +{ + struct ntsync_q_entry *entry; + + lockdep_assert_held(&mutex->lock); + + list_for_each_entry(entry, &mutex->any_waiters, node) { + struct ntsync_q *q = entry->q; + int signaled = -1; + + if (mutex->u.mutex.count == UINT_MAX) + break; + if (mutex->u.mutex.owner && mutex->u.mutex.owner != q->owner) + continue; + + if (atomic_try_cmpxchg(&q->signaled, &signaled, entry->index)) { + mutex->u.mutex.count++; + mutex->u.mutex.owner = q->owner; + wake_up_process(q->task); + } + } +} + /* * Actually change the semaphore state, returning -EOVERFLOW if it is made * invalid. @@ -376,6 +412,33 @@ static int ntsync_create_sem(struct ntsync_device *dev, void __user *argp) return put_user(fd, &user_args->sem); } +static int ntsync_create_mutex(struct ntsync_device *dev, void __user *argp) +{ + struct ntsync_mutex_args __user *user_args = argp; + struct ntsync_mutex_args args; + struct ntsync_obj *mutex; + int fd; + + if (copy_from_user(&args, argp, sizeof(args))) + return -EFAULT; + + if (!args.owner != !args.count) + return -EINVAL; + + mutex = ntsync_alloc_obj(dev, NTSYNC_TYPE_MUTEX); + if (!mutex) + return -ENOMEM; + mutex->u.mutex.count = args.count; + mutex->u.mutex.owner = args.owner; + fd = ntsync_obj_get_fd(mutex); + if (fd < 0) { + kfree(mutex); + return fd; + } + + return put_user(fd, &user_args->mutex); +} + static struct ntsync_obj *get_obj(struct ntsync_device *dev, int fd) { struct file *file = fget(fd); @@ -505,6 +568,9 @@ static void try_wake_any_obj(struct ntsync_obj *obj) case NTSYNC_TYPE_SEM: try_wake_any_sem(obj); break; + case NTSYNC_TYPE_MUTEX: + try_wake_any_mutex(obj); + break; } } @@ -693,6 +759,8 @@ static long ntsync_char_ioctl(struct file *file, unsigned int cmd, void __user *argp = (void __user *)parm; switch (cmd) { + case NTSYNC_IOC_CREATE_MUTEX: + return ntsync_create_mutex(dev, argp); case NTSYNC_IOC_CREATE_SEM: return ntsync_create_sem(dev, argp); case NTSYNC_IOC_WAIT_ALL: diff --git a/include/uapi/linux/ntsync.h b/include/uapi/linux/ntsync.h index 83784d4438a1..cd7841cdba49 100644 --- a/include/uapi/linux/ntsync.h +++ b/include/uapi/linux/ntsync.h @@ -16,6 +16,12 @@ struct ntsync_sem_args { __u32 max; }; +struct ntsync_mutex_args { + __u32 mutex; + __u32 owner; + __u32 count; +}; + #define NTSYNC_WAIT_REALTIME 0x1 struct ntsync_wait_args { @@ -34,6 +40,7 @@ struct ntsync_wait_args { #define NTSYNC_IOC_CREATE_SEM _IOWR('N', 0x80, struct ntsync_sem_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_SEM_POST _IOWR('N', 0x81, __u32) -- 2.43.0