You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
483 lines
13 KiB
483 lines
13 KiB
# Calculate format=diff merge(sys-kernel/calculate-sources[fsync])!=
|
|
From 10b7488bd2e42b13f2c50b2051463726f041096b Mon Sep 17 00:00:00 2001
|
|
From: Piotr Gorski <lucjan.lucjanov@gmail.com>
|
|
Date: Tue, 29 Jun 2021 00:06:59 +0200
|
|
Subject: [PATCH] futex: resync from gitlab.collabora.com
|
|
|
|
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
|
|
---
|
|
include/uapi/linux/futex.h | 20 +++
|
|
kernel/futex.c | 351 ++++++++++++++++++++++++++++++++++++-
|
|
2 files changed, 370 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h
|
|
index a89eb0acc..a3e760886 100644
|
|
--- a/include/uapi/linux/futex.h
|
|
+++ b/include/uapi/linux/futex.h
|
|
@@ -21,6 +21,7 @@
|
|
#define FUTEX_WAKE_BITSET 10
|
|
#define FUTEX_WAIT_REQUEUE_PI 11
|
|
#define FUTEX_CMP_REQUEUE_PI 12
|
|
+#define FUTEX_WAIT_MULTIPLE 31
|
|
|
|
#define FUTEX_PRIVATE_FLAG 128
|
|
#define FUTEX_CLOCK_REALTIME 256
|
|
@@ -40,6 +41,8 @@
|
|
FUTEX_PRIVATE_FLAG)
|
|
#define FUTEX_CMP_REQUEUE_PI_PRIVATE (FUTEX_CMP_REQUEUE_PI | \
|
|
FUTEX_PRIVATE_FLAG)
|
|
+#define FUTEX_WAIT_MULTIPLE_PRIVATE (FUTEX_WAIT_MULTIPLE | \
|
|
+ FUTEX_PRIVATE_FLAG)
|
|
|
|
/*
|
|
* Support for robust futexes: the kernel cleans up held futexes at
|
|
@@ -150,4 +153,21 @@ struct robust_list_head {
|
|
(((op & 0xf) << 28) | ((cmp & 0xf) << 24) \
|
|
| ((oparg & 0xfff) << 12) | (cmparg & 0xfff))
|
|
|
|
+/*
|
|
+ * Maximum number of multiple futexes to wait for
|
|
+ */
|
|
+#define FUTEX_MULTIPLE_MAX_COUNT 128
|
|
+
|
|
+/**
|
|
+ * struct futex_wait_block - Block of futexes to be waited for
|
|
+ * @uaddr: User address of the futex
|
|
+ * @val: Futex value expected by userspace
|
|
+ * @bitset: Bitset for the optional bitmasked wakeup
|
|
+ */
|
|
+struct futex_wait_block {
|
|
+ __u32 __user *uaddr;
|
|
+ __u32 val;
|
|
+ __u32 bitset;
|
|
+};
|
|
+
|
|
#endif /* _UAPI_LINUX_FUTEX_H */
|
|
diff --git a/kernel/futex.c b/kernel/futex.c
|
|
index 408cad5e8..aa33e66df 100644
|
|
--- a/kernel/futex.c
|
|
+++ b/kernel/futex.c
|
|
@@ -197,6 +197,8 @@ struct futex_pi_state {
|
|
* @rt_waiter: rt_waiter storage for use with requeue_pi
|
|
* @requeue_pi_key: the requeue_pi target futex key
|
|
* @bitset: bitset for the optional bitmasked wakeup
|
|
+ * @uaddr: userspace address of futex
|
|
+ * @uval: expected futex's value
|
|
*
|
|
* We use this hashed waitqueue, instead of a normal wait_queue_entry_t, so
|
|
* we can wake only the relevant ones (hashed queues may be shared).
|
|
@@ -219,6 +221,8 @@ struct futex_q {
|
|
struct rt_mutex_waiter *rt_waiter;
|
|
union futex_key *requeue_pi_key;
|
|
u32 bitset;
|
|
+ u32 __user *uaddr;
|
|
+ u32 uval;
|
|
} __randomize_layout;
|
|
|
|
static const struct futex_q futex_q_init = {
|
|
@@ -2316,6 +2320,29 @@ static int unqueue_me(struct futex_q *q)
|
|
return ret;
|
|
}
|
|
|
|
+/**
|
|
+ * unqueue_multiple() - Remove several futexes from their futex_hash_bucket
|
|
+ * @q: The list of futexes to unqueue
|
|
+ * @count: Number of futexes in the list
|
|
+ *
|
|
+ * Helper to unqueue a list of futexes. This can't fail.
|
|
+ *
|
|
+ * Return:
|
|
+ * - >=0 - Index of the last futex that was awoken;
|
|
+ * - -1 - If no futex was awoken
|
|
+ */
|
|
+static int unqueue_multiple(struct futex_q *q, int count)
|
|
+{
|
|
+ int ret = -1;
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < count; i++) {
|
|
+ if (!unqueue_me(&q[i]))
|
|
+ ret = i;
|
|
+ }
|
|
+ return ret;
|
|
+}
|
|
+
|
|
/*
|
|
* PI futexes can not be requeued and must remove themself from the
|
|
* hash bucket. The hash bucket lock (i.e. lock_ptr) is held.
|
|
@@ -2679,6 +2706,205 @@ static int futex_wait_setup(u32 __user *uaddr, u32 val, unsigned int flags,
|
|
return ret;
|
|
}
|
|
|
|
+/**
|
|
+ * futex_wait_multiple_setup() - Prepare to wait and enqueue multiple futexes
|
|
+ * @qs: The corresponding futex list
|
|
+ * @count: The size of the lists
|
|
+ * @flags: Futex flags (FLAGS_SHARED, etc.)
|
|
+ * @awaken: Index of the last awoken futex
|
|
+ *
|
|
+ * Prepare multiple futexes in a single step and enqueue them. This may fail if
|
|
+ * the futex list is invalid or if any futex was already awoken. On success the
|
|
+ * task is ready to interruptible sleep.
|
|
+ *
|
|
+ * Return:
|
|
+ * - 1 - One of the futexes was awaken by another thread
|
|
+ * - 0 - Success
|
|
+ * - <0 - -EFAULT, -EWOULDBLOCK or -EINVAL
|
|
+ */
|
|
+static int futex_wait_multiple_setup(struct futex_q *qs, int count,
|
|
+ unsigned int flags, int *awaken)
|
|
+{
|
|
+ struct futex_hash_bucket *hb;
|
|
+ int ret, i;
|
|
+ u32 uval;
|
|
+
|
|
+ /*
|
|
+ * Enqueuing multiple futexes is tricky, because we need to
|
|
+ * enqueue each futex in the list before dealing with the next
|
|
+ * one to avoid deadlocking on the hash bucket. But, before
|
|
+ * enqueuing, we need to make sure that current->state is
|
|
+ * TASK_INTERRUPTIBLE, so we don't absorb any awake events, which
|
|
+ * cannot be done before the get_futex_key of the next key,
|
|
+ * because it calls get_user_pages, which can sleep. Thus, we
|
|
+ * fetch the list of futexes keys in two steps, by first pinning
|
|
+ * all the memory keys in the futex key, and only then we read
|
|
+ * each key and queue the corresponding futex.
|
|
+ */
|
|
+retry:
|
|
+ for (i = 0; i < count; i++) {
|
|
+ qs[i].key = FUTEX_KEY_INIT;
|
|
+ ret = get_futex_key(qs[i].uaddr, flags & FLAGS_SHARED,
|
|
+ &qs[i].key, FUTEX_READ);
|
|
+ if (unlikely(ret)) {
|
|
+ return ret;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ set_current_state(TASK_INTERRUPTIBLE);
|
|
+
|
|
+ for (i = 0; i < count; i++) {
|
|
+ struct futex_q *q = &qs[i];
|
|
+
|
|
+ hb = queue_lock(q);
|
|
+
|
|
+ ret = get_futex_value_locked(&uval, q->uaddr);
|
|
+ if (ret) {
|
|
+ /*
|
|
+ * We need to try to handle the fault, which
|
|
+ * cannot be done without sleep, so we need to
|
|
+ * undo all the work already done, to make sure
|
|
+ * we don't miss any wake ups. Therefore, clean
|
|
+ * up, handle the fault and retry from the
|
|
+ * beginning.
|
|
+ */
|
|
+ queue_unlock(hb);
|
|
+
|
|
+ /*
|
|
+ * Keys 0..(i-1) are implicitly put
|
|
+ * on unqueue_multiple.
|
|
+ */
|
|
+ *awaken = unqueue_multiple(qs, i);
|
|
+
|
|
+ __set_current_state(TASK_RUNNING);
|
|
+
|
|
+ /*
|
|
+ * On a real fault, prioritize the error even if
|
|
+ * some other futex was awoken. Userspace gave
|
|
+ * us a bad address, -EFAULT them.
|
|
+ */
|
|
+ ret = get_user(uval, q->uaddr);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ /*
|
|
+ * Even if the page fault was handled, If
|
|
+ * something was already awaken, we can safely
|
|
+ * give up and succeed to give a hint for userspace to
|
|
+ * acquire the right futex faster.
|
|
+ */
|
|
+ if (*awaken >= 0)
|
|
+ return 1;
|
|
+
|
|
+ goto retry;
|
|
+ }
|
|
+
|
|
+ if (uval != q->uval) {
|
|
+ queue_unlock(hb);
|
|
+
|
|
+ /*
|
|
+ * If something was already awaken, we can
|
|
+ * safely ignore the error and succeed.
|
|
+ */
|
|
+ *awaken = unqueue_multiple(qs, i);
|
|
+ __set_current_state(TASK_RUNNING);
|
|
+ if (*awaken >= 0)
|
|
+ return 1;
|
|
+
|
|
+ return -EWOULDBLOCK;
|
|
+ }
|
|
+
|
|
+ /*
|
|
+ * The bucket lock can't be held while dealing with the
|
|
+ * next futex. Queue each futex at this moment so hb can
|
|
+ * be unlocked.
|
|
+ */
|
|
+ queue_me(&qs[i], hb);
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+/**
|
|
+ * futex_wait_multiple() - Prepare to wait on and enqueue several futexes
|
|
+ * @qs: The list of futexes to wait on
|
|
+ * @op: Operation code from futex's syscall
|
|
+ * @count: The number of objects
|
|
+ * @abs_time: Timeout before giving up and returning to userspace
|
|
+ *
|
|
+ * Entry point for the FUTEX_WAIT_MULTIPLE futex operation, this function
|
|
+ * sleeps on a group of futexes and returns on the first futex that
|
|
+ * triggered, or after the timeout has elapsed.
|
|
+ *
|
|
+ * Return:
|
|
+ * - >=0 - Hint to the futex that was awoken
|
|
+ * - <0 - On error
|
|
+ */
|
|
+static int futex_wait_multiple(struct futex_q *qs, int op,
|
|
+ u32 count, ktime_t *abs_time)
|
|
+{
|
|
+ struct hrtimer_sleeper timeout, *to;
|
|
+ int ret, flags = 0, hint = 0;
|
|
+ unsigned int i;
|
|
+
|
|
+ if (!(op & FUTEX_PRIVATE_FLAG))
|
|
+ flags |= FLAGS_SHARED;
|
|
+
|
|
+ if (op & FUTEX_CLOCK_REALTIME)
|
|
+ flags |= FLAGS_CLOCKRT;
|
|
+
|
|
+ to = futex_setup_timer(abs_time, &timeout, flags, 0);
|
|
+ while (1) {
|
|
+ ret = futex_wait_multiple_setup(qs, count, flags, &hint);
|
|
+ if (ret) {
|
|
+ if (ret > 0) {
|
|
+ /* A futex was awaken during setup */
|
|
+ ret = hint;
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ if (to)
|
|
+ hrtimer_start_expires(&to->timer, HRTIMER_MODE_ABS);
|
|
+
|
|
+ /*
|
|
+ * Avoid sleeping if another thread already tried to
|
|
+ * wake us.
|
|
+ */
|
|
+ for (i = 0; i < count; i++) {
|
|
+ if (plist_node_empty(&qs[i].list))
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ if (i == count && (!to || to->task))
|
|
+ freezable_schedule();
|
|
+
|
|
+ ret = unqueue_multiple(qs, count);
|
|
+
|
|
+ __set_current_state(TASK_RUNNING);
|
|
+
|
|
+ if (ret >= 0)
|
|
+ break;
|
|
+ if (to && !to->task) {
|
|
+ ret = -ETIMEDOUT;
|
|
+ break;
|
|
+ } else if (signal_pending(current)) {
|
|
+ ret = -ERESTARTSYS;
|
|
+ break;
|
|
+ }
|
|
+ /*
|
|
+ * The final case is a spurious wakeup, for
|
|
+ * which just retry.
|
|
+ */
|
|
+ }
|
|
+
|
|
+ if (to) {
|
|
+ hrtimer_cancel(&to->timer);
|
|
+ destroy_hrtimer_on_stack(&to->timer);
|
|
+ }
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
static int futex_wait(u32 __user *uaddr, unsigned int flags, u32 val,
|
|
ktime_t *abs_time, u32 bitset)
|
|
{
|
|
@@ -3763,6 +3989,7 @@ static __always_inline bool futex_cmd_has_timeout(u32 cmd)
|
|
case FUTEX_LOCK_PI:
|
|
case FUTEX_WAIT_BITSET:
|
|
case FUTEX_WAIT_REQUEUE_PI:
|
|
+ case FUTEX_WAIT_MULTIPLE:
|
|
return true;
|
|
}
|
|
return false;
|
|
@@ -3775,13 +4002,51 @@ futex_init_timeout(u32 cmd, u32 op, struct timespec64 *ts, ktime_t *t)
|
|
return -EINVAL;
|
|
|
|
*t = timespec64_to_ktime(*ts);
|
|
- if (cmd == FUTEX_WAIT)
|
|
+ if (cmd == FUTEX_WAIT || cmd == FUTEX_WAIT_MULTIPLE)
|
|
*t = ktime_add_safe(ktime_get(), *t);
|
|
else if (cmd != FUTEX_LOCK_PI && !(op & FUTEX_CLOCK_REALTIME))
|
|
*t = timens_ktime_to_host(CLOCK_MONOTONIC, *t);
|
|
return 0;
|
|
}
|
|
|
|
+/**
|
|
+ * futex_read_wait_block - Read an array of futex_wait_block from userspace
|
|
+ * @uaddr: Userspace address of the block
|
|
+ * @count: Number of blocks to be read
|
|
+ *
|
|
+ * This function creates and allocate an array of futex_q (we zero it to
|
|
+ * initialize the fields) and then, for each futex_wait_block element from
|
|
+ * userspace, fill a futex_q element with proper values.
|
|
+ */
|
|
+inline struct futex_q *futex_read_wait_block(u32 __user *uaddr, u32 count)
|
|
+{
|
|
+ unsigned int i;
|
|
+ struct futex_q *qs;
|
|
+ struct futex_wait_block fwb;
|
|
+ struct futex_wait_block __user *entry =
|
|
+ (struct futex_wait_block __user *)uaddr;
|
|
+
|
|
+ if (!count || count > FUTEX_MULTIPLE_MAX_COUNT)
|
|
+ return ERR_PTR(-EINVAL);
|
|
+
|
|
+ qs = kcalloc(count, sizeof(*qs), GFP_KERNEL);
|
|
+ if (!qs)
|
|
+ return ERR_PTR(-ENOMEM);
|
|
+
|
|
+ for (i = 0; i < count; i++) {
|
|
+ if (copy_from_user(&fwb, &entry[i], sizeof(fwb))) {
|
|
+ kfree(qs);
|
|
+ return ERR_PTR(-EFAULT);
|
|
+ }
|
|
+
|
|
+ qs[i].uaddr = fwb.uaddr;
|
|
+ qs[i].uval = fwb.val;
|
|
+ qs[i].bitset = fwb.bitset;
|
|
+ }
|
|
+
|
|
+ return qs;
|
|
+}
|
|
+
|
|
SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
|
|
const struct __kernel_timespec __user *, utime,
|
|
u32 __user *, uaddr2, u32, val3)
|
|
@@ -3801,6 +4066,25 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
|
|
tp = &t;
|
|
}
|
|
|
|
+ if (cmd == FUTEX_WAIT_MULTIPLE) {
|
|
+ int ret;
|
|
+ struct futex_q *qs;
|
|
+
|
|
+#ifdef CONFIG_X86_X32
|
|
+ if (unlikely(in_x32_syscall()))
|
|
+ return -ENOSYS;
|
|
+#endif
|
|
+ qs = futex_read_wait_block(uaddr, val);
|
|
+
|
|
+ if (IS_ERR(qs))
|
|
+ return PTR_ERR(qs);
|
|
+
|
|
+ ret = futex_wait_multiple(qs, op, val, tp);
|
|
+ kfree(qs);
|
|
+
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
return do_futex(uaddr, op, val, tp, uaddr2, (unsigned long)utime, val3);
|
|
}
|
|
|
|
@@ -3963,6 +4247,58 @@ COMPAT_SYSCALL_DEFINE3(get_robust_list, int, pid,
|
|
#endif /* CONFIG_COMPAT */
|
|
|
|
#ifdef CONFIG_COMPAT_32BIT_TIME
|
|
+/**
|
|
+ * struct compat_futex_wait_block - Block of futexes to be waited for
|
|
+ * @uaddr: User address of the futex (compatible pointer)
|
|
+ * @val: Futex value expected by userspace
|
|
+ * @bitset: Bitset for the optional bitmasked wakeup
|
|
+ */
|
|
+struct compat_futex_wait_block {
|
|
+ compat_uptr_t uaddr;
|
|
+ __u32 pad;
|
|
+ __u32 val;
|
|
+ __u32 bitset;
|
|
+};
|
|
+
|
|
+/**
|
|
+ * compat_futex_read_wait_block - Read an array of futex_wait_block from
|
|
+ * userspace
|
|
+ * @uaddr: Userspace address of the block
|
|
+ * @count: Number of blocks to be read
|
|
+ *
|
|
+ * This function does the same as futex_read_wait_block(), except that it
|
|
+ * converts the pointer to the futex from the compat version to the regular one.
|
|
+ */
|
|
+inline struct futex_q *compat_futex_read_wait_block(u32 __user *uaddr,
|
|
+ u32 count)
|
|
+{
|
|
+ unsigned int i;
|
|
+ struct futex_q *qs;
|
|
+ struct compat_futex_wait_block fwb;
|
|
+ struct compat_futex_wait_block __user *entry =
|
|
+ (struct compat_futex_wait_block __user *)uaddr;
|
|
+
|
|
+ if (!count || count > FUTEX_MULTIPLE_MAX_COUNT)
|
|
+ return ERR_PTR(-EINVAL);
|
|
+
|
|
+ qs = kcalloc(count, sizeof(*qs), GFP_KERNEL);
|
|
+ if (!qs)
|
|
+ return ERR_PTR(-ENOMEM);
|
|
+
|
|
+ for (i = 0; i < count; i++) {
|
|
+ if (copy_from_user(&fwb, &entry[i], sizeof(fwb))) {
|
|
+ kfree(qs);
|
|
+ return ERR_PTR(-EFAULT);
|
|
+ }
|
|
+
|
|
+ qs[i].uaddr = compat_ptr(fwb.uaddr);
|
|
+ qs[i].uval = fwb.val;
|
|
+ qs[i].bitset = fwb.bitset;
|
|
+ }
|
|
+
|
|
+ return qs;
|
|
+}
|
|
+
|
|
SYSCALL_DEFINE6(futex_time32, u32 __user *, uaddr, int, op, u32, val,
|
|
const struct old_timespec32 __user *, utime, u32 __user *, uaddr2,
|
|
u32, val3)
|
|
@@ -3980,6 +4316,19 @@ SYSCALL_DEFINE6(futex_time32, u32 __user *, uaddr, int, op, u32, val,
|
|
tp = &t;
|
|
}
|
|
|
|
+ if (cmd == FUTEX_WAIT_MULTIPLE) {
|
|
+ int ret;
|
|
+ struct futex_q *qs = compat_futex_read_wait_block(uaddr, val);
|
|
+
|
|
+ if (IS_ERR(qs))
|
|
+ return PTR_ERR(qs);
|
|
+
|
|
+ ret = futex_wait_multiple(qs, op, val, tp);
|
|
+ kfree(qs);
|
|
+
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
return do_futex(uaddr, op, val, tp, uaddr2, (unsigned long)utime, val3);
|
|
}
|
|
#endif /* CONFIG_COMPAT_32BIT_TIME */
|
|
--
|
|
2.32.0.93.g670b81a890
|
|
|