| Message ID | 20241107110149.890530-1-ming.lei@redhat.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | io_uring: support group buffer & ublk zc | expand |
On Thu, 07 Nov 2024 19:01:33 +0800, Ming Lei wrote: > Patch 1~3 cleans rsrc code. > > Patch 4~9 prepares for supporting kernel buffer. > > The 10th patch supports group buffer, so far only kernel buffer is > supported, but it is pretty easy to extend for userspace group buffer. > > [...] Applied, thanks! [01/12] io_uring/rsrc: pass 'struct io_ring_ctx' reference to rsrc helpers commit: 0d98c509086837a8cf5a32f82f2a58f39a539192 [02/12] io_uring/rsrc: remove '->ctx_ptr' of 'struct io_rsrc_node' commit: 4f219fcce5e4366cc121fc98270beb1fbbb3df2b [03/12] io_uring/rsrc: add & apply io_req_assign_buf_node() commit: 039c878db7add23c1c9ea18424c442cce76670f9 Best regards,
On 11/7/24 3:25 PM, Jens Axboe wrote: > > On Thu, 07 Nov 2024 19:01:33 +0800, Ming Lei wrote: >> Patch 1~3 cleans rsrc code. >> >> Patch 4~9 prepares for supporting kernel buffer. >> >> The 10th patch supports group buffer, so far only kernel buffer is >> supported, but it is pretty easy to extend for userspace group buffer. >> >> [...] > > Applied, thanks! > > [01/12] io_uring/rsrc: pass 'struct io_ring_ctx' reference to rsrc helpers > commit: 0d98c509086837a8cf5a32f82f2a58f39a539192 > [02/12] io_uring/rsrc: remove '->ctx_ptr' of 'struct io_rsrc_node' > commit: 4f219fcce5e4366cc121fc98270beb1fbbb3df2b > [03/12] io_uring/rsrc: add & apply io_req_assign_buf_node() > commit: 039c878db7add23c1c9ea18424c442cce76670f9 Applied the first three as they stand alone quite nicely. I did ponder on patch 1 to skip the make eg io_alloc_file_tables() not take both the ctx and &ctx->file_table, but we may as well keep it symmetric. I'll take a look at the rest of the series tomorrow.
Hello, Patch 1~3 cleans rsrc code. Patch 4~9 prepares for supporting kernel buffer. The 10th patch supports group buffer, so far only kernel buffer is supported, but it is pretty easy to extend for userspace group buffer. The 11th patch adds uring_cmd interface for driver. The last patch applies group kernel buffer for supporting ublk zc. Tests: 1) pass liburing test - make runtests 2) add ublk loop-zc test code https://github.com/ming1/liburing/tree/uring_group V10: - use io_rsrc_node to deal with group buffer(Jens) - rebase on the latest for-6.13/io_uring - cleanup rsrc code - add request flag for marking if buffer is imported(Jens) - misc cleanup V9: - reuse io_mapped_ubuf for group kernel buffer(Jens) - rename as REQ_F_GROUP_BUF which can be extended for userspace group buffer easily - rebase on the latest for-6.13/io_uring - make sure that group buffer is imported once - use group buffer exclusively with buffer node & buffer select - misc cleanup V8: - simplify & clean up group request completion, don't reuse SQE_GROUP as state; meantime improve document; now group implementation is quite clean - handle short read/recv correctly by zeroing out the remained part(Pavel) - fix one group leader reference(Uday Shankar) - only allow ublk provide buffer command in case of zc(Uday Shankar) V7: - remove dead code in sqe group support(Pavel) - fail single group request(Pavel) - remove IORING_PROVIDE_GROUP_KBUF(Pavel) - remove REQ_F_SQE_GROUP_DEP(Pavel) - rename as leasing buffer - improve commit log - map group member's IOSQE_IO_DRAIN to GROUP_KBUF, which aligns with buffer select use, and it means that io_uring starts to support leased kbuf from other subsystem for group member requests only V6: - follow Pavel's suggestion to disallow IOSQE_CQE_SKIP_SUCCESS & LINK_TIMEOUT - kill __io_complete_group_member() (Pavel) - simplify link failure handling (Pavel) - move members' queuing out of completion lock (Pavel) - cleanup group io complete handler - add more comment - add ublk zc into liburing test for covering IOSQE_SQE_GROUP & IORING_PROVIDE_GROUP_KBUF V5: - follow Pavel's suggestion to minimize change on io_uring fast code path: sqe group code is called in by single 'if (unlikely())' from both issue & completion code path - simplify & re-write group request completion avoid to touch io-wq code by completing group leader via tw directly, just like ->task_complete re-write group member & leader completion handling, one simplification is always to free leader via the last member simplify queueing group members, not support issuing leader and members in parallel - fail the whole group if IO_*LINK & IO_DRAIN is set on group members, and test code to cover this change - misc cleanup V4: - address most comments from Pavel - fix request double free - don't use io_req_commit_cqe() in io_req_complete_defer() - make members' REQ_F_INFLIGHT discoverable - use common assembling check in submission code path - drop patch 3 and don't move REQ_F_CQE_SKIP out of io_free_req() - don't set .accept_group_kbuf for net send zc, in which members need to be queued after buffer notification is got, and can be enabled in future - add .grp_leader field via union, and share storage with .grp_link - move .grp_refs into one hole of io_kiocb, so that one extra cacheline isn't needed for io_kiocb - cleanup & document improvement V3: - add IORING_FEAT_SQE_GROUP - simplify group completion, and minimize change on io_req_complete_defer() - simplify & cleanup io_queue_group_members() - fix many failure handling issues - cover failure handling code in added liburing tests - remove RFC V2: - add generic sqe group, suggested by Kevin Wolf - add REQ_F_SQE_GROUP_DEP which is based on IOSQE_SQE_GROUP, for sharing kernel resource in group wide, suggested by Kevin Wolf - remove sqe ext flag, and use the last bit for IOSQE_SQE_GROUP(Pavel), in future we still can extend sqe flags with one uring context flag - initialize group requests via submit state pattern, suggested by Pavel - all kinds of cleanup & bug fixes Ming Lei (12): io_uring/rsrc: pass 'struct io_ring_ctx' reference to rsrc helpers io_uring/rsrc: remove '->ctx_ptr' of 'struct io_rsrc_node' io_uring/rsrc: add & apply io_req_assign_buf_node() io_uring/rsrc: prepare for supporting external 'io_rsrc_node' io_uring: rename io_mapped_ubuf as io_mapped_buf io_uring: rename io_mapped_buf->ubuf as io_mapped_buf->addr io_uring: shrink io_mapped_buf io_uring: reuse io_mapped_buf for kernel buffer io_uring: add callback to 'io_mapped_buffer' for giving back kernel buffer io_uring: support leased group buffer with REQ_F_GROUP_BUF io_uring/uring_cmd: support leasing device kernel buffer to io_uring ublk: support leasing io buffer to io_uring drivers/block/ublk_drv.c | 168 +++++++++++++++++++++++++++++++-- include/linux/io_uring/cmd.h | 7 ++ include/linux/io_uring_types.h | 43 +++++++++ include/uapi/linux/ublk_cmd.h | 11 ++- io_uring/fdinfo.c | 4 +- io_uring/filetable.c | 13 +-- io_uring/filetable.h | 4 +- io_uring/io_uring.c | 24 ++++- io_uring/io_uring.h | 5 + io_uring/kbuf.c | 82 ++++++++++++++++ io_uring/kbuf.h | 27 ++++++ io_uring/net.c | 30 +++++- io_uring/nop.c | 3 +- io_uring/opdef.c | 4 + io_uring/opdef.h | 2 + io_uring/rsrc.c | 69 ++++++++------ io_uring/rsrc.h | 77 +++++++-------- io_uring/rw.c | 40 ++++++-- io_uring/splice.c | 2 +- io_uring/uring_cmd.c | 12 ++- 20 files changed, 521 insertions(+), 106 deletions(-)