From: Dylan Yudaken <dylany@fb.com>
To: Jens Axboe <axboe@kernel.dk>,
Pavel Begunkov <asml.silence@gmail.com>,
<io-uring@vger.kernel.org>
Cc: <Kernel-team@fb.com>, <linux-kernel@vger.kernel.org>,
Dylan Yudaken <dylany@fb.com>,
Ammar Faizi <ammarfaizi2@gnuweeb.org>
Subject: [PATCH] io_uring: do not recycle buffer in READV
Date: Thu, 21 Jul 2022 06:13:25 -0700 [thread overview]
Message-ID: <20220721131325.624788-1-dylany@fb.com> (raw)
READV cannot recycle buffers as it would lose some of the data required to
reimport that buffer.
Reported-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
Fixes: b66e65f41426 ("io_uring: never call io_buffer_select() for a buffer re-select")
Signed-off-by: Dylan Yudaken <dylany@fb.com>
---
I think going forward we can probably re-enable recycling for READV, or perhaps stick
it in the opdef to make it a bit more general. However since it is late in the merge
cycle I thought the simplest approach is best.
Worth noting the initial discussed approach of stashing the data in `struct io_rw` would not
have worked as that struct is full already apparently.
Dylan
fs/io_uring.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index a01ea49f3017..b0180679584f 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1737,6 +1737,14 @@ static void io_kbuf_recycle(struct io_kiocb *req, unsigned issue_flags)
(req->flags & REQ_F_PARTIAL_IO))
return;
+ /*
+ * READV uses fields in `struct io_rw` (len/addr) to stash the selected
+ * buffer data. However if that buffer is recycled the original request
+ * data stored in addr is lost. Therefore forbid recycling for now.
+ */
+ if (req->opcode == IORING_OP_READV)
+ return;
+
/*
* We don't need to recycle for REQ_F_BUFFER_RING, we can just clear
* the flag and hence ensure that bl->head doesn't get incremented.
base-commit: ff6992735ade75aae3e35d16b17da1008d753d28
--
2.30.2
next reply other threads:[~2022-07-21 13:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-21 13:13 Dylan Yudaken [this message]
2022-07-21 14:31 ` 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=20220721131325.624788-1-dylany@fb.com \
--to=dylany@fb.com \
--cc=Kernel-team@fb.com \
--cc=ammarfaizi2@gnuweeb.org \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=io-uring@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®