From nobody Sat Dec 28 04:51:59 2024 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 1388F198A01; Mon, 9 Dec 2024 19:02:45 +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=1733770967; cv=none; b=DpHkJ9UanNSJJVVpnMVPaHHtY2sKx+1Cd+57eZxnZnIju+HdFFOFjfvfmjHYEjG7p/X18yXgGnahjtPFp+YfgAcJGmpfpvSSgpTkTrvGt36zNBJCl+AKvqCuMSYjJ150cimUkqPEtVrBH2di22Hfd5RISGO/AQxhHS+IOhii8JU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733770967; c=relaxed/simple; bh=FgTY7nxPHkuJZbZmF6H5JuXpcsqITCJKU1p81BIiHrg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D27taT5gadS/RYTJsid//43jYl/jkkwvVC2sxume8ZpVqCsNnxzoSckSCTX9yoizaVtLaf7zHPhkZpZ8q2uTpQnzhDEagVimfiRowTsH9UB2hA4zUoGX9CFkV2jWzRr3f88FPm2LLAH6BSQ8nkkU1oZCO9pxJz5AuHSxdHwQumg= 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=TvxC9Gok; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=codeweavers.com header.i=@codeweavers.com header.b="TvxC9Gok" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=codeweavers.com; s=s1; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=rp1DMYnShgGY5Fv/LvCHbD/s0NdGN0Yj6LvMiGhl8B0=; b=TvxC9GokwwLIVFtnQN+wo56PFd rIKBW8lPkUOfx2lielCF7aRXsIu4GZNlD81s1g9QnxAPH2wwARxR4Z2jAa4hANVjzqrcYdyKN6Wsi gF5Tjy+JyfOhHopqo0bN+FsTTTzS9UBoPF+DXtKs8JkWEf45KEQqRmfgUDYZvR8YQR4jr/E+SKZeM gww1HwYOYXBUdfmkH1cgBHzM+Sd0KYTkD5/dTndlRoJZ0My53qWjioQd+XC8arlICNQC2+ip7Ariy QBjy4xpDHndpWB/5WBVR9PJig9rTqOW2XZEUpPk2+B0G7N4R3RD6VlpmLUj3+mrwSQxwrqXrBjjwa zOS/507g==; 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 1tKiyb-001Gd5-1A; Mon, 09 Dec 2024 12:59:25 -0600 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 v6 13/28] ntsync: Introduce alertable waits. Date: Mon, 9 Dec 2024 12:58:49 -0600 Message-ID: <20241209185904.507350-14-zfigura@codeweavers.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241209185904.507350-1-zfigura@codeweavers.com> References: <20241209185904.507350-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: quoted-printable Content-Type: text/plain; charset="utf-8" NT waits can optionally be made "alertable". This is a special channel for thread wakeup that is mildly similar to SIGIO. A thread has an internal sin= gle bit of "alerted" state, and if a thread is alerted while an alertable wait,= the wait will return a special value, consume the "alerted" state, and will not consume any of its objects. Alerts are implemented using events; the user-space NT emulator is expected= to create an internal ntsync event for each thread and pass that event to wait functions. Signed-off-by: Elizabeth Figura --- drivers/misc/ntsync.c | 70 ++++++++++++++++++++++++++++++++----- include/uapi/linux/ntsync.h | 3 +- 2 files changed, 63 insertions(+), 10 deletions(-) diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c index 5a5ee7b6ee92..3fac06270549 100644 --- a/drivers/misc/ntsync.c +++ b/drivers/misc/ntsync.c @@ -884,22 +884,29 @@ static int setup_wait(struct ntsync_device *dev, const struct ntsync_wait_args *args, bool all, struct ntsync_q **ret_q) { + int fds[NTSYNC_MAX_WAIT_COUNT + 1]; const __u32 count =3D args->count; - int fds[NTSYNC_MAX_WAIT_COUNT]; struct ntsync_q *q; + __u32 total_count; __u32 i, j; =20 - if (args->pad[0] || args->pad[1] || (args->flags & ~NTSYNC_WAIT_REALTIME)) + if (args->pad || (args->flags & ~NTSYNC_WAIT_REALTIME)) return -EINVAL; =20 if (args->count > NTSYNC_MAX_WAIT_COUNT) return -EINVAL; =20 + total_count =3D count; + if (args->alert) + total_count++; + if (copy_from_user(fds, u64_to_user_ptr(args->objs), array_size(count, sizeof(*fds)))) return -EFAULT; + if (args->alert) + fds[count] =3D args->alert; =20 - q =3D kmalloc(struct_size(q, entries, count), GFP_KERNEL); + q =3D kmalloc(struct_size(q, entries, total_count), GFP_KERNEL); if (!q) return -ENOMEM; q->task =3D current; @@ -909,7 +916,7 @@ static int setup_wait(struct ntsync_device *dev, q->ownerdead =3D false; q->count =3D count; =20 - for (i =3D 0; i < count; i++) { + for (i =3D 0; i < total_count; i++) { struct ntsync_q_entry *entry =3D &q->entries[i]; struct ntsync_obj *obj =3D get_obj(dev, fds[i]); =20 @@ -959,10 +966,10 @@ static void try_wake_any_obj(struct ntsync_obj *obj) static int ntsync_wait_any(struct ntsync_device *dev, void __user *argp) { struct ntsync_wait_args args; + __u32 i, total_count; struct ntsync_q *q; int signaled; bool all; - __u32 i; int ret; =20 if (copy_from_user(&args, argp, sizeof(args))) @@ -972,9 +979,13 @@ static int ntsync_wait_any(struct ntsync_device *dev, = void __user *argp) if (ret < 0) return ret; =20 + total_count =3D args.count; + if (args.alert) + total_count++; + /* queue ourselves */ =20 - for (i =3D 0; i < args.count; i++) { + for (i =3D 0; i < total_count; i++) { struct ntsync_q_entry *entry =3D &q->entries[i]; struct ntsync_obj *obj =3D entry->obj; =20 @@ -983,9 +994,15 @@ static int ntsync_wait_any(struct ntsync_device *dev, = void __user *argp) ntsync_unlock_obj(dev, obj, all); } =20 - /* check if we are already signaled */ + /* + * Check if we are already signaled. + * + * Note that the API requires that normal objects are checked before + * the alert event. Hence we queue the alert event last, and check + * objects in order. + */ =20 - for (i =3D 0; i < args.count; i++) { + for (i =3D 0; i < total_count; i++) { struct ntsync_obj *obj =3D q->entries[i].obj; =20 if (atomic_read(&q->signaled) !=3D -1) @@ -1002,7 +1019,7 @@ static int ntsync_wait_any(struct ntsync_device *dev,= void __user *argp) =20 /* and finally, unqueue */ =20 - for (i =3D 0; i < args.count; i++) { + for (i =3D 0; i < total_count; i++) { struct ntsync_q_entry *entry =3D &q->entries[i]; struct ntsync_obj *obj =3D entry->obj; =20 @@ -1062,6 +1079,14 @@ static int ntsync_wait_all(struct ntsync_device *dev= , void __user *argp) */ list_add_tail(&entry->node, &obj->all_waiters); } + if (args.alert) { + struct ntsync_q_entry *entry =3D &q->entries[args.count]; + struct ntsync_obj *obj =3D entry->obj; + + dev_lock_obj(dev, obj); + list_add_tail(&entry->node, &obj->any_waiters); + dev_unlock_obj(dev, obj); + } =20 /* check if we are already signaled */ =20 @@ -1069,6 +1094,21 @@ static int ntsync_wait_all(struct ntsync_device *dev= , void __user *argp) =20 mutex_unlock(&dev->wait_all_lock); =20 + /* + * Check if the alert event is signaled, making sure to do so only + * after checking if the other objects are signaled. + */ + + if (args.alert) { + struct ntsync_obj *obj =3D q->entries[args.count].obj; + + if (atomic_read(&q->signaled) =3D=3D -1) { + bool all =3D ntsync_lock_obj(dev, obj); + try_wake_any_obj(obj); + ntsync_unlock_obj(dev, obj, all); + } + } + /* sleep */ =20 ret =3D ntsync_schedule(q, &args); @@ -1094,6 +1134,18 @@ static int ntsync_wait_all(struct ntsync_device *dev= , void __user *argp) =20 mutex_unlock(&dev->wait_all_lock); =20 + if (args.alert) { + struct ntsync_q_entry *entry =3D &q->entries[args.count]; + struct ntsync_obj *obj =3D entry->obj; + bool all; + + all =3D ntsync_lock_obj(dev, obj); + list_del(&entry->node); + ntsync_unlock_obj(dev, obj, all); + + put_obj(obj); + } + signaled =3D atomic_read(&q->signaled); if (signaled !=3D -1) { struct ntsync_wait_args __user *user_args =3D argp; diff --git a/include/uapi/linux/ntsync.h b/include/uapi/linux/ntsync.h index 74abeba832f7..4a8095a3fc34 100644 --- a/include/uapi/linux/ntsync.h +++ b/include/uapi/linux/ntsync.h @@ -37,7 +37,8 @@ struct ntsync_wait_args { __u32 index; __u32 flags; __u32 owner; - __u32 pad[2]; + __u32 alert; + __u32 pad; }; =20 #define NTSYNC_MAX_WAIT_COUNT 64 --=20 2.45.2