From: Hao Xu <[email protected]>
To: Jens Axboe <[email protected]>, io-uring <[email protected]>
Cc: Pavel Begunkov <[email protected]>
Subject: Re: [PATCH v2] io_uring: commit non-pollable provided mapped buffers upfront
Date: Thu, 16 Jun 2022 21:13:25 +0800 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
On 6/16/22 20:34, Jens Axboe wrote:
> For recv/recvmsg, IO either completes immediately or gets queued for a
> retry. This isn't the case for read/readv, if eg a normal file or a block
> device is used. Here, an operation can get queued with the block layer.
> If this happens, ring mapped buffers must get committed immediately to
> avoid that the next read can consume the same buffer.
>
> Check if we're dealing with pollable file, when getting a new ring mapped
> provided buffer. If it's not, commit it immediately rather than wait post
> issue. If we don't wait, we can race with completions coming in, or just
> plain buffer reuse by committing after a retry where others could have
> grabbed the same buffer.
>
> Fixes: c7fb19428d67 ("io_uring: add support for ring mapped supplied buffers")
> Signed-off-by: Jens Axboe <[email protected]>
>
> ---
>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index 5d479428d8e5..b6e75f69c6b1 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -3836,7 +3836,7 @@ static void __user *io_ring_buffer_select(struct io_kiocb *req, size_t *len,
> req->buf_list = bl;
> req->buf_index = buf->bid;
>
> - if (issue_flags & IO_URING_F_UNLOCKED) {
> + if (issue_flags & IO_URING_F_UNLOCKED || !file_can_poll(req->file)) {
> /*
> * If we came in unlocked, we have no choice but to consume the
> * buffer here. This does mean it'll be pinned until the IO
>
Looks good,
Reviewed-by: Hao Xu <[email protected]>
prev parent reply other threads:[~2022-06-16 13:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-16 12:34 [PATCH v2] io_uring: commit non-pollable provided mapped buffers upfront Jens Axboe
2022-06-16 13:13 ` Hao Xu [this message]
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] \
/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