Return the id of the selected buffer in io_buffer_select(). This is needed for kernel-managed buffer rings to later recycle the selected buffer. Signed-off-by: Joanne Koong --- include/linux/io_uring/cmd.h | 2 +- include/linux/io_uring_types.h | 2 ++ io_uring/kbuf.c | 8 +++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/linux/io_uring/cmd.h b/include/linux/io_uring/cmd.h index a94f1dbc89c7..61c4ca863ef6 100644 --- a/include/linux/io_uring/cmd.h +++ b/include/linux/io_uring/cmd.h @@ -77,7 +77,7 @@ void io_uring_cmd_issue_blocking(struct io_uring_cmd *ioucmd); /* * Select a buffer from the provided buffer group for multishot uring_cmd. - * Returns the selected buffer address and size. + * Returns the selected buffer address, size, and id. */ struct io_br_sel io_uring_cmd_buffer_select(struct io_uring_cmd *ioucmd, unsigned buf_group, size_t *len, diff --git a/include/linux/io_uring_types.h b/include/linux/io_uring_types.h index 36fac08db636..52fce7eba400 100644 --- a/include/linux/io_uring_types.h +++ b/include/linux/io_uring_types.h @@ -100,6 +100,8 @@ struct io_br_sel { void *kaddr; }; ssize_t val; + /* id of the selected buffer */ + unsigned buf_id; }; diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c index 3b1f6296f581..d9beebb3aed2 100644 --- a/io_uring/kbuf.c +++ b/io_uring/kbuf.c @@ -248,7 +248,7 @@ struct io_br_sel io_ring_buffer_select(struct io_kiocb *req, size_t *len, req->flags |= REQ_F_BUFFER_RING | REQ_F_BUFFERS_COMMIT; req->buf_index = READ_ONCE(buf->bid); sel.buf_list = bl; - sel.addr = u64_to_user_ptr(READ_ONCE(buf->addr)); + sel.buf_id = req->buf_index; if (bl->flags & IOBL_KERNEL_MANAGED) sel.kaddr = (void *)buf->addr; else @@ -273,10 +273,12 @@ struct io_br_sel io_buffer_select(struct io_kiocb *req, size_t *len, bl = io_buffer_get_list(ctx, buf_group); if (likely(bl)) { - if (bl->flags & IOBL_BUF_RING) + if (bl->flags & IOBL_BUF_RING) { sel = io_ring_buffer_select(req, len, bl, issue_flags); - else + } else { sel.addr = io_provided_buffer_select(req, len, bl); + sel.buf_id = req->buf_index; + } } io_ring_submit_unlock(req->ctx, issue_flags); return sel; -- 2.47.3