Skip to contentSkip to conversation

provided buffer recycling fixes

PATCH New Pavel Begunkov 1 participant 4 messages Feb 10, 2025 Stable branch

lore
Share & tools
lore

Pavel Begunkov

author
#0 lore raw

cover provided buffer recycling fixes

Fixes for the provided buffers for not allowing kbufs to cross a single execution section. Upstream had most of it already fixed by chance, which is why all 3 patches refer to a single upstream commit.

Pavel Begunkov (3):
io_uring: fix multishots with selected buffers
io_uring: fix io_req_prep_async with provided buffers io_uring/rw: commit provided buffer state on async

 io_uring/io_uring.c |  5 ++++-
 io_uring/poll.c     |  2 ++
 io_uring/rw.c       | 10 ++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)
Signature · 1 line
2.48.1
author
#2 lore raw

PATCH 2/3 io_uring: fix io_req_prep_async with provided buffers

[ upstream commit d63b0e8a628e62ca85a0f7915230186bb92f8bb4 ]

io_req_prep_async() can import provided buffers, commit the ring state by giving up on that before, it'll be reimported later if needed.

Reported-by Muhammad Ramdhan <[email protected]>
Reported-by Bing-Jhong Billy Jheng <[email protected]>
Reported-by Jacob Soo <[email protected]>
Fixes c7fb19428d67d ("io_uring: add support for ring mapped supplied buffers")
Signed-off-by Pavel Begunkov <[email protected]>
---
 io_uring/io_uring.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
io_uring/io_uring.c +4 -1
index 64502323be5e..33597284e1cb 100644
@@ -1624,6 +1624,7 @@ bool io_alloc_async_data(struct io_kiocb *req)
 int io_req_prep_async(struct io_kiocb *req)
 {
 	const struct io_op_def *def = &io_op_defs[req->opcode];
+	int ret;
 
 	/* assign early for deferred execution for non-fixed file */
 	if (def->needs_file && !(req->flags & REQ_F_FIXED_FILE) && !req->file)

@@ -1636,7 +1637,9 @@ int io_req_prep_async(struct io_kiocb *req)
 		if (io_alloc_async_data(req))
 			return -EAGAIN;
 	}
-	return def->prep_async(req);
+	ret = def->prep_async(req);
+	io_kbuf_recycle(req, 0);
+	return ret;
 }
 
 static u32 io_get_sequence(struct io_kiocb *req)
Signature · 1 line
2.48.1
author
#1 lore raw

PATCH 1/3 io_uring: fix multishots with selected buffers

In reply to Pavel Begunkov

[ upstream commit d63b0e8a628e62ca85a0f7915230186bb92f8bb4 ]

We do io_kbuf_recycle() when arming a poll but every iteration of a multishot can grab more buffers, which is why we need to flush the kbuf ring state before continuing with waiting.

Cc [email protected]
Fixes b3fdea6ecb55c ("io_uring: multishot recv")
Reported-by Muhammad Ramdhan <[email protected]>
Reported-by Bing-Jhong Billy Jheng <[email protected]>
Reported-by Jacob Soo <[email protected]>
Signed-off-by Pavel Begunkov <[email protected]>
Link https://lore.kernel.org/r/1bfc9990fe435f1fc6152ca9efeba5eb3e68339c.1738025570.git.asml.silence@gmail.com open here
Signed-off-by Jens Axboe <[email protected]>
---
 io_uring/poll.c | 2 ++
 1 file changed, 2 insertions(+)
io_uring/poll.c +2 -0
index a4084acaff91..ab27a627fd4c 100644
@@ -305,6 +305,8 @@ static int io_poll_check_events(struct io_kiocb *req, bool *locked)
 			}
 		} else {
 			int ret = io_poll_issue(req, locked);
+			io_kbuf_recycle(req, 0);
+
 			if (ret == IOU_STOP_MULTISHOT)
 				return IOU_POLL_REMOVE_POLL_USE_RES;
 			if (ret < 0)
Signature · 1 line
2.48.1
author
#3 lore raw

PATCH 3/3 io_uring/rw: commit provided buffer state on async

In reply to Pavel Begunkov

[ upstream commit d63b0e8a628e62ca85a0f7915230186bb92f8bb4 ]

When we get -EIOCBQUEUED, we need to ensure that the buffer is consumed from the provided buffer ring, which can be done with io_kbuf_recycle()
+ REQ_F_PARTIAL_IO.

Reported-by Muhammad Ramdhan <[email protected]>
Reported-by Bing-Jhong Billy Jheng <[email protected]>
Reported-by Jacob Soo <[email protected]>
Fixes c7fb19428d67d ("io_uring: add support for ring mapped supplied buffers")
Signed-off-by Pavel Begunkov <[email protected]>
---
 io_uring/rw.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
io_uring/rw.c +10 -0
index 692663bd864f..b75f62dccce6 100644
@@ -772,6 +772,8 @@ static int __io_read(struct io_kiocb *req, unsigned int issue_flags)
 			goto done;
 		ret = 0;
 	} else if (ret == -EIOCBQUEUED) {
+		req->flags |= REQ_F_PARTIAL_IO;
+		io_kbuf_recycle(req, issue_flags);
 		if (iovec)
 			kfree(iovec);
 		return IOU_ISSUE_SKIP_COMPLETE;

@@ -795,6 +797,9 @@ static int __io_read(struct io_kiocb *req, unsigned int issue_flags)
 		goto done;
 	}
 
+	req->flags |= REQ_F_PARTIAL_IO;
+	io_kbuf_recycle(req, issue_flags);
+
 	io = req->async_data;
 	s = &io->s;
 	/*

@@ -935,6 +940,11 @@ int io_write(struct io_kiocb *req, unsigned int issue_flags)
 	else
 		ret2 = -EINVAL;
 
+	if (ret2 == -EIOCBQUEUED) {
+		req->flags |= REQ_F_PARTIAL_IO;
+		io_kbuf_recycle(req, issue_flags);
+	}
+
 	if (req->flags & REQ_F_REISSUE) {
 		req->flags &= ~REQ_F_REISSUE;
 		ret2 = -EAGAIN;
Signature · 1 line
2.48.1