From: Jens Axboe <[email protected]>
To: [email protected], [email protected]
Cc: [email protected], [email protected], [email protected],
Jens Axboe <[email protected]>
Subject: [PATCH 5/7] futex: make futex_parse_waitv() available as a helper
Date: Tue, 11 Jul 2023 18:47:03 -0600 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
To make it more generically useful, augment it with allowing the caller
to pass in the wake handler and wake data. Convert the futex_waitv()
syscall, passing in the default handlers.
Since we now provide a way to pass in a wake handler and data, ensure we
use __futex_queue() to avoid having futex_queue() overwrite our wait
data.
Signed-off-by: Jens Axboe <[email protected]>
---
kernel/futex/futex.h | 5 +++++
kernel/futex/syscalls.c | 14 ++++++++++----
kernel/futex/waitwake.c | 3 ++-
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h
index 75dec2ec7469..ed5a7ccd2e99 100644
--- a/kernel/futex/futex.h
+++ b/kernel/futex/futex.h
@@ -284,6 +284,11 @@ struct futex_vector {
struct futex_q q;
};
+extern int futex_parse_waitv(struct futex_vector *futexv,
+ struct futex_waitv __user *uwaitv,
+ unsigned int nr_futexes, futex_wake_fn *wake,
+ void *wake_data);
+
extern int futex_wait_multiple(struct futex_vector *vs, unsigned int count,
struct hrtimer_sleeper *to);
diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c
index 75ca8c41cc94..8ac70bfb89fc 100644
--- a/kernel/futex/syscalls.c
+++ b/kernel/futex/syscalls.c
@@ -184,12 +184,15 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
* @futexv: Kernel side list of waiters to be filled
* @uwaitv: Userspace list to be parsed
* @nr_futexes: Length of futexv
+ * @wake: Wake to call when futex is woken
+ * @wake_data: Data for the wake handler
*
* Return: Error code on failure, 0 on success
*/
-static int futex_parse_waitv(struct futex_vector *futexv,
- struct futex_waitv __user *uwaitv,
- unsigned int nr_futexes)
+int futex_parse_waitv(struct futex_vector *futexv,
+ struct futex_waitv __user *uwaitv,
+ unsigned int nr_futexes, futex_wake_fn *wake,
+ void *wake_data)
{
struct futex_waitv aux;
unsigned int i;
@@ -208,6 +211,8 @@ static int futex_parse_waitv(struct futex_vector *futexv,
futexv[i].w.val = aux.val;
futexv[i].w.uaddr = aux.uaddr;
futexv[i].q = futex_q_init;
+ futexv[i].q.wake = wake;
+ futexv[i].q.wake_data = wake_data;
}
return 0;
@@ -284,7 +289,8 @@ SYSCALL_DEFINE5(futex_waitv, struct futex_waitv __user *, waiters,
goto destroy_timer;
}
- ret = futex_parse_waitv(futexv, waiters, nr_futexes);
+ ret = futex_parse_waitv(futexv, waiters, nr_futexes, futex_wake_mark,
+ NULL);
if (!ret)
ret = futex_wait_multiple(futexv, nr_futexes, timeout ? &to : NULL);
diff --git a/kernel/futex/waitwake.c b/kernel/futex/waitwake.c
index 3471af87cb7d..dfd02ca5ecfa 100644
--- a/kernel/futex/waitwake.c
+++ b/kernel/futex/waitwake.c
@@ -446,7 +446,8 @@ static int futex_wait_multiple_setup(struct futex_vector *vs, int count, int *wo
* next futex. Queue each futex at this moment so hb can
* be unlocked.
*/
- futex_queue(q, hb);
+ __futex_queue(q, hb);
+ spin_unlock(&hb->lock);
continue;
}
--
2.40.1
next prev parent reply other threads:[~2023-07-12 0:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-12 0:46 [PATCHSET 0/7] Add io_uring futex/futexv support Jens Axboe
2023-07-12 0:46 ` [PATCH 1/7] futex: abstract out futex_op_to_flags() helper Jens Axboe
2023-07-12 8:16 ` Peter Zijlstra
2023-07-12 14:59 ` Jens Axboe
2023-07-12 0:47 ` [PATCH 2/7] futex: factor out the futex wake handling Jens Axboe
2023-07-12 8:58 ` Peter Zijlstra
2023-07-12 15:02 ` Jens Axboe
2023-07-12 0:47 ` [PATCH 3/7] io_uring: add support for futex wake and wait Jens Axboe
2023-07-12 8:51 ` Peter Zijlstra
2023-07-12 15:05 ` Jens Axboe
2023-07-12 0:47 ` [PATCH 4/7] futex: add wake_data to struct futex_q Jens Axboe
2023-07-12 0:47 ` Jens Axboe [this message]
2023-07-12 9:25 ` [PATCH 5/7] futex: make futex_parse_waitv() available as a helper Peter Zijlstra
2023-07-12 15:06 ` Jens Axboe
2023-07-12 0:47 ` [PATCH 6/7] futex: make the vectored futex operations available Jens Axboe
2023-07-12 0:47 ` [PATCH 7/7] io_uring: add futex waitv Jens Axboe
2023-07-12 9:31 ` Peter Zijlstra
2023-07-12 15:10 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox