IronPort-SDR: Cao0PXDQ1eOSXWrxeoL34g5WmkZSL3kA6vOy1VlZBx2y0nkyCPAau9AB3SThu6bK+uujA4uYQg
 LSoP+/DKuapUrq+MfVQoL6+Hx+Of/pnSElbyv98Ge3hl2EiQ/8YKNtlIqxGXcNrbi5JDu4zYP9
 +3Vo8ngaKu4BfpFCXSLIPtLWV/N4hnYig1egibxJ6s7hTvJ4pLcf54x89XulYItDUCpMAmaZwO
 sF4POGmJ7rkZHmRK79fvQsKigTWt6BiwBdL72sw19FTIGjYxOKhUUtBerkDgnRm0rboQQLfR9k
 inysgPly0KK1UbtbO2yS7x6C
IronPort-SDR: KlYU4/KsJ300hnvGkPbRwa0ezZJfpXGwF27k4bUl6Km9zLi935nEL0xrDkckSp0xG6B0qe9I/T
 2Zt+a/SwO426mLLRrAZZEAyTBuOhq/7DyOxyA0oNQtLDZcTSg4cxGkPguCPWLfKtfHALu1BpR8
 P7EOQiaq9oAm+dTHLJr69/Q+JSo4vCrHJEv+JmMZcw7EIXjvEOMkko5cX3hwHQgR9iDvOYNXu3
 NFDmoTIW/WX52yfFy4MkOzYuBvaSJ3GcmTFecqzvIO/LRLO8N0d+qDbN1AbftRnTkmbgSGtPLE
 DZI=
WDCIronportException: Internal
From:   Alistair Francis <alistair.francis@opensource.wdc.com>
To:     linux-kernel@vger.kernel.org
Cc:     tglx@linutronix.de, arnd@arndb.de, namhyung@kernel.org,
        peterz@infradead.org, alistair23@gmail.com, jolsa@redhat.com,
        dave@stgolabs.net, mingo@redhat.com, dvhart@infradead.org,
        acme@kernel.org, linux-perf-users@vger.kernel.org,
        mark.rutland@arm.com, alexander.shishkin@linux.intel.com,
        Alistair Francis <alistair.francis@wdc.com>
Subject: [PATCH v3 5/6] uapi: futex: Add a futex waitv syscall
Date:   Fri, 26 Nov 2021 16:00:23 +1000
Message-Id: <20211126060024.3290177-5-alistair.francis@opensource.wdc.com>
In-Reply-To: <20211126060024.3290177-1-alistair.francis@opensource.wdc.com>
References: <20211126060024.3290177-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>
---
 include/uapi/linux/futex_syscall.h | 32 +++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/include/uapi/linux/futex_syscall.h b/include/uapi/linux/fute=
x_syscall.h
index e0305c581142..98c550990833 100644
--- a/include/uapi/linux/futex_syscall.h
+++ b/include/uapi/linux/futex_syscall.h
@@ -9,12 +9,15 @@
 #ifndef _UAPI_LINUX_FUTEX_SYSCALL_H
 #define _UAPI_LINUX_FUTEX_SYSCALL_H
=20
-#include <asm/unistd.h>
+#include <unistd.h>
 #include <errno.h>
+#include <linux/futex.h>
 #include <linux/types.h>
 #include <linux/time_types.h>
 #include <stdint.h>
 #include <sys/syscall.h>
+#include <sys/types.h>
+#include <time.h>
=20
 /**
  * futex_syscall_timeout() - __NR_futex/__NR_futex_time64 syscall wrappe=
r
@@ -86,4 +89,31 @@ __kernel_futex_syscall_nr_requeue(volatile uint32_t *u=
addr, int op, uint32_t val
 	return -1;
 }
=20
+/**
+ * futex_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.31.1