Received: by 2002:ab2:69cc:0:b0:1f4:be93:e15a with SMTP id n12csp1779820lqp; Mon, 15 Apr 2024 18:13:02 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVaZmB+tdRd+pgC63K10Ld84Z8iU2A+KdM8LEpXvfHYi/0+mYcQ7HsWnF7U8I44jx/dOMQX6iZgs9v51ABQEQEe17D3yzz00yEu6CtOoA== X-Google-Smtp-Source: AGHT+IHDV97ZnpDkYTKwefdlQ2r/HVg4wpFOJJuVhbMRbWJ924BPyK9RhN0mgCOdRlLWbKZ/M8yw X-Received: by 2002:a17:906:6a09:b0:a52:4cd0:2124 with SMTP id qw9-20020a1709066a0900b00a524cd02124mr597907ejc.7.1713229982460; Mon, 15 Apr 2024 18:13:02 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713229982; cv=pass; d=google.com; s=arc-20160816; b=Y4vPp+1nzZ8PZFp9hkDQOYCfrtqGXfbzu3unAudjdHP0bk10eD1f+bFa5t0bvWRqGv amteLWrG5sFX8uV336hs8T2QM0+mnxW2zPbGmXqI6n0kUMXDih/Cawt0U5MdMuHen6Fo MUyyfggUf2d7c37TcpvLhRNUNjfVMd6RhvXQUE6iQK4PEmxqVb689HihkfHF7/pHCaRV zWHQ2NiSzWv2NE6lmB2VTX1o1Ma2MRc/ovvR8zDofG0Wx8JAH8xGIViwFU1BVN5Awf/c 2vfrMy7fpQ8V2zDV8fAUyr9V4/8HITFHC+oj3/Q2/BGVaYeILL58sMXQrnAripdPBwW+ 5ieQ== 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=heeemJvwrhCJxAnq8AGmVdPeOZmh1g4TMNOtT+KYUp0=; fh=eVY06L/C5FDTmF2RNqfudsnjwkB3tbhT/y33cGhZc0I=; b=JxSb2rfBGHB+aQYjwjHUfrUXwmf3RB9Gtlv4KXJnxEq2iobEOmNYVFs+WJkmM6E3BE CGvg1UiQTrzKt6Z8vLm1N7RaSAfT2sw+I/XOgs9zjwdyVT+BAMh6y3C4Ixmwn6DvtvuZ 0u4KKhiSznUqS/bqUd/g1GpIYSk6fmrweIKX3mhH9bOumiBFhUdFFNyKJVjSJ7YuaMHq JLvYHJ8hZuNPVdwEWNyzf5vkPIYIGhyXF07F4e406pvlJS2irfZj01seNYKrBL9BzRBn hahyM1ENeIfPrUD6Jy5+cAOMaHrQAb3Tvoz+qAi2SlKePchgaxJwDGd5yALsjaJd5BjX Hg/g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@codeweavers.com header.s=s1 header.b=lZbwxiMJ; 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-146061-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-146061-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=codeweavers.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id ho19-20020a1709070e9300b00a51db71a11bsi5488111ejc.993.2024.04.15.18.13.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 18:13:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-146061-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@codeweavers.com header.s=s1 header.b=lZbwxiMJ; 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-146061-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-146061-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 2CE5C1F2185C for ; Tue, 16 Apr 2024 01:13:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4C89244C68; Tue, 16 Apr 2024 01:10:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=codeweavers.com header.i=@codeweavers.com header.b="lZbwxiMJ" 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 ADCDD1879; 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=1713229831; cv=none; b=tY+Xbx34W/0Ax+6thSK9vjJbG0dmAAu3Jqf2gtHzDQ5Uwyuydg0VZrqjPM/ljwaS8rotes6ooKL9zf30/NYYzXqGPIi0SZMWjHUOLhjDVBzpTL7+AS7DNBk/gi4wstkI/Stu0ER65ZhU8gKyNOMRIczkBopkA4f5/BruitSF+HI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713229831; c=relaxed/simple; bh=bmx/mjxmP+wxiumn+/Tiz1HBWW1Q3cStxbW7MoSrITg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ogqHzlwPjqSIO5smhaMY0OOvM1YN2lLdNgEVz20bTuD3HH+InK7kMSCehk7qe9WhdLG5PVPfykKaZtbhA/NZJf+wJaQqICi1Wj5fpX8jbnRRp86dnvEKvFDmxi6LVZUXMU1RHTDcqZ5eJMFZLpy3ac/3h8IhbSlTINrLvedH9ag= 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=lZbwxiMJ; 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=heeemJvwrhCJxAnq8AGmVdPeOZmh1g4TMNOtT+KYUp0=; b=lZbwxiMJr+L+97bmEGwqg2L6o5 ZQtzUbvPOhMraZKAY2MuVlkM9zsXXpZTTIUosoWHUTWFMagO0rrVGSPIeQ7uD5cgT/7IdQdEISOWL 2CuJs4r28ll5I8IizYBrc354YF6PfaRlcbNUlFfDN3yZiCgwYS58lu+D9j5D5L532jnODNTQLX6yE BvmDk0L39fWX60n/pICAvmx23MVFfhNM6wC13oPAGGIfRPFP49RpoJsl0bqQebbTscy8kK4x1p8zT uQqdZGe87SaQT1R/R+2DBr19ABonp6voDVxPJ9zS0tIhwQL2DRg52NuABxY17uk8ZWFfOSpsZZr/4 J5lqoggg==; 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 1rwXL0-00FbQv-2H; Mon, 15 Apr 2024 20:10:18 -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 11/27] ntsync: Introduce NTSYNC_IOC_MUTEX_READ. Date: Mon, 15 Apr 2024 20:08:21 -0500 Message-ID: <20240416010837.333694-12-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 NtQueryMutant(). This returns the recursion count, owner, and abandoned state of the mutex. Signed-off-by: Elizabeth Figura --- drivers/misc/ntsync.c | 23 +++++++++++++++++++++++ include/uapi/linux/ntsync.h | 1 + 2 files changed, 24 insertions(+) diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c index 961e8d241602..bd043dccc9fa 100644 --- a/drivers/misc/ntsync.c +++ b/drivers/misc/ntsync.c @@ -551,6 +551,27 @@ static int ntsync_sem_read(struct ntsync_obj *sem, void __user *argp) return 0; } +static int ntsync_mutex_read(struct ntsync_obj *mutex, void __user *argp) +{ + struct ntsync_mutex_args __user *user_args = argp; + struct ntsync_mutex_args args; + int ret; + + if (mutex->type != NTSYNC_TYPE_MUTEX) + return -EINVAL; + + args.mutex = 0; + spin_lock(&mutex->lock); + args.count = mutex->u.mutex.count; + args.owner = mutex->u.mutex.owner; + ret = mutex->u.mutex.ownerdead ? -EOWNERDEAD : 0; + spin_unlock(&mutex->lock); + + if (copy_to_user(user_args, &args, sizeof(args))) + return -EFAULT; + return ret; +} + static int ntsync_obj_release(struct inode *inode, struct file *file) { struct ntsync_obj *obj = file->private_data; @@ -576,6 +597,8 @@ static long ntsync_obj_ioctl(struct file *file, unsigned int cmd, return ntsync_mutex_unlock(obj, argp); case NTSYNC_IOC_MUTEX_KILL: return ntsync_mutex_kill(obj, argp); + case NTSYNC_IOC_MUTEX_READ: + return ntsync_mutex_read(obj, argp); case NTSYNC_IOC_EVENT_SET: return ntsync_event_set(obj, argp, false); case NTSYNC_IOC_EVENT_RESET: diff --git a/include/uapi/linux/ntsync.h b/include/uapi/linux/ntsync.h index e298400bf25a..797e8df10a3a 100644 --- a/include/uapi/linux/ntsync.h +++ b/include/uapi/linux/ntsync.h @@ -56,5 +56,6 @@ struct ntsync_wait_args { #define NTSYNC_IOC_EVENT_RESET _IOR ('N', 0x89, __u32) #define NTSYNC_IOC_EVENT_PULSE _IOR ('N', 0x8a, __u32) #define NTSYNC_IOC_SEM_READ _IOR ('N', 0x8b, struct ntsync_sem_args) +#define NTSYNC_IOC_MUTEX_READ _IOR ('N', 0x8c, struct ntsync_mutex_args) #endif -- 2.43.0