lkml.org 
[lkml]   [2021]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v4 5/6] uapi: futex: Add a futex waitv syscall
Date
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/futex_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 *uaddr, int op, uint32_t val
return -1;
}

+/**
+ * __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, unsigned long nr_waiters,
+ unsigned long flags, struct timespec *timo, clockid_t clockid)
+{
+ /* futex_waitv expects a 64-bit time_t */
+ if (sizeof(*timo) == sizeof(struct __kernel_timespec))
+ return syscall(__NR_futex_waitv, waiters, nr_waiters, flags, timo, clockid);
+
+ /* 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 = timo->tv_sec;
+ ts_new.tv_nsec = 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, clockid);
+}
+
#endif /* _UAPI_LINUX_FUTEX_SYSCALL_H */
--
2.31.1
\
 
 \ /
  Last update: 2021-12-02 12:18    [W:0.057 / U:4.492 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site