io_uring: fix buffer auto-commit for multishot uring_cmd
PATCH v2 1/1 io_uring: fix buffer auto-commit for multishot uring_cmd
Commit 620a50c92700 ("io_uring: uring_cmd: add multishot support") added multishot uring_cmd support with explicit buffer upfront commit via io_uring_mshot_cmd_post_cqe(). However, the buffer selection path in io_ring_buffer_select() was auto-committing buffers for non-pollable files, which conflicts with uring_cmd's explicit upfront commit model.
This way consumes the whole selected buffer immediately, and causes failure on the following buffer selection.
Fix this by checking uring_cmd to identify operations that handle buffer commit explicitly, and skip auto-commit for these operations.
---
V2:
- add helper io_should_commit() (Jens)
io_uring/kbuf.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-)
io_uring/kbuf.c +22 -11
@@ -155,6 +155,27 @@ static int io_provided_buffers_select(struct io_kiocb *req, size_t *len,return 1 ; } +static bool io_should_commit (struct io_kiocb *req,unsigned int issue_flags) +{ +/* +* If we came in unlocked, we have no choice but to consume the +* buffer here, otherwise nothing ensures that the buffer won't +* get used by others. This does mean it'll be pinned until the +* IO completes, coming in unlocked means we're being called from +* io-wq context and there may be further retries in async hybrid +* mode. For the locked case, the caller must call commit when +* the transfer completes (or if we get -EAGAIN and must poll of +* retry). +*/ +if (issue_flags &IO_URING_F_UNLOCKED ) +return true; + +/* uring_cmd commits kbuf upfront, no need to auto-commit */ +if (!io_file_can_poll (req) && req->opcode !=IORING_OP_URING_CMD ) +return true; +return false; +} +static struct io_br_sel io_ring_buffer_select (struct io_kiocb *req,size_t *len,struct io_buffer_list *bl,unsigned int issue_flags)
@@ -181,17 +202,7 @@ static struct io_br_sel io_ring_buffer_select(struct io_kiocb *req, size_t *len, sel.buf_list = bl; sel.addr =u64_to_user_ptr (buf->addr); -if (issue_flags &IO_URING_F_UNLOCKED || !io_file_can_poll (req)) { -/* -* If we came in unlocked, we have no choice but to consume the -* buffer here, otherwise nothing ensures that the buffer won't -* get used by others. This does mean it'll be pinned until the -* IO completes, coming in unlocked means we're being called from -* io-wq context and there may be further retries in async hybrid -* mode. For the locked case, the caller must call commit when -* the transfer completes (or if we get -EAGAIN and must poll of -* retry). -*/ +if (io_should_commit (req, issue_flags)) {io_kbuf_commit (req, sel.buf_list, *len,1 ); sel.buf_list =NULL ; }
Signature · 1 line
2.47.1
Quoted 10 lines · Ming Lei
Commit
620a50c92700("io_uring:uring_cmd: add multishot support") added multishoturing_cmdsupport with explicit buffer upfront commit viaio_uring_mshot_cmd_post_cqe(). However, the buffer selection path inio_ring_buffer_select()was auto-committing buffers for non-pollable files, which conflicts with uring_cmd's explicit upfront commit model.This way consumes the whole selected buffer immediately, and causes failure on the following buffer selection.
[...]
Applied, thanks!
[1/1] io_uring: fix buffer auto-commit for multishot uring_cmd
(no commit info)
Best regards,
Signature · 1 line
Jens Axboe