IronPort-SDR: v6GZ6FFdNNnrpDLzvkE8BsDg/hGqGGFyDlOg5l4Q1MKncc9wFtyxvyFGUMnh/fDNhPKwziKcpM
 hZfpXzAUoaXLG+KM8+f3epEncsV0zEs0kypPtPt6x3X7HMa/WiO8c6FiLWfeDBcNaQrOAHkYG8
 rqdwdE4AdnlEgVM5uH4ih2iyReYM3f5AxUSrFt4d7zj3qPoPO1IesPCEazEbv51TAtmrSy7mFH
 XmghwhsdASjDADTyW8/2/OuLbQ7PdWQQDT6M3bEA/tHcClPAn1/yteTKsDYRw+FOUVViyfhMZ3
 qgBDeptJKZ8IV+nmFQyTApfE
IronPort-SDR: /0GBX0GSQRINOReKHZHAnOvLjR/K3y/LRW3L6OQ8QGrvnnnvdg96m9JW7/dAs4oBGcnj1SwSPo
 ivcmE+fOFuK9zKZT30PfVH8sTJkgbtb7MBeZ/Cp6Rj0HqoN727/WNSswPt9dbrOaEk8ahxe1F6
 zcC9GJIyT7Zr0U88o2G3PGVZQel4nRV9Zy1cWb2pVSwz2D61vmHfAXFfbbwTC2hkwnu2MZrPFo
 yI/WKHJUwA8NMXFzzD/b+peb/w4NeVOPNGhwz65UV1dpYd5Ye8bfaduddkTaIjlGs0DdNScQIZ
 Wgw=
WDCIronportException: Internal
From:   Alistair Francis <alistair.francis@opensource.wdc.com>
To:     linux-kernel@vger.kernel.org
Cc:     dave@stgolabs.net, dvhart@infradead.org, arnd@arndb.de,
        alistair23@gmail.com, namhyung@kernel.org, acme@kernel.org,
        jolsa@redhat.com, linux-perf-users@vger.kernel.org,
        alexander.shishkin@linux.intel.com, mark.rutland@arm.com,
        mingo@redhat.com, peterz@infradead.org, tglx@linutronix.de,
        Alistair Francis <alistair.francis@wdc.com>
Subject: [PATCH v5 5/6] uapi: futex: Add a futex waitv syscall
Date:   Fri, 10 Dec 2021 09:58:56 +1000
Message-Id: <20211209235857.423773-5-alistair.francis@opensource.wdc.com>
In-Reply-To: <20211209235857.423773-1-alistair.francis@opensource.wdc.com>
References: <20211209235857.423773-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>
---
 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.31.1