Received: by 2002:ab2:69cc:0:b0:1f4:be93:e15a with SMTP id n12csp1779830lqp; Mon, 15 Apr 2024 18:13:04 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWXfTFLF5sclwozNXQacqRSPEUdFIG/TYPqlzY24LQ66I5ANbydRxDaN0iUMfibnx2rSaM52zN/AwQQmhnKn8DcpQgBRwQFYX1FzEytaA== X-Google-Smtp-Source: AGHT+IFWfnUVsVi6xXQxuzd2fl6GKeupIDcEBaCBWuTAGAqIDEkRWV8yUx8dAEL6Pio+sYr5gBgS X-Received: by 2002:a05:620a:c50:b0:78e:ebcc:797d with SMTP id u16-20020a05620a0c5000b0078eebcc797dmr3511844qki.78.1713229984068; Mon, 15 Apr 2024 18:13:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713229984; cv=pass; d=google.com; s=arc-20160816; b=gsf6db/azTWyYLyQU/LOoSByO9flXRWwIl8+xCYnWKVizYXj0EPSC+QSvRs3fLJ3rp XiA8KKZDtc8ZCPiL0o63EUTxoAP1T9LsfCIBs5Tll5CNAY8e6/IGBWVPHStkrJw1J0Mu ur53hBxYZ4Mz63W4UNvsDx1Da0XQO9M26wNF04DSXmzZBFhdZqrC919urbDzUCwBm6rP JvwGGEyZBs1Ve5sbdel3uEx+5uhHkfBf7gvh+nCW6Fb544ucmMO5ttNmh8GShgfNGFC9 PqxgTW+cljvspsSVyYnawNJfdKGyFtxinTSIfzszW1AQicRT5Jl20ClKkffjJISp1eXY MZMg== 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=xoCW3VfT0NsdMSW0YV9u0WiyZ8B+glBSEOsX8z5MC4I=; fh=eVY06L/C5FDTmF2RNqfudsnjwkB3tbhT/y33cGhZc0I=; b=aa7fp8/PMGl8PDhV3YQ0VSyKUSuDvC8xp+e0YtYhCcNKhjgInW+8nK0pF2Rl3WfH6y cxs4aiOzCaM1kQl5QwTQCpK+xO9zycgSO96Wa9dSpDGi9iINrt4BB0M3WpaYLPBXP8du o7df5j2av4nMhm6HxTDAEGCVGsMaluWZ9ztvL0C6l+thZ3/KkIXoj0N+8AZDQ2DctrIP mjlFVL+wwEmOzgsLSOoIikYeRTh+oZKeIYL4iUSTDG/o8gMiK9JsPag1SHqYZ1uith5N D7NTBOAaVVNDb5j5B7w736y0lGqah4CPM9a0D8zbNqEWvr6CCc04U2TRH4evcitKI+V1 Ds5A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@codeweavers.com header.s=s1 header.b=fMgloozO; 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-146064-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-146064-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. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id o9-20020a05620a228900b00787b85281e7si10758278qkh.714.2024.04.15.18.13.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 18:13:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-146064-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@codeweavers.com header.s=s1 header.b=fMgloozO; 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-146064-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-146064-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 C19111C210C3 for ; Tue, 16 Apr 2024 01:13:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 61C234500E; 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="fMgloozO" 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 BEC447464; 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=ahKwtDCF9xjoB7art8m9zeDts8werqAJWbC1YQf35ssO3KYtyH8xNSv70cz+SweQmkDHUOvyiK1c1OdPQJl+BaiSEpPqumtw+utdudcFzaYUUQYNtQOFwgsyWjPrjs6lnPj0M1OfIV2NT+sWl0ZLYvkJG0C3KGa/MY61X+MA0D0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713229831; c=relaxed/simple; bh=UN9Nfe2JCeuY40Ye1bxTcEPn0D03/ofONdhjgUU8g/w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MdKdEbnu1Jyt1PjauGF9g8bktujEWFgkHtPpWU7WWV2kMTKm+TnTMrwpFjdK78vmlltQk5m9yAlsw3ajxATUfvFVvrYIAl1OvVxZvq6Hs4HfHf9NdHzvn6nDUzo1vn7rxIQRrPBDzzqLAgMtJiT5TVEXX6nrE1jComU0CuKmC4U= 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=fMgloozO; 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=xoCW3VfT0NsdMSW0YV9u0WiyZ8B+glBSEOsX8z5MC4I=; b=fMgloozO4wX0dCOU4Xst8BwqlD YrIk1l6lRTB91LdX/oJhDLBSJY+i41IU9xxLi8SopOQl/CmvloMOwAPebHY5rzi8CoAy7cb3b7UVs 55pGbmmAm4bIym5s9FlXxAnMX8MU8Bpz4ygpWkoXTWAWogl6Y2KXrxNqHzV5TPfSpy9jSyvSptJ1j qA7vJpapk+SVvEyD/Jm2KEVUAGQstJUErOeWrmfVwWm63hGN+jVVk57KpWBVHNzzgzXf11lfg8nVh VG9iWIBmvSKnNdSw44RVgDE0mQr/5hkRozz/CFfnDcLTKtXQbpojuYNY2Fo7YetCQRTH5jauTEXC0 PyaMcnJw==; 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-1o; 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 10/27] ntsync: Introduce NTSYNC_IOC_SEM_READ. Date: Mon, 15 Apr 2024 20:08:20 -0500 Message-ID: <20240416010837.333694-11-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 NtQuerySemaphore(). This returns the current count and maximum count of the semaphore. Signed-off-by: Elizabeth Figura --- drivers/misc/ntsync.c | 21 +++++++++++++++++++++ include/uapi/linux/ntsync.h | 1 + 2 files changed, 22 insertions(+) diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c index adba4657bf26..961e8d241602 100644 --- a/drivers/misc/ntsync.c +++ b/drivers/misc/ntsync.c @@ -532,6 +532,25 @@ static int ntsync_event_reset(struct ntsync_obj *event, void __user *argp) return 0; } +static int ntsync_sem_read(struct ntsync_obj *sem, void __user *argp) +{ + struct ntsync_sem_args __user *user_args = argp; + struct ntsync_sem_args args; + + if (sem->type != NTSYNC_TYPE_SEM) + return -EINVAL; + + args.sem = 0; + spin_lock(&sem->lock); + args.count = sem->u.sem.count; + args.max = sem->u.sem.max; + spin_unlock(&sem->lock); + + if (copy_to_user(user_args, &args, sizeof(args))) + return -EFAULT; + return 0; +} + static int ntsync_obj_release(struct inode *inode, struct file *file) { struct ntsync_obj *obj = file->private_data; @@ -551,6 +570,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_SEM_READ: + return ntsync_sem_read(obj, argp); case NTSYNC_IOC_MUTEX_UNLOCK: return ntsync_mutex_unlock(obj, argp); case NTSYNC_IOC_MUTEX_KILL: diff --git a/include/uapi/linux/ntsync.h b/include/uapi/linux/ntsync.h index 57721f5d31ba..e298400bf25a 100644 --- a/include/uapi/linux/ntsync.h +++ b/include/uapi/linux/ntsync.h @@ -55,5 +55,6 @@ struct ntsync_wait_args { #define NTSYNC_IOC_EVENT_SET _IOR ('N', 0x88, __u32) #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) #endif -- 2.43.0