From: Peter Zijlstra <[email protected]>
To: Jens Axboe <[email protected]>
Cc: [email protected], [email protected],
[email protected]
Subject: Re: [PATCH 06/10] io_uring: add support for futex wake and wait
Date: Tue, 25 Jul 2023 15:00:15 +0200 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
On Fri, Jul 21, 2023 at 09:29:14AM -0600, Jens Axboe wrote:
> FWIW, here's the io_uring incremental after that rebase. Update the
> liburing futex branch as well, updating the prep helpers to take 64 bit
> values for mask/val and also add the flags argument that was missing as
> well. Only other addition was adding those 4 new patches instead of the
> old 3 ones, and adding single patch that just moves FUTEX2_MASK to
> futex.h.
>
> All checks out fine, tests pass and it works.
>
>
> diff --git a/io_uring/futex.c b/io_uring/futex.c
> index 93df54dffaa0..4c9f2c841b98 100644
> --- a/io_uring/futex.c
> +++ b/io_uring/futex.c
> @@ -18,11 +18,11 @@ struct io_futex {
> u32 __user *uaddr;
> struct futex_waitv __user *uwaitv;
> };
> + unsigned long futex_val;
> + unsigned long futex_mask;
> unsigned long futexv_owned;
> + u32 futex_flags;
> + unsigned int futex_nr;
> };
>
> struct io_futex_data {
> @@ -171,15 +171,28 @@ bool io_futex_remove_all(struct io_ring_ctx *ctx, struct task_struct *task,
> int io_futex_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
> {
> struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex);
> + u32 flags;
>
> + if (unlikely(sqe->fd || sqe->buf_index || sqe->file_index))
> return -EINVAL;
>
> iof->uaddr = u64_to_user_ptr(READ_ONCE(sqe->addr));
> + iof->futex_val = READ_ONCE(sqe->addr2);
> + iof->futex_mask = READ_ONCE(sqe->addr3);
> + iof->futex_nr = READ_ONCE(sqe->len);
> + if (iof->futex_nr && req->opcode != IORING_OP_FUTEX_WAITV)
> + return -EINVAL;
> +
Hmm, would something like:
if (req->opcode == IORING_OP_FUTEX_WAITV) {
if (iof->futex_val && iof->futex_mask)
return -EINVAL;
/* sys_futex_waitv() doesn't take @flags as of yet */
if (iof->futex_flags)
return -EINVAL;
if (!iof->futex_nr)
return -EINVAL;
} else {
/* sys_futex_{wake,wait}() don't take @nr */
if (iof->futex_nr)
return -EINVAL;
/* both take @flags and @mask */
flags = READ_ONCE(sqe->futex_flags);
if (flags & ~FUTEX2_MASK)
return -EINVAL;
iof->futex_flags = futex2_to_flags(flags);
if (!futex_flags_valid(iof->futex_flags))
return -EINVAL;
if (!futex_validate_input(iof->futex_flags, iof->futex_mask))
return -EINVAL;
/* sys_futex_wait() takes @val */
if (req->iocode == IORING_OP_FUTEX_WAIT) {
if (!futex_validate_input(iof->futex_flags, iof->futex_val))
return -EINVAL;
} else {
if (iof->futex_val)
return -EINVAL;
}
}
work? The waitv thing is significantly different from the other two.
next prev parent reply other threads:[~2023-07-25 13:00 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-20 22:18 [PATCHSET v3 0/10] Add io_uring futex/futexv support Jens Axboe
2023-07-20 22:18 ` [PATCH 01/10] futex: Clarify FUTEX2 flags Jens Axboe
2023-07-20 22:18 ` [PATCH 02/10] futex: Extend the " Jens Axboe
2023-07-20 22:18 ` [PATCH 03/10] futex: Flag conversion Jens Axboe
2023-07-20 22:18 ` [PATCH 04/10] futex: factor out the futex wake handling Jens Axboe
2023-07-20 22:18 ` [PATCH 05/10] futex: abstract out a __futex_wake_mark() helper Jens Axboe
2023-07-20 22:18 ` [PATCH 06/10] io_uring: add support for futex wake and wait Jens Axboe
2023-07-21 11:30 ` Peter Zijlstra
2023-07-21 11:37 ` Peter Zijlstra
2023-07-21 14:43 ` Jens Axboe
2023-07-21 15:29 ` Jens Axboe
2023-07-25 13:00 ` Peter Zijlstra [this message]
2023-07-25 13:48 ` Jens Axboe
2023-07-25 13:57 ` Jens Axboe
2023-07-25 15:19 ` Peter Zijlstra
2023-07-25 20:42 ` Jens Axboe
2023-07-25 21:24 ` Jens Axboe
2023-07-25 14:06 ` Peter Zijlstra
2023-07-20 22:18 ` [PATCH 07/10] futex: add wake_data to struct futex_q Jens Axboe
2023-07-20 22:18 ` [PATCH 08/10] futex: make futex_parse_waitv() available as a helper Jens Axboe
2023-07-20 22:18 ` [PATCH 09/10] futex: make the vectored futex operations available Jens Axboe
2023-07-20 22:18 ` [PATCH 10/10] io_uring: add support for vectored futex waits 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 \
--in-reply-to=20230725130015.GI3765278@hirez.programming.kicks-ass.net \
[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