Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
IronPort-SDR: vGXVRuET5nPJyJHBCJmoE8wC+jFCqoIxLRpxW+FJRQqrB5j6rhJPCB5eUvFx07yz36MXJSIJOi
 jJSoMEHbd6ZULQErOmZ84XOugzLzArAr1217sZbT6MxFMDfdihVzSPYsRtuG//a5MmvoDUT35t
 NNOjm3VacT36wfcuxrh1xUsXkWEiNUqJrnjes8tV8CMB2875w8ryhQc8UuBwSt/0DZ500CT++L
 ha9SXdhXYFnBF2MSkY9IgQjq4jWu0uwrp6Tk2485i0KLg2fGVRw1I/Kj5LseaCbWbOogvzBg4+
 gCui2bO5/jaBns39ScFF7137
IronPort-SDR: 4a3jm/dhZFn5wMyUMAV1EyWsRjIEQNh/O2JDnqxF1dSwlcDKfQ7acN52XC+JsA2ujbA3HUxm5p
 oTLwlYwUaa6kIOBG6bnnLoOdMPznduPSOSUlwjQE5PefwnogLZM0j6ANBtPiT3IfNSKyXPOciy
 giQ9LLykY9cCp24zJkYFL7AF/cYAhMXl7sr5Z+caC8Z+LN93kHoKr0txHA17X237Cn1icogO8S
 I9ZRcLzDEj2BxJOlVzG+HE5gj+EUzEkrMTYQV11vTi8QjuLb825JbApiZ53i9O/A78iFs0c/RH
 XFQ=
WDCIronportException: Internal
From:   Alistair Francis <alistair.francis@opensource.wdc.com>
To:     linux-kernel@vger.kernel.org
Cc:     acme@kernel.org, dave@stgolabs.net,
        alexander.shishkin@linux.intel.com, tglx@linutronix.de,
        namhyung@kernel.org, jolsa@redhat.com,
        linux-perf-users@vger.kernel.org, acme@redhat.com,
        dvhart@infradead.org, mark.rutland@arm.com, peterz@infradead.org,
        arnd@arndb.de, alistair23@gmail.com,
        linux-riscv@lists.infradead.org, mingo@redhat.com,
        alistair.francis@wdc.com, atish.patra@wdc.com
Subject: [PATCH 5/6] uapi: futex: Add a futex waitv syscall
Date:   Fri, 28 Oct 2022 19:56:31 +1000
Message-Id: <20221028095632.1081262-6-alistair.francis@opensource.wdc.com>
In-Reply-To: <20221028095632.1081262-1-alistair.francis@opensource.wdc.com>
References: <20221028095632.1081262-1-alistair.francis@opensource.wdc.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

From: Alistair Francis <alistair.francis@wdc.com>

This commit adds a futex waitv syscall wrapper that is exposed to
userspace.

Neither the kernel or glibc currently expose a futex wrapper, so
userspace is left performing raw syscalls. As the futex_waitv syscall
always expects a 64-bit time_t this can be tricky for 32-bit systems to
get correct.

In order to avoid userspace incorrectly passing the wrong timeouts let's
expose a public helper function that ensures the kernel is passed the
correct timeout struct.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Message-Id: <20211209235857.423773-5-alistair.francis@opensource.wdc.com>
---
 include/uapi/linux/futex_syscall.h | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/include/uapi/linux/futex_syscall.h b/include/uapi/linux/fute=
x_syscall.h
index bac621eb319c..f637f05a3be0 100644
--- a/include/uapi/linux/futex_syscall.h
+++ b/include/uapi/linux/futex_syscall.h
@@ -89,4 +89,31 @@ __kernel_futex_syscall_nr_requeue(volatile uint32_t *u=
addr, int op, uint32_t val
 	return -1;
 }
=20
+/**
+ * __kernel_futex_syscall_waitv - Wait at multiple futexes, wake on any
+ * @waiters:    Array of waiters
+ * @nr_waiters: Length of waiters array
+ * @flags: Operation flags
+ * @timo:  Optional timeout for operation
+ */
+static inline int
+__kernel_futex_syscall_waitv(volatile struct futex_waitv *waiters, unsig=
ned long nr_waiters,
+			      unsigned long flags, struct timespec *timo, clockid_t clockid)
+{
+	/* futex_waitv expects a 64-bit time_t */
+	if (sizeof(*timo) =3D=3D sizeof(struct __kernel_timespec))
+		return syscall(__NR_futex_waitv, waiters, nr_waiters, flags, timo, clo=
ckid);
+
+	/* If the caller supplied a 32-bit time_t, convert it to 64-bit */
+	if (timo) {
+		struct __kernel_timespec ts_new;
+
+		ts_new.tv_sec =3D timo->tv_sec;
+		ts_new.tv_nsec =3D timo->tv_nsec;
+
+		return syscall(__NR_futex_waitv, waiters, nr_waiters, flags, &ts_new, =
clockid);
+	} else
+		return syscall(__NR_futex_waitv, waiters, nr_waiters, flags, NULL, clo=
ckid);
+}
+
 #endif /* _UAPI_LINUX_FUTEX_SYSCALL_H */
--=20
2.37.3