io_uring/ublk: add IORING_OP_FUSED_CMD
Subsystems (4)
v5 cover io_uring/ublk: add IORING_OP_FUSED_CMD
Hello Jens,
Add IORING_OP_FUSED_CMD, it is one special URING_CMD, the 1st SQE(primary) is one 64byte URING_CMD, and the 2nd 64byte SQE(secondary) is another normal 64byte OP. The primary command provides device/file io buffer and submits OP represented by the secondary SQE using the provided buffer. This way solves ublk zero copy problem easily, since io buffer shares same lifetime with the primary command.
The secondary OP is actually submitted from kernel, part of this idea is from Xiaoguang's ublk ebpf patchset, but this patchset submits secondary OP just like normal OP issued from userspace, that said, SQE order is kept, and batching handling is done too.
Please see detailed design in commit log of the 2th patch, and one big point is how to handle buffer lifetime/ownership.
With this way, it is easy to support zero copy for ublk/fuse device.
Basically userspace can specify any sub-buffer of the ublk block request buffer from the fused command just by setting 'offset/len'
in the secondary SQE for running secondary OP. This way is flexible to implement io mapping: mirror, stripped, ...
The 4th & 5th patches enable fused secondary support for the following OPs:
OP_READ/OP_WRITE
OP_SEND/OP_RECV/OP_SEND_ZC
The other ublk patches cleans ublk driver and implement fused command for supporting zero copy.
Follows userspace code, which supports 128byte SQE fused command only:
https://github.com/ming1/ubdsrv/tree/fused-cmd-zc-for-v5
All three(loop, nbd and qcow2) ublk targets have supported zero copy by passing:
ublk add -t [loop|nbd|qcow2] -z ....
Basic fs mount/kernel building and builtin test are done, and also not observe regression on xfstest test over ublk-loop with zero copy.
Also add liburing test case for covering fused command based on miniublk of blktest(supports 64byte normal SQE only)
https://github.com/ming1/liburing/tree/fused_cmd_miniublk_for_v5
Performance improvement is obvious on memory bandwidth related workloads, such as, 1~2X improvement on 64K/512K BS IO test on loop with ramfs backing file. ublk-null shows 5X IOPS improvement on big BS test when the copy is avoided.
Please review and consider for v6.4.
V5:
- rebase on for-6.4/io_uring
- rename to primary/secondary as suggested by Jens
- reserve interface for extending to support multiple secondary OPs in future, which isn't a must, because it can be done by submitting multiple fused commands with same primary request
- rename to primary/secondary in ublksrv and liburing test code
V4:
- improve APIs naming(patch 1 ~ 4)
- improve documents and commit log(patch 2)
- add buffer direction bit to opdef, suggested by Jens(patch 2)
- add ublk zero copy document for cover: technical requirements(most related with buffer lifetime), and explains why splice isn't good and how fused command solves it(patch 17)
- fix sparse warning(patch 7)
- supports 64byte SQE fused command(patch 3)
V3:
- fix build warning reported by kernel test robot
- drop patch for checking fused flags on existed drivers with ->uring_command(), which isn't necessary, since we do not do that
when adding new ioctl or uring command
- inline io_init_rq() for core code, so just export io_init_secondary_req
- return result of failed secondary request unconditionally since REQ_F_CQE_SKIP will be cleared
- pass xfstest over ublk-loop
V2:
- don't resue io_mapped_ubuf (io_uring)
- remove REQ_F_FUSED_MASTER_BIT (io_uring)
- fix compile warning (io_uring)
- rebase on v6.3-rc1 (io_uring)
- grabbing io request reference when handling fused command
- simplify ublk_copy_user_pages() by iov iterator
- add read()/write() for userspace to read/write ublk io buffer, so that some corner cases(read zero, passthrough request(report zones)) can be handled easily in case of zero copy; this way also helps to switch to zero copy completely
- misc cleanup
Ming Lei (16):
io_uring: increase io_kiocb->flags into 64bit
io_uring: add IORING_OP_FUSED_CMD
io_uring: support normal SQE for fused command
io_uring: support OP_READ/OP_WRITE for fused secondary request
io_uring: support OP_SEND_ZC/OP_RECV for fused secondary request
block: ublk_drv: add common exit handling
block: ublk_drv: don't consider flush request in map/unmap io
block: ublk_drv: add two helpers to clean up map/unmap request
block: ublk_drv: clean up several helpers
block: ublk_drv: cleanup 'struct ublk_map_data'
block: ublk_drv: cleanup ublk_copy_user_pages
block: ublk_drv: grab request reference when the request is handled by
userspace
block: ublk_drv: support to copy any part of request pages
block: ublk_drv: add read()/write() support for ublk char device
block: ublk_drv: don't check buffer in case of zero copy
block: ublk_drv: apply io_uring FUSED_CMD for supporting zero copy
Documentation/block/ublk.rst | 126 ++++++- drivers/block/ublk_drv.c | 603 ++++++++++++++++++++++++++------- include/linux/io_uring.h | 50 ++- include/linux/io_uring_types.h | 77 +++-- include/uapi/linux/io_uring.h | 11 +- include/uapi/linux/ublk_cmd.h | 37 +- io_uring/Makefile | 2 +- io_uring/fused_cmd.c | 267 +++++++++++++++ io_uring/fused_cmd.h | 11 + io_uring/io_uring.c | 51 ++- io_uring/io_uring.h | 5 + io_uring/net.c | 30 +- io_uring/opdef.c | 22 ++ io_uring/opdef.h | 7 + io_uring/rw.c | 21 ++ 15 files changed, 1142 insertions(+), 178 deletions(-) create mode 100644 io_uring/fused_cmd.c create mode 100644 io_uring/fused_cmd.h
Signature · 1 line
2.39.2
PATCH v5 1/16 io_uring: increase io_kiocb->flags into 64bit
The 32bit io_kiocb->flags has been used up, so extend it to 64bit.
--- include/linux/io_uring_types.h | 65 +++++++++++++++++----------------- io_uring/io_uring.c | 2 +- 2 files changed, 34 insertions(+), 33 deletions(-)
include/linux/io_uring_types.h +33 -32
@@ -414,68 +414,68 @@ enum {enum {/* ctx owns file */ -REQ_F_FIXED_FILE =BIT (REQ_F_FIXED_FILE_BIT ), +REQ_F_FIXED_FILE =BIT_ULL (REQ_F_FIXED_FILE_BIT ),/* drain existing IO first */ -REQ_F_IO_DRAIN =BIT (REQ_F_IO_DRAIN_BIT ), +REQ_F_IO_DRAIN =BIT_ULL (REQ_F_IO_DRAIN_BIT ),/* linked sqes */ -REQ_F_LINK =BIT (REQ_F_LINK_BIT ), +REQ_F_LINK =BIT_ULL (REQ_F_LINK_BIT ),/* doesn't sever on completion < 0 */ -REQ_F_HARDLINK =BIT (REQ_F_HARDLINK_BIT ), +REQ_F_HARDLINK =BIT_ULL (REQ_F_HARDLINK_BIT ),/* IOSQE_ASYNC */ -REQ_F_FORCE_ASYNC =BIT (REQ_F_FORCE_ASYNC_BIT ), +REQ_F_FORCE_ASYNC =BIT_ULL (REQ_F_FORCE_ASYNC_BIT ),/* IOSQE_BUFFER_SELECT */ -REQ_F_BUFFER_SELECT =BIT (REQ_F_BUFFER_SELECT_BIT ), +REQ_F_BUFFER_SELECT =BIT_ULL (REQ_F_BUFFER_SELECT_BIT ),/* IOSQE_CQE_SKIP_SUCCESS */ -REQ_F_CQE_SKIP =BIT (REQ_F_CQE_SKIP_BIT ), +REQ_F_CQE_SKIP =BIT_ULL (REQ_F_CQE_SKIP_BIT ),/* fail rest of links */ -REQ_F_FAIL =BIT (REQ_F_FAIL_BIT ), +REQ_F_FAIL =BIT_ULL (REQ_F_FAIL_BIT ),/* on inflight list, should be cancelled and waited on exit reliably */ -REQ_F_INFLIGHT =BIT (REQ_F_INFLIGHT_BIT ), +REQ_F_INFLIGHT =BIT_ULL (REQ_F_INFLIGHT_BIT ),/* read/write uses file position */ -REQ_F_CUR_POS =BIT (REQ_F_CUR_POS_BIT ), +REQ_F_CUR_POS =BIT_ULL (REQ_F_CUR_POS_BIT ),/* must not punt to workers */ -REQ_F_NOWAIT =BIT (REQ_F_NOWAIT_BIT ), +REQ_F_NOWAIT =BIT_ULL (REQ_F_NOWAIT_BIT ),/* has or had linked timeout */ -REQ_F_LINK_TIMEOUT =BIT (REQ_F_LINK_TIMEOUT_BIT ), +REQ_F_LINK_TIMEOUT =BIT_ULL (REQ_F_LINK_TIMEOUT_BIT ),/* needs cleanup */ -REQ_F_NEED_CLEANUP =BIT (REQ_F_NEED_CLEANUP_BIT ), +REQ_F_NEED_CLEANUP =BIT_ULL (REQ_F_NEED_CLEANUP_BIT ),/* already went through poll handler */ -REQ_F_POLLED =BIT (REQ_F_POLLED_BIT ), +REQ_F_POLLED =BIT_ULL (REQ_F_POLLED_BIT ),/* buffer already selected */ -REQ_F_BUFFER_SELECTED =BIT (REQ_F_BUFFER_SELECTED_BIT ), +REQ_F_BUFFER_SELECTED =BIT_ULL (REQ_F_BUFFER_SELECTED_BIT ),/* buffer selected from ring, needs commit */ -REQ_F_BUFFER_RING =BIT (REQ_F_BUFFER_RING_BIT ), +REQ_F_BUFFER_RING =BIT_ULL (REQ_F_BUFFER_RING_BIT ),/* caller should reissue async */ -REQ_F_REISSUE =BIT (REQ_F_REISSUE_BIT ), +REQ_F_REISSUE =BIT_ULL (REQ_F_REISSUE_BIT ),/* supports async reads/writes */ -REQ_F_SUPPORT_NOWAIT =BIT (REQ_F_SUPPORT_NOWAIT_BIT ), +REQ_F_SUPPORT_NOWAIT =BIT_ULL (REQ_F_SUPPORT_NOWAIT_BIT ),/* regular file */ -REQ_F_ISREG =BIT (REQ_F_ISREG_BIT ), +REQ_F_ISREG =BIT_ULL (REQ_F_ISREG_BIT ),/* has creds assigned */ -REQ_F_CREDS =BIT (REQ_F_CREDS_BIT ), +REQ_F_CREDS =BIT_ULL (REQ_F_CREDS_BIT ),/* skip refcounting if not set */ -REQ_F_REFCOUNT =BIT (REQ_F_REFCOUNT_BIT ), +REQ_F_REFCOUNT =BIT_ULL (REQ_F_REFCOUNT_BIT ),/* there is a linked timeout that has to be armed */ -REQ_F_ARM_LTIMEOUT =BIT (REQ_F_ARM_LTIMEOUT_BIT ), +REQ_F_ARM_LTIMEOUT =BIT_ULL (REQ_F_ARM_LTIMEOUT_BIT ),/* ->async_data allocated */ -REQ_F_ASYNC_DATA =BIT (REQ_F_ASYNC_DATA_BIT ), +REQ_F_ASYNC_DATA =BIT_ULL (REQ_F_ASYNC_DATA_BIT ),/* don't post CQEs while failing linked requests */ -REQ_F_SKIP_LINK_CQES =BIT (REQ_F_SKIP_LINK_CQES_BIT ), +REQ_F_SKIP_LINK_CQES =BIT_ULL (REQ_F_SKIP_LINK_CQES_BIT ),/* single poll may be active */ -REQ_F_SINGLE_POLL =BIT (REQ_F_SINGLE_POLL_BIT ), +REQ_F_SINGLE_POLL =BIT_ULL (REQ_F_SINGLE_POLL_BIT ),/* double poll may active */ -REQ_F_DOUBLE_POLL =BIT (REQ_F_DOUBLE_POLL_BIT ), +REQ_F_DOUBLE_POLL =BIT_ULL (REQ_F_DOUBLE_POLL_BIT ),/* request has already done partial IO */ -REQ_F_PARTIAL_IO =BIT (REQ_F_PARTIAL_IO_BIT ), +REQ_F_PARTIAL_IO =BIT_ULL (REQ_F_PARTIAL_IO_BIT ),/* fast poll multishot mode */ -REQ_F_APOLL_MULTISHOT =BIT (REQ_F_APOLL_MULTISHOT_BIT ), +REQ_F_APOLL_MULTISHOT =BIT_ULL (REQ_F_APOLL_MULTISHOT_BIT ),/* ->extra1 and ->extra2 are initialised */ -REQ_F_CQE32_INIT =BIT (REQ_F_CQE32_INIT_BIT ), +REQ_F_CQE32_INIT =BIT_ULL (REQ_F_CQE32_INIT_BIT ),/* recvmsg special flag, clear EPOLLIN */ -REQ_F_CLEAR_POLLIN =BIT (REQ_F_CLEAR_POLLIN_BIT ), +REQ_F_CLEAR_POLLIN =BIT_ULL (REQ_F_CLEAR_POLLIN_BIT ),/* hashed into ->cancel_hash_locked, protected by ->uring_lock */ -REQ_F_HASH_LOCKED =BIT (REQ_F_HASH_LOCKED_BIT ), +REQ_F_HASH_LOCKED =BIT_ULL (REQ_F_HASH_LOCKED_BIT ), };typedef void (*io_req_tw_func_t )(struct io_kiocb *req,struct io_tw_state *ts);
@@ -536,7 +536,8 @@ struct io_kiocb {* and after selection it points to the buffer ID itself. */ u16 buf_index; -unsigned int flags; +u32 __pad; +u64 flags;struct io_cqe cqe;
io_uring/io_uring.c +1 -1
@@ -4486,7 +4486,7 @@ static int __init io_uring_init(void)BUILD_BUG_ON (SQE_COMMON_FLAGS >= (1 <<8 ));BUILD_BUG_ON ((SQE_VALID_FLAGS |SQE_COMMON_FLAGS ) !=SQE_VALID_FLAGS ); -BUILD_BUG_ON (__REQ_F_LAST_BIT >8 *sizeof (int )); +BUILD_BUG_ON (__REQ_F_LAST_BIT >8 *sizeof (u64));BUILD_BUG_ON (sizeof (atomic_t) !=sizeof (u32));
Signature · 1 line
2.39.2
PATCH v5 2/16 io_uring: add IORING_OP_FUSED_CMD
In reply to Ming LeiAdd IORING_OP_FUSED_CMD, it is one special URING_CMD, which has to be SQE128. The 1st SQE(primary) is one 64byte URING_CMD, and the 2nd 64byte SQE(secondary) is another normal 64byte OP. For any OP which needs to support secondary OP, io_issue_defs[op].fused_secondary has to be set as 1, and its ->issue() needs to retrieve buffer from primary request's fused_cmd_kbuf.
Follows the key points of the design/implementation:
1) The primary uring command produces and provides immutable command buffer(struct io_uring_bvec_buf) to the secondary request, and the secondary OP can retrieve any part of this buffer by sqe->addr and sqe->len.
2) Master command is always completed after the secondary request is completed, so secondary request can be thought as serving for primary command.
- secondary request borrows primary command's buffer(io_uring_bvec_buf), after secondary request is completed, the buffer is returned back to primary request.
- This way also guarantees correct SQE order since the primary request uses secondary request's LINK flag.
3) Master request completion is always notified to driver, so that driver can know when the buffer is done with secondary quest. This way is important since io_uring_bvec_buf represents reference of device io command buffer, and we have to gurantee that reference can not outlive the referent buffer, so far which is represented by bvec.
4) kernel API of io_fused_cmd_start_secondary_req is called by driver for making the buffer of io_uring_bvec_buf and starting to submit secondary request with the provided buffer.
The motivation is for supporting zero copy for fuse/ublk, in which the device holds IO request buffer, and IO handling is often normal IO OP(fs, net, ..). With IORING_OP_FUSED_CMD, we can implement this kind of zero copy easily & reliably.
--- include/linux/io_uring.h | 50 ++++++- include/linux/io_uring_types.h | 12 ++ include/uapi/linux/io_uring.h | 3 + io_uring/Makefile | 2 +- io_uring/fused_cmd.c | 241 +++++++++++++++++++++++++++++++++ io_uring/fused_cmd.h | 11 ++ io_uring/io_uring.c | 26 +++- io_uring/io_uring.h | 3 + io_uring/opdef.c | 12 ++ io_uring/opdef.h | 7 + 10 files changed, 361 insertions(+), 6 deletions(-) create mode 100644 io_uring/fused_cmd.c create mode 100644 io_uring/fused_cmd.h
include/linux/io_uring.h +49 -1
@@ -4,6 +4,7 @@#include <linux/sched.h> #include <linux/xarray.h> +#include <linux/bvec.h> #include <uapi/linux/io_uring.h> enum io_uring_cmd_flags {
@@ -20,6 +21,26 @@ enum io_uring_cmd_flags {IO_URING_F_SQE128 = (1 <<8 ),IO_URING_F_CQE32 = (1 <<9 ),IO_URING_F_IOPOLL = (1 <<10 ), + +/* for FUSED_CMD only */ +IO_URING_F_FUSED_BUF_DEST = (1 <<11 ),/* secondary write to buffer */ +IO_URING_F_FUSED_BUF_SRC = (1 <<12 ),/* secondary read from buffer */ +/* driver incapable of FUSED_CMD should fail cmd when seeing F_FUSED */ +IO_URING_F_FUSED =IO_URING_F_FUSED_BUF_DEST | + IO_URING_F_FUSED_BUF_SRC, +}; + +union io_uring_fused_cmd_data { +/* +* In case of secondary request IOSQE_CQE_SKIP_SUCCESS, return the +* result via primary command; otherwise we simply return success +* if buffer is provided, and secondary request will return its result +* via its CQE +*/ +s32 secondary_res; + +/* fused cmd private, driver do not touch it */ +struct io_kiocb *__secondary; }; struct io_uring_cmd {
@@ -33,10 +54,31 @@ struct io_uring_cmd { };u32 cmd_op;u32 flags; -u8 pdu[32 ];/* available inline for free use */ + +/* for fused command, the available pdu is a bit less */ +union { +struct { +union io_uring_fused_cmd_data data; +u8 pdu[24 ];/* available inline for free use */ + } fused; +u8 pdu[32 ];/* available inline for free use */ + }; +}; + +struct io_uring_bvec_buf { +unsigned long len; +unsigned int nr_bvecs; + +/* offset in the 1st bvec */ +unsigned int offset; +const struct bio_vec *bvec; +struct bio_vec __bvec[]; };#if defined(CONFIG_IO_URING ) +void io_fused_cmd_start_secondary_req (struct io_uring_cmd *,unsigned , +const struct io_uring_bvec_buf *, +void (*complete_tw_cb)(struct io_uring_cmd *,unsigned ));int io_uring_cmd_import_fixed (u64 ubuf,unsigned long len,int rw,struct iov_iter *iter,void *ioucmd); void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, ssize_t res2,
@@ -67,6 +109,12 @@ static inline void io_uring_free(struct task_struct *tsk) __io_uring_free(tsk); }#else +static inline void io_fused_cmd_start_secondary_req (struct io_uring_cmd *, +unsigned issue_flags,const struct io_uring_bvec_buf *, +unsigned int , +void (*complete_tw_cb)(struct io_uring_cmd *,unsigned )) +{ +}static inline int io_uring_cmd_import_fixed (u64 ubuf,unsigned long len,int rw,struct iov_iter *iter,void *ioucmd) {
include/linux/io_uring_types.h +12 -0
@@ -407,6 +407,7 @@ enum {/* keep async read/write and isreg together and in order */ REQ_F_SUPPORT_NOWAIT_BIT ,REQ_F_ISREG_BIT , +REQ_F_FUSED_SECONDARY_BIT ,/* not a real bit, just to check we're not overflowing the space */ __REQ_F_LAST_BIT,
@@ -476,6 +477,8 @@ enum {REQ_F_CLEAR_POLLIN =BIT_ULL (REQ_F_CLEAR_POLLIN_BIT ),/* hashed into ->cancel_hash_locked, protected by ->uring_lock */ REQ_F_HASH_LOCKED =BIT_ULL (REQ_F_HASH_LOCKED_BIT ), +/* secondary request in fused cmd, won't be one uring cmd */ + REQ_F_FUSED_SECONDARY = BIT_ULL(REQ_F_FUSED_SECONDARY_BIT), };typedef void (*io_req_tw_func_t )(struct io_kiocb *req,struct io_tw_state *ts);
@@ -558,6 +561,15 @@ struct io_kiocb {* REQ_F_BUFFER_RING is set. */ struct io_buffer_list *buf_list; + +/* +* store kernel (sub)buffer of fused primary request which OP +* is IORING_OP_FUSED_CMD +*/ +const struct io_uring_bvec_buf *fused_cmd_kbuf; + +/* store fused command's primary request for the secondary */ +struct io_kiocb *fused_primary_req; };union {
include/uapi/linux/io_uring.h +3 -0
@@ -73,6 +73,8 @@ struct io_uring_sqe {__u16 buf_index;/* for grouped buffer selection */ __u16 buf_group; +/* how many secondary normal SQEs following this fused SQE */ +__u16 nr_secondary; } __attribute__((packed));/* personality to use, if used */ __u16 personality;
@@ -223,6 +225,7 @@ enum io_uring_op {IORING_OP_URING_CMD ,IORING_OP_SEND_ZC ,IORING_OP_SENDMSG_ZC , +IORING_OP_FUSED_CMD ,/* this goes last, obviously */ IORING_OP_LAST,
io_uring/Makefile +1 -1
@@ -7,5 +7,5 @@ obj-$(CONFIG_IO_URING) += io_uring.o xattr.o nop.o fs.o splice.o \ openclose.o uring_cmd.o epoll.o \ statx.o net.o msg_ring.o timeout.o \ sqpoll.o fdinfo.o tctx.o poll.o \ - cancel.o kbuf.o rsrc.o rw.o opdef.o notif.o + cancel.o kbuf.o rsrc.o rw.o opdef.o notif.o fused_cmd.o obj-$(CONFIG_IO_WQ) += io-wq.o
io_uring/fused_cmd.c new file +241 -0
241 lines not on this page · raw message
io_uring/fused_cmd.h new file +11 -0
@@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0 +#ifndef IOU_FUSED_CMD_H +#define IOU_FUSED_CMD_H + +int io_fused_cmd_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe); +int io_fused_cmd (struct io_kiocb *req,unsigned int issue_flags); +void io_fused_cmd_return_buf (struct io_kiocb *secondary); +int io_import_buf_for_secondary (unsigned long buf,unsigned int len,int dir, +struct iov_iter *iter,struct io_kiocb *secondary); + +#endif
io_uring/io_uring.c +22 -4
@@ -92,6 +92,7 @@#include "cancel.h" #include "net.h" #include "notif.h" +#include "fused_cmd.h" #include "timeout.h" #include "poll.h"
@@ -111,7 +112,7 @@#define IO_REQ_CLEAN_FLAGS (REQ_F_BUFFER_SELECTED | REQ_F_NEED_CLEANUP | \ REQ_F_POLLED | REQ_F_INFLIGHT | REQ_F_CREDS | \ - REQ_F_ASYNC_DATA) + REQ_F_ASYNC_DATA | REQ_F_FUSED_SECONDARY)#define IO_REQ_CLEAN_SLOW_FLAGS (REQ_F_REFCOUNT | REQ_F_LINK | REQ_F_HARDLINK |\ IO_REQ_CLEAN_FLAGS)
@@ -971,6 +972,9 @@ static void __io_req_complete_post(struct io_kiocb *req) {struct io_ring_ctx *ctx = req->ctx; +if (req->flags &REQ_F_FUSED_SECONDARY ) +io_fused_cmd_return_buf (req); +io_cq_lock (ctx);if (!(req->flags &REQ_F_CQE_SKIP ))io_fill_cqe_req (ctx, req);
@@ -1855,6 +1859,8 @@ static void io_clean_op(struct io_kiocb *req)spin_lock (&req->ctx->completion_lock);io_put_kbuf_comp (req);spin_unlock (&req->ctx->completion_lock); + }else if (req->flags &REQ_F_FUSED_SECONDARY ) { +io_fused_cmd_return_buf (req); }if (req->flags &REQ_F_NEED_CLEANUP ) {
@@ -2163,8 +2169,8 @@ static void io_init_req_drain(struct io_kiocb *req) } } -static int io_init_req (struct io_ring_ctx *ctx,struct io_kiocb *req, -const struct io_uring_sqe *sqe) +static inline int io_init_req (struct io_ring_ctx *ctx,struct io_kiocb *req, +const struct io_uring_sqe *sqe,bool secondary) __must_hold(&ctx->uring_lock) {const struct io_issue_def *def;
@@ -2217,6 +2223,12 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req, } } +if (secondary) { +if (!def->fused_secondary) +return -EINVAL ; + req->flags |=REQ_F_FUSED_SECONDARY ; + } +if (!def->ioprio && sqe->ioprio)return -EINVAL ;if (!def->iopoll && (ctx->flags &IORING_SETUP_IOPOLL ))
@@ -2257,6 +2269,12 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req,return def->prep (req, sqe); } +int io_init_secondary_req (struct io_ring_ctx *ctx,struct io_kiocb *req, +const struct io_uring_sqe *sqe) +{ +return io_init_req (ctx, req, sqe, true); +} +static __cold int io_submit_fail_init (const struct io_uring_sqe *sqe,struct io_kiocb *req,int ret) {
@@ -2301,7 +2319,7 @@ static inline int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,struct io_submit_link *link = &ctx->submit_state.link;int ret; - ret =io_init_req (ctx, req, sqe); + ret =io_init_req (ctx, req, sqe, false);if (unlikely (ret))return io_submit_fail_init (sqe, req, ret);
io_uring/io_uring.h +3 -0
@@ -78,6 +78,9 @@ bool __io_alloc_req_refill(struct io_ring_ctx *ctx);bool io_match_task_safe (struct io_kiocb *head,struct task_struct *task,bool cancel_all); +int io_init_secondary_req (struct io_ring_ctx *ctx,struct io_kiocb *req, +const struct io_uring_sqe *sqe); +#define io_lockdep_assert_cq_locked (ctx) \ do { \ if (ctx->flags & IORING_SETUP_IOPOLL) { \
io_uring/opdef.c +12 -0
@@ -33,6 +33,7 @@#include "poll.h" #include "cancel.h" #include "rw.h" +#include "fused_cmd.h" static int io_no_issue (struct io_kiocb *req,unsigned int issue_flags) {
@@ -428,6 +429,12 @@ const struct io_issue_def io_issue_defs[] = { .prep = io_eopnotsupp_prep, #endif }, + [IORING_OP_FUSED_CMD ] = { + .needs_file =1 , + .plug =1 , + .prep = io_fused_cmd_prep, + .issue = io_fused_cmd, + }, };
@@ -648,6 +655,11 @@ const struct io_cold_def io_cold_defs[] = { .fail = io_sendrecv_fail, #endif }, + [IORING_OP_FUSED_CMD ] = { + .name ="FUSED_CMD" , + .async_size =uring_cmd_pdu_size (1 ), + .prep_async = io_uring_cmd_prep_async, + }, };const char *io_uring_get_opcode (u8 opcode)
io_uring/opdef.h +7 -0
@@ -29,6 +29,13 @@ struct io_issue_def { unsigned iopoll_queue : 1;/* opcode specific path will handle ->async_data allocation if needed */ unsigned manual_alloc : 1; +/* can be secondary op of fused command */ + unsigned fused_secondary : 1; +/* +* buffer direction, 0 : read from buffer, 1: write to buffer, used +* for fused_secondary only +*/ + unsigned buf_dir : 1;int (*issue)(struct io_kiocb *,unsigned int );int (*prep)(struct io_kiocb *,const struct io_uring_sqe *);
Signature · 1 line
2.39.2
kernel test robot
build botRe: [PATCH V5 02/16] io_uring: add IORING_OP_FUSED_CMD
I love your patch! Perhaps something to improve:
Hi Ming,
I love your patch! Perhaps something to improve:
[auto build test WARNING on axboe-block/for-next]
[also build test WARNING on linus/master v6.3-rc4 next-20230328] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Ming-Lei/io_uring-increase-io_kiocb-flags-into-64bit/20230328-232554 base: https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git for-next patch link: https://lore.kernel.org/r/20230328150958.1253547-3-ming.lei%40redhat.com patch subject: [PATCH V5 02/16] io_uring: add IORING_OP_FUSED_CMD config: x86_64-randconfig-a011-20230327 (https://download.01.org/0day-ci/archive/20230329/[email protected]/config) compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/1cdd7d77287ea8d97834b37825e63a727e860f6c
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Ming-Lei/io_uring-increase-io_kiocb-flags-into-64bit/20230328-232554 git checkout 1cdd7d77287ea8d97834b37825e63a727e860f6c
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/nvme/host/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
In file included from drivers/nvme/host/ioctl.c:8:
>> include/linux/io_uring.h:112:74: warning: omitting the parameter name in a function definition is a C2x extension [-Wc2x-extensions]
static inline void io_fused_cmd_start_secondary_req(struct io_uring_cmd *,
^
include/linux/io_uring.h:113:57: warning: omitting the parameter name in a function definition is a C2x extension [-Wc2x-extensions]
unsigned issue_flags, const struct io_uring_bvec_buf *,
^
include/linux/io_uring.h:114:15: warning: omitting the parameter name in a function definition is a C2x extension [-Wc2x-extensions]
unsigned int,
^3 warnings generated.
vim +112 include/linux/io_uring.h
93
94 static inline void io_uring_files_cancel(void)
95 {
96 if (current->io_uring) {
97 io_uring_unreg_ringfd();
98 __io_uring_cancel(false);
99 }
100 }
101 static inline void io_uring_task_cancel(void)
102 {
103 if (current->io_uring)
104 __io_uring_cancel(true);
105 }
106 static inline void io_uring_free(struct task_struct *tsk)
107 {
108 if (tsk->io_uring)
109 __io_uring_free(tsk);
110 }
111 #else
> 112 static inline void io_fused_cmd_start_secondary_req(struct io_uring_cmd *, 113 unsigned issue_flags, const struct io_uring_bvec_buf *,
114 unsigned int,
115 void (*complete_tw_cb)(struct io_uring_cmd *, unsigned))
116 {
117 }
118 static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,
119 struct iov_iter *iter, void *ioucmd)
120 {
121 return -EOPNOTSUPP;
122 }
123 static inline void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret,
124 ssize_t ret2, unsigned issue_flags)
125 {
126 }
127 static inline void io_uring_cmd_complete_in_task(struct io_uring_cmd *ioucmd,
128 void (*task_work_cb)(struct io_uring_cmd *, unsigned))
129 {
130 }
131 static inline struct sock *io_uring_get_socket(struct file *file)
132 {
133 return NULL;
134 }
135 static inline void io_uring_task_cancel(void)
136 {
137 }
138 static inline void io_uring_files_cancel(void)
139 {
140 }
141 static inline void io_uring_free(struct task_struct *tsk)
142 {
143 }
144 static inline const char *io_uring_get_opcode(u8 opcode)
145 {
146 return "";
147 }
148 #endif
149
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
PATCH v5 3/16 io_uring: support normal SQE for fused command
In reply to Ming LeiSo far, the secondary sqe is saved in the 2nd 64 byte of primary sqe, which requires that SQE128 has to be enabled. Relax this limit by allowing to fetch secondary SQE from SQ directly.
IORING_URING_CMD_FUSED_SPLIT_SQE has to be set for this usage, and userspace has to put secondary SQE following the primary sqe.
--- include/uapi/linux/io_uring.h | 8 ++++++- io_uring/fused_cmd.c | 42 ++++++++++++++++++++++++++++------- io_uring/io_uring.c | 23 +++++++++++++------ io_uring/io_uring.h | 2 ++ 4 files changed, 59 insertions(+), 16 deletions(-)
include/uapi/linux/io_uring.h +7 -1
@@ -235,9 +235,15 @@ enum io_uring_op {* sqe->uring_cmd_flags * IORING_URING_CMD_FIXED use registered buffer; pass this flag * along with setting sqe->buf_index. +* +* IORING_URING_CMD_FUSED_SPLIT_SQE fused command only, secondary sqe is +* provided from another new sqe; without +* setting the flag, secondary sqe is from +* 2nd 64byte of this sqe, so SQE128 has +* to be enabled */ #define IORING_URING_CMD_FIXED (1U << 0) - +#define IORING_URING_CMD_FUSED_SPLIT_SQE (1U << 1)/* * sqe->fsync_flags
io_uring/fused_cmd.c +34 -8
74 lines not on this page · raw message
io_uring/io_uring.c +16 -7
@@ -2414,7 +2414,8 @@ static void io_commit_sqring(struct io_ring_ctx *ctx)* used, it's important that those reads are done through READ_ONCE() to * prevent a re-load down the line. */ -static bool io_get_sqe (struct io_ring_ctx *ctx,const struct io_uring_sqe **sqe) +static inline bool io_get_sqe (struct io_ring_ctx *ctx, +const struct io_uring_sqe **sqe) {unsigned head, mask = ctx->sq_entries -1 ;unsigned sq_idx = ctx->cached_sq_head++ & mask;
@@ -2443,19 +2444,26 @@ static bool io_get_sqe(struct io_ring_ctx *ctx, const struct io_uring_sqe **sqe)return false; } +bool io_get_secondary_sqe (struct io_ring_ctx *ctx, +const struct io_uring_sqe **sqe) +{ +return io_get_sqe (ctx, sqe); +} +int io_submit_sqes (struct io_ring_ctx *ctx,unsigned int nr) __must_hold(&ctx->uring_lock) {unsigned int entries =io_sqring_entries (ctx); -unsigned int left; +unsigned old_head = ctx->cached_sq_head; +unsigned int left =0 ;int ret;if (unlikely (!entries))return 0 ;/* make sure SQ entry isn't read before tail */ - ret = left =min3 (nr, ctx->sq_entries, entries); -io_get_task_refs (left); -io_submit_state_start (&ctx->submit_state, left); + ret =min3 (nr, ctx->sq_entries, entries); +io_get_task_refs (ret); +io_submit_state_start (&ctx->submit_state, ret); do { const struct io_uring_sqe *sqe;
@@ -2474,11 +2482,12 @@ int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr)*/ if (unlikely (io_submit_sqe (ctx, req, sqe)) && !(ctx->flags &IORING_SETUP_SUBMIT_ALL )) { - left--; + left =1 ;break ; } - }while (--left); + }while ((ctx->cached_sq_head - old_head) < ret); + left = ret - (ctx->cached_sq_head - old_head) - left;if (unlikely (left)) { ret -= left;/* try again if it submitted nothing and can't allocate a req */
io_uring/io_uring.h +2 -0
@@ -78,6 +78,8 @@ bool __io_alloc_req_refill(struct io_ring_ctx *ctx);bool io_match_task_safe (struct io_kiocb *head,struct task_struct *task,bool cancel_all); +bool io_get_secondary_sqe (struct io_ring_ctx *ctx, +const struct io_uring_sqe **sqe);int io_init_secondary_req (struct io_ring_ctx *ctx,struct io_kiocb *req,const struct io_uring_sqe *sqe);
Signature · 1 line
2.39.2
PATCH v5 4/16 io_uring: support OP_READ/OP_WRITE for fused secondary request
In reply to Ming LeiStart to allow fused secondary request to support OP_READ/OP_WRITE, and the buffer can be retrieved from the primary request.
Once the secondary request is completed, the primary request buffer will be returned back.
--- io_uring/opdef.c | 4 ++++ io_uring/rw.c | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+)
io_uring/opdef.c +4 -0
@@ -235,6 +235,8 @@ const struct io_issue_def io_issue_defs[] = { .ioprio = 1, .iopoll = 1, .iopoll_queue = 1, + .fused_secondary = 1, + .buf_dir = WRITE, .prep = io_prep_rw, .issue = io_read, },
@@ -248,6 +250,8 @@ const struct io_issue_def io_issue_defs[] = { .ioprio = 1, .iopoll = 1, .iopoll_queue = 1, + .fused_secondary = 1, + .buf_dir = READ, .prep = io_prep_rw, .issue = io_write, },
io_uring/rw.c +21 -0
@@ -19,6 +19,7 @@#include "kbuf.h" #include "rsrc.h" #include "rw.h" +#include "fused_cmd.h" struct io_rw {/* NOTE: kiocb has the file as the first member, so don't do it here */
@@ -371,6 +372,18 @@ static struct iovec *__io_import_iovec(int ddir, struct io_kiocb *req,size_t sqe_len;ssize_t ret; +/* +* fused_secondary OP passes buffer offset from sqe->addr actually, since +* the fused cmd buf's mapped start address is zero. +*/ +if (req->flags &REQ_F_FUSED_SECONDARY ) { + ret =io_import_buf_for_secondary (rw->addr, rw->len, ddir, + iter, req); +if (ret) +return ERR_PTR (ret); +return NULL ; + } +if (opcode ==IORING_OP_READ_FIXED || opcode ==IORING_OP_WRITE_FIXED ) { ret =io_import_fixed (ddir, iter, req->imu, rw->addr, rw->len);if (ret)
@@ -443,11 +456,19 @@ static inline loff_t *io_kiocb_ppos(struct kiocb *kiocb)*/ static ssize_t loop_rw_iter (int ddir,struct io_rw *rw,struct iov_iter *iter) { +struct io_kiocb *req =cmd_to_io_kiocb (rw);struct kiocb *kiocb = &rw->kiocb;struct file *file = kiocb->ki_filp;ssize_t ret =0 ;loff_t *ppos; +/* +* Fused secondary req hasn't user buffer, so ->read/->write can't +* be supported +*/ +if (req->flags &REQ_F_FUSED_SECONDARY ) +return -EOPNOTSUPP ; +/* * Don't support polled IO through this interface, and we can't * support non-blocking either. For the latter, this just causes
Signature · 1 line
2.39.2
PATCH v5 5/16 io_uring: support OP_SEND_ZC/OP_RECV for fused secondary request
In reply to Ming LeiStart to allow fused secondary request to support OP_SEND_ZC/OP_RECV, and the buffer can be retrieved from primary request.
Once the secondary request is completed, the primary buffer will be returned back.
--- io_uring/net.c | 30 ++++++++++++++++++++++++++++-- io_uring/opdef.c | 6 ++++++ 2 files changed, 34 insertions(+), 2 deletions(-)
io_uring/net.c +28 -2
@@ -16,6 +16,7 @@#include "net.h" #include "notif.h" #include "rsrc.h" +#include "fused_cmd.h" #if defined(CONFIG_NET ) struct io_shutdown {
@@ -69,6 +70,13 @@ struct io_sr_msg {struct io_kiocb *notif; }; +#define user_ptr_to_u64 (x) ( \ +{ \ + typecheck(void __user *, (x)); \ + (u64)(unsigned long)(x); \ +} \ +) +static inline bool io_check_multishot (struct io_kiocb *req,unsigned int issue_flags) {
@@ -379,7 +387,11 @@ int io_send(struct io_kiocb *req, unsigned int issue_flags)if (unlikely (!sock))return -ENOTSOCK ; - ret =import_ubuf (ITER_SOURCE , sr->buf, sr->len, &msg.msg_iter); +if (!(req->flags &REQ_F_FUSED_SECONDARY )) + ret =import_ubuf (ITER_SOURCE , sr->buf, sr->len, &msg.msg_iter); +else + ret =io_import_buf_for_secondary (user_ptr_to_u64 (sr->buf), + sr->len,ITER_SOURCE , &msg.msg_iter, req);if (unlikely (ret))return ret;
@@ -870,7 +882,11 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags) sr->buf = buf; } - ret =import_ubuf (ITER_DEST , sr->buf, len, &msg.msg_iter); +if (!(req->flags &REQ_F_FUSED_SECONDARY )) + ret =import_ubuf (ITER_DEST , sr->buf, len, &msg.msg_iter); +else + ret =io_import_buf_for_secondary (user_ptr_to_u64 (sr->buf), + sr->len,ITER_DEST , &msg.msg_iter, req);if (unlikely (ret)) goto out_free;
@@ -984,6 +1000,9 @@ int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)if (zc->flags &IORING_RECVSEND_FIXED_BUF ) {unsigned idx =READ_ONCE (sqe->buf_index); +if (req->flags &REQ_F_FUSED_SECONDARY ) +return -EINVAL ; +if (unlikely (idx >= ctx->nr_user_bufs))return -EFAULT ; idx =array_index_nospec (idx, ctx->nr_user_bufs);
@@ -1120,8 +1139,15 @@ int io_send_zc(struct io_kiocb *req, unsigned int issue_flags)if (unlikely (ret))return ret; msg.sg_from_iter = io_sg_from_iter; + }else if (req->flags &REQ_F_FUSED_SECONDARY ) { + ret =io_import_buf_for_secondary (user_ptr_to_u64 (zc->buf), + zc->len,ITER_SOURCE , &msg.msg_iter, req); +if (unlikely (ret)) +return ret; + msg.sg_from_iter = io_sg_from_iter; }else {io_notif_set_extended (zc->notif); + ret =import_ubuf (ITER_SOURCE , zc->buf, zc->len, &msg.msg_iter);if (unlikely (ret))return ret;
io_uring/opdef.c +6 -0
@@ -273,6 +273,8 @@ const struct io_issue_def io_issue_defs[] = { .audit_skip = 1, .ioprio = 1, .manual_alloc = 1, + .fused_secondary = 1, + .buf_dir = READ,#if defined(CONFIG_NET ) .prep = io_sendmsg_prep, .issue = io_send,
@@ -287,6 +289,8 @@ const struct io_issue_def io_issue_defs[] = { .buffer_select = 1, .audit_skip = 1, .ioprio = 1, + .fused_secondary = 1, + .buf_dir = WRITE,#if defined(CONFIG_NET ) .prep = io_recvmsg_prep, .issue = io_recv,
@@ -413,6 +417,8 @@ const struct io_issue_def io_issue_defs[] = { .audit_skip = 1, .ioprio = 1, .manual_alloc = 1, + .fused_secondary = 1, + .buf_dir = READ,#if defined(CONFIG_NET ) .prep = io_send_zc_prep, .issue = io_send_zc,
Signature · 1 line
2.39.2
PATCH v5 6/16 block: ublk_drv: add common exit handling
In reply to Ming LeiSimplify exit handling a bit, and prepare for supporting fused command.
--- drivers/block/ublk_drv.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/block/ublk_drv.c +9 -6
@@ -655,14 +655,15 @@ static void ublk_complete_rq(struct request *req)struct ublk_queue *ubq = req->mq_hctx->driver_data;struct ublk_io *io = &ubq->ios[req->tag];unsigned int unmapped_bytes; +blk_status_t res =BLK_STS_OK ;/* failed read IO if nothing is read */ if (!io->res &&req_op (req) ==REQ_OP_READ ) io->res = -EIO ;if (io->res <0 ) { -blk_mq_end_request (req,errno_to_blk_status (io->res)); -return ; + res =errno_to_blk_status (io->res); + goto exit; }/*
@@ -671,10 +672,8 @@ static void ublk_complete_rq(struct request *req)* * Both the two needn't unmap. */ -if (req_op (req) !=REQ_OP_READ &&req_op (req) !=REQ_OP_WRITE ) { -blk_mq_end_request (req,BLK_STS_OK ); -return ; - } +if (req_op (req) !=REQ_OP_READ &&req_op (req) !=REQ_OP_WRITE ) + goto exit;/* for READ request, writing data in iod->addr to rq buffers */ unmapped_bytes =ublk_unmap_io (ubq, req, io);
@@ -691,6 +690,10 @@ static void ublk_complete_rq(struct request *req)blk_mq_requeue_request (req, true); else__blk_mq_end_request (req ,BLK_STS_OK ); + +return ; +exit: +blk_mq_end_request (req, res); }/*
Signature · 1 line
2.39.2
PATCH v5 7/16 block: ublk_drv: don't consider flush request in map/unmap io
In reply to Ming LeiThere isn't data in request of REQ_OP_FLUSH always, so don't consider it in both ublk_map_io() and ublk_unmap_io().
--- drivers/block/ublk_drv.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/block/ublk_drv.c +3 -7
@@ -529,15 +529,13 @@ static int ublk_map_io(const struct ublk_queue *ubq, const struct request *req, struct ublk_io *io) {const unsigned int rq_bytes =blk_rq_bytes (req); +/* * no zero copy, we delay copy WRITE request data into ublksrv * context and the big benefit is that pinning pages in current * context is pretty fast, see ublk_pin_user_pages */ -if (req_op (req) !=REQ_OP_WRITE &&req_op (req) !=REQ_OP_FLUSH ) -return rq_bytes; - -if (ublk_rq_has_data (req)) { +if (ublk_rq_has_data (req) &&req_op (req) ==REQ_OP_WRITE ) {struct ublk_map_data data = { .ubq = ubq, .rq = req,
@@ -774,9 +772,7 @@ static inline void __ublk_rq_task_work(struct request *req,return ; } -if (ublk_need_get_data (ubq) && - (req_op (req) ==REQ_OP_WRITE || -req_op (req) ==REQ_OP_FLUSH )) { +if (ublk_need_get_data (ubq) && (req_op (req) ==REQ_OP_WRITE )) {/* * We have not handled UBLK_IO_NEED_GET_DATA command yet, * so immepdately pass UBLK_IO_RES_NEED_GET_DATA to ublksrv
Signature · 1 line
2.39.2
PATCH v5 8/16 block: ublk_drv: add two helpers to clean up map/unmap request
In reply to Ming LeiAdd two helpers for checking if map/unmap is needed, since we may have passthrough request which needs map or unmap in future, such as for supporting report zones.
Meantime don't mark ublk_copy_user_pages as inline since this function is a bit fat now.
--- drivers/block/ublk_drv.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/block/ublk_drv.c +14 -5
@@ -488,8 +488,7 @@ static inline unsigned ublk_copy_io_pages(struct ublk_io_iter *data,return done; } -static inline int ublk_copy_user_pages (struct ublk_map_data *data, -bool to_vm) +static int ublk_copy_user_pages (struct ublk_map_data *data,bool to_vm) {const unsigned int gup_flags = to_vm ?FOLL_WRITE :0 ;const unsigned long start_vm = data->io->addr;
@@ -525,6 +524,16 @@ static inline int ublk_copy_user_pages(struct ublk_map_data *data,return done; } +static inline bool ublk_need_map_req (const struct request *req) +{ +return ublk_rq_has_data (req) &&req_op (req) ==REQ_OP_WRITE ; +} + +static inline bool ublk_need_unmap_req (const struct request *req) +{ +return ublk_rq_has_data (req) &&req_op (req) ==REQ_OP_READ ; +} +static int ublk_map_io (const struct ublk_queue *ubq,const struct request *req,struct ublk_io *io) {
@@ -535,7 +544,7 @@ static int ublk_map_io(const struct ublk_queue *ubq, const struct request *req,* context and the big benefit is that pinning pages in current * context is pretty fast, see ublk_pin_user_pages */ -if (ublk_rq_has_data (req) &&req_op (req) ==REQ_OP_WRITE ) { +if (ublk_need_map_req (req)) {struct ublk_map_data data = { .ubq = ubq, .rq = req,
@@ -556,7 +565,7 @@ static int ublk_unmap_io(const struct ublk_queue *ubq, {const unsigned int rq_bytes =blk_rq_bytes (req); -if (req_op (req) ==REQ_OP_READ &&ublk_rq_has_data (req)) { +if (ublk_need_unmap_req (req)) {struct ublk_map_data data = { .ubq = ubq, .rq = req,
@@ -772,7 +781,7 @@ static inline void __ublk_rq_task_work(struct request *req,return ; } -if (ublk_need_get_data (ubq) && (req_op (req) ==REQ_OP_WRITE )) { +if (ublk_need_get_data (ubq) &&ublk_need_map_req (req)) {/* * We have not handled UBLK_IO_NEED_GET_DATA command yet, * so immepdately pass UBLK_IO_RES_NEED_GET_DATA to ublksrv
Signature · 1 line
2.39.2
PATCH v5 9/16 block: ublk_drv: clean up several helpers
In reply to Ming LeiConvert the following pattern in several helpers
if (Z) return true return false into: return Z;
--- drivers/block/ublk_drv.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
drivers/block/ublk_drv.c +5 -13
@@ -298,9 +298,7 @@ static inline bool ublk_can_use_task_work(const struct ublk_queue *ubq)static inline bool ublk_need_get_data (const struct ublk_queue *ubq) { -if (ubq->flags &UBLK_F_NEED_GET_DATA ) -return true; -return false; +return ubq->flags &UBLK_F_NEED_GET_DATA ; }static struct ublk_device *ublk_get_device (struct ublk_device *ub)
@@ -349,25 +347,19 @@ static inline int ublk_queue_cmd_buf_size(struct ublk_device *ub, int q_id)static inline bool ublk_queue_can_use_recovery_reissue (struct ublk_queue *ubq) { -if ((ubq->flags &UBLK_F_USER_RECOVERY ) && - (ubq->flags &UBLK_F_USER_RECOVERY_REISSUE )) -return true; -return false; +return (ubq->flags &UBLK_F_USER_RECOVERY ) && + (ubq->flags &UBLK_F_USER_RECOVERY_REISSUE ); }static inline bool ublk_queue_can_use_recovery (struct ublk_queue *ubq) { -if (ubq->flags &UBLK_F_USER_RECOVERY ) -return true; -return false; +return ubq->flags &UBLK_F_USER_RECOVERY ; }static inline bool ublk_can_use_recovery (struct ublk_device *ub) { -if (ub->dev_info.flags &UBLK_F_USER_RECOVERY ) -return true; -return false; +return ub->dev_info.flags &UBLK_F_USER_RECOVERY ; }static void ublk_free_disk (struct gendisk *disk)
Signature · 1 line
2.39.2
PATCH v5 10/16 block: ublk_drv: cleanup 'struct ublk_map_data'
In reply to Ming Lei'struct ublk_map_data' is passed to ublk_copy_user_pages() for copying data between userspace buffer and request pages.
Here what matters is userspace buffer address/len and 'struct request', so replace ->io field with user buffer address, and rename max_bytes as len.
Meantime remove 'ubq' field from ublk_map_data, since it isn't used any more.
Then code becomes more readable.
--- drivers/block/ublk_drv.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-)
drivers/block/ublk_drv.c +12 -15
@@ -420,10 +420,9 @@ static const struct block_device_operations ub_fops = {#define UBLK_MAX_PIN_PAGES 32struct ublk_map_data { -const struct ublk_queue *ubq;const struct request *rq; -const struct ublk_io *io; -unsigned max_bytes; +unsigned long ubuf; +unsigned int len; };struct ublk_io_iter {
@@ -483,14 +482,14 @@ static inline unsigned ublk_copy_io_pages(struct ublk_io_iter *data,static int ublk_copy_user_pages (struct ublk_map_data *data,bool to_vm) {const unsigned int gup_flags = to_vm ?FOLL_WRITE :0 ; -const unsigned long start_vm = data->io->addr; +const unsigned long start_vm = data->ubuf;unsigned int done =0 ;struct ublk_io_iter iter = { .pg_off = start_vm & (PAGE_SIZE -1 ), .bio = data->rq->bio, .iter = data->rq->bio->bi_iter, }; -const unsigned int nr_pages =round_up (data->max_bytes + +const unsigned int nr_pages =round_up (data->len + (start_vm & (PAGE_SIZE -1 )),PAGE_SIZE ) >>PAGE_SHIFT ;while (done < nr_pages) {
@@ -503,13 +502,13 @@ static int ublk_copy_user_pages(struct ublk_map_data *data, bool to_vm) iter.pages);if (iter.nr_pages <=0 )return done ==0 ? iter.nr_pages : done; - len =ublk_copy_io_pages (&iter, data->max_bytes, to_vm); + len =ublk_copy_io_pages (&iter, data->len, to_vm);for (i =0 ; i < iter.nr_pages; i++) {if (to_vm)set_page_dirty (iter.pages[i]);put_page (iter.pages[i]); } - data->max_bytes -= len; + data->len -= len; done += iter.nr_pages; }
@@ -538,15 +537,14 @@ static int ublk_map_io(const struct ublk_queue *ubq, const struct request *req,*/ if (ublk_need_map_req (req)) {struct ublk_map_data data = { - .ubq = ubq, .rq = req, - .io = io, - .max_bytes = rq_bytes, + .ubuf = io->addr, + .len = rq_bytes, };ublk_copy_user_pages (&data, true); -return rq_bytes - data.max_bytes; +return rq_bytes - data.len; }return rq_bytes; }
@@ -559,17 +557,16 @@ static int ublk_unmap_io(const struct ublk_queue *ubq,if (ublk_need_unmap_req (req)) {struct ublk_map_data data = { - .ubq = ubq, .rq = req, - .io = io, - .max_bytes = io->res, + .ubuf = io->addr, + .len = io->res, };WARN_ON_ONCE (io->res > rq_bytes);ublk_copy_user_pages (&data, false); -return io->res - data.max_bytes; +return io->res - data.len; }return rq_bytes; }
Signature · 1 line
2.39.2
PATCH v5 11/16 block: ublk_drv: cleanup ublk_copy_user_pages
In reply to Ming LeiClean up ublk_copy_user_pages() by using iov iter, and code gets simplified a lot and becomes much more readable than before.
--- drivers/block/ublk_drv.c | 112 +++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 63 deletions(-)
drivers/block/ublk_drv.c +49 -63
@@ -419,49 +419,39 @@ static const struct block_device_operations ub_fops = {#define UBLK_MAX_PIN_PAGES 32 -struct ublk_map_data { -const struct request *rq; -unsigned long ubuf; -unsigned int len; -}; -struct ublk_io_iter {struct page *pages[UBLK_MAX_PIN_PAGES ]; -unsigned pg_off;/* offset in the 1st page in pages */ -int nr_pages;/* how many page pointers in pages */ struct bio *bio;struct bvec_iter iter; }; -static inline unsigned ublk_copy_io_pages (struct ublk_io_iter *data, -unsigned max_bytes,bool to_vm) +/* return how many pages are copied */ +static void ublk_copy_io_pages (struct ublk_io_iter *data, +size_t total,size_t pg_off,int dir) { -const unsigned total =min_t (unsigned, max_bytes, -PAGE_SIZE - data->pg_off + - ((data->nr_pages -1 ) <<PAGE_SHIFT ));unsigned done =0 ;unsigned pg_idx =0 ;while (done < total) {struct bio_vec bv =bio_iter_iovec (data->bio, data->iter); -const unsigned int bytes =min3 (bv.bv_len, total - done, - (unsigned )(PAGE_SIZE - data->pg_off)); +unsigned int bytes =min3 (bv.bv_len, (unsigned )total - done, + (unsigned )(PAGE_SIZE - pg_off));void *bv_buf =bvec_kmap_local (&bv);void *pg_buf =kmap_local_page (data->pages[pg_idx]); -if (to_vm) -memcpy (pg_buf + data->pg_off, bv_buf, bytes); +if (dir ==ITER_DEST ) +memcpy (pg_buf + pg_off, bv_buf, bytes);else -memcpy (bv_buf, pg_buf + data->pg_off, bytes); +memcpy (bv_buf, pg_buf + pg_off, bytes);kunmap_local (pg_buf);kunmap_local (bv_buf);/* advance page array */ - data->pg_off += bytes; -if (data->pg_off ==PAGE_SIZE ) { + pg_off += bytes; +if (pg_off ==PAGE_SIZE ) { pg_idx +=1 ; - data->pg_off =0 ; + pg_off =0 ; } done += bytes;
@@ -475,41 +465,40 @@ static inline unsigned ublk_copy_io_pages(struct ublk_io_iter *data, data->iter = data->bio->bi_iter; } } - -return done; } -static int ublk_copy_user_pages (struct ublk_map_data *data,bool to_vm) +/* +* Copy data between request pages and io_iter, and 'offset' +* is the start point of linear offset of request. +*/ +static size_t ublk_copy_user_pages (const struct request *req, +struct iov_iter *uiter,int dir) { -const unsigned int gup_flags = to_vm ?FOLL_WRITE :0 ; -const unsigned long start_vm = data->ubuf; -unsigned int done =0 ;struct ublk_io_iter iter = { - .pg_off = start_vm & (PAGE_SIZE -1 ), - .bio = data->rq->bio, - .iter = data->rq->bio->bi_iter, + .bio = req->bio, + .iter = req->bio->bi_iter, }; -const unsigned int nr_pages =round_up (data->len + - (start_vm & (PAGE_SIZE -1 )),PAGE_SIZE ) >>PAGE_SHIFT ; - -while (done < nr_pages) { -const unsigned to_pin =min_t (unsigned,UBLK_MAX_PIN_PAGES , - nr_pages - done); -unsigned i, len; - - iter.nr_pages =get_user_pages_fast (start_vm + - (done <<PAGE_SHIFT ), to_pin, gup_flags, - iter.pages); -if (iter.nr_pages <=0 ) -return done ==0 ? iter.nr_pages : done; - len =ublk_copy_io_pages (&iter, data->len, to_vm); -for (i =0 ; i < iter.nr_pages; i++) { -if (to_vm) +size_t done =0 ; + +while (iov_iter_count (uiter) && iter.bio) { +unsigned nr_pages; +size_t len, off; +int i; + + len =iov_iter_get_pages2 (uiter, iter.pages, +iov_iter_count (uiter), +UBLK_MAX_PIN_PAGES , &off); +if (len <=0 ) +return done; + +ublk_copy_io_pages (&iter, len, off, dir); + nr_pages =DIV_ROUND_UP (len + off,PAGE_SIZE ); +for (i =0 ; i < nr_pages; i++) { +if (dir ==ITER_DEST )set_page_dirty (iter.pages[i]);put_page (iter.pages[i]); } - data->len -= len; - done += iter.nr_pages; + done += len; }return done;
@@ -536,15 +525,14 @@ static int ublk_map_io(const struct ublk_queue *ubq, const struct request *req,* context is pretty fast, see ublk_pin_user_pages */ if (ublk_need_map_req (req)) { -struct ublk_map_data data = { - .rq = req, - .ubuf = io->addr, - .len = rq_bytes, - }; +struct iov_iter iter; +struct iovec iov; +const int dir =ITER_DEST ; -ublk_copy_user_pages (&data, true); +import_single_range (dir,u64_to_user_ptr (io->addr), rq_bytes, + &iov, &iter); -return rq_bytes - data.len; +return ublk_copy_user_pages (req, &iter, dir); }return rq_bytes; }
@@ -556,17 +544,15 @@ static int ublk_unmap_io(const struct ublk_queue *ubq,const unsigned int rq_bytes =blk_rq_bytes (req);if (ublk_need_unmap_req (req)) { -struct ublk_map_data data = { - .rq = req, - .ubuf = io->addr, - .len = io->res, - }; +struct iov_iter iter; +struct iovec iov; +const int dir =ITER_SOURCE ;WARN_ON_ONCE (io->res > rq_bytes); -ublk_copy_user_pages (&data, false); - -return io->res - data.len; +import_single_range (dir,u64_to_user_ptr (io->addr), io->res, + &iov, &iter); +return ublk_copy_user_pages (req, &iter, dir); }return rq_bytes; }
Signature · 1 line
2.39.2
PATCH v5 12/16 block: ublk_drv: grab request reference when the request is handled by userspace
In reply to Ming LeiAdd one reference counter into request pdu data, and hold this reference in the request's lifetime. This way is always safe. In theory, the ublk request won't be completed until fused commands are done. However, it is userspace, and application can submit fused command at will.
Prepare for supporting zero copy, which needs to retrieve request buffer by fused command, so we have to guarantee:
- the fused command can't succeed unless the request isn't queued
- when any fused command is successful, this request can't be freed until all fused commands on this request are done.
--- drivers/block/ublk_drv.c | 67 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 3 deletions(-)
drivers/block/ublk_drv.c +64 -3
@@ -43,6 +43,7 @@#include <asm/page.h> #include <linux/task_work.h> #include <linux/namei.h> +#include <linux/kref.h> #include <uapi/linux/ublk_cmd.h> #define UBLK_MINORS (1U << MINORBITS)
@@ -62,6 +63,17 @@struct ublk_rq_data {struct llist_node node;struct callback_head work; + +/* +* Only for applying fused command to support zero copy: +* +* - if there is any fused command aiming at this request, not complete +* request until all fused commands are done +* +* - fused command has to fail unless this reference is grabbed +* successfully +*/ +struct kref ref; };struct ublk_uring_cmd_pdu {
@@ -180,6 +192,9 @@ struct ublk_params_header {__u32 types; }; +static inline void __ublk_complete_rq (struct request *req); +static void ublk_complete_rq (struct kref *ref); +static dev_t ublk_chr_devt;static struct class *ublk_chr_class;
@@ -288,6 +303,35 @@ static int ublk_apply_params(struct ublk_device *ub)return 0 ; } +static inline bool ublk_support_zc (const struct ublk_queue *ubq) +{ +return ubq->flags &UBLK_F_SUPPORT_ZERO_COPY ; +} + +static inline bool ublk_get_req_ref (const struct ublk_queue *ubq, +struct request *req) +{ +if (ublk_support_zc (ubq)) { +struct ublk_rq_data *data =blk_mq_rq_to_pdu (req); + +return kref_get_unless_zero (&data->ref); + } + +return true; +} + +static inline void ublk_put_req_ref (const struct ublk_queue *ubq, +struct request *req) +{ +if (ublk_support_zc (ubq)) { +struct ublk_rq_data *data =blk_mq_rq_to_pdu (req); + +kref_put (&data->ref, ublk_complete_rq); + }else { +__ublk_complete_rq (req); + } +} +static inline bool ublk_can_use_task_work (const struct ublk_queue *ubq) { if (IS_BUILTIN(CONFIG_BLK_DEV_UBLK) &&
@@ -632,13 +676,19 @@ static inline bool ubq_daemon_is_dying(struct ublk_queue *ubq) }/* todo: handle partial completion */ -static void ublk_complete_rq (struct request *req) +static inline void __ublk_complete_rq (struct request *req) {struct ublk_queue *ubq = req->mq_hctx->driver_data;struct ublk_io *io = &ubq->ios[req->tag];unsigned int unmapped_bytes;blk_status_t res =BLK_STS_OK ; +/* called from ublk_abort_queue() code path */ +if (io->flags &UBLK_IO_FLAG_ABORTED ) { + res =BLK_STS_IOERR ; + goto exit; + } +/* failed read IO if nothing is read */ if (!io->res &&req_op (req) ==REQ_OP_READ ) io->res = -EIO ;
@@ -678,6 +728,15 @@ static void ublk_complete_rq(struct request *req)blk_mq_end_request (req, res); } +static void ublk_complete_rq (struct kref *ref) +{ + struct ublk_rq_data *data = container_of(ref, struct ublk_rq_data, + ref); +struct request *req =blk_mq_rq_from_pdu (data); + +__ublk_complete_rq (req); +} +/* * Since __ublk_rq_task_work always fails requests immediately during * exiting, __ublk_fail_req() is only called from abort context during
@@ -696,7 +755,7 @@ static void __ublk_fail_req(struct ublk_queue *ubq, struct ublk_io *io,if (ublk_queue_can_use_recovery_reissue (ubq))blk_mq_requeue_request (req, false);else -blk_mq_end_request (req,BLK_STS_IOERR ); +ublk_put_req_ref (ubq, req); } }
@@ -734,6 +793,7 @@ static inline void __ublk_rq_task_work(struct request *req, unsigned issue_flags) {struct ublk_queue *ubq = req->mq_hctx->driver_data; +struct ublk_rq_data *data =blk_mq_rq_to_pdu (req);int tag = req->tag;struct ublk_io *io = &ubq->ios[tag];unsigned int mapped_bytes;
@@ -805,6 +865,7 @@ static inline void __ublk_rq_task_work(struct request *req, mapped_bytes >>9 ; } +kref_init (&data->ref);ubq_complete_io_cmd (io,UBLK_IO_RES_OK , issue_flags); }
@@ -1017,7 +1078,7 @@ static void ublk_commit_completion(struct ublk_device *ub, req =blk_mq_tag_to_rq (ub->tag_set.tags[qid], tag);if (req &&likely (!blk_should_fake_timeout (req->q))) -ublk_complete_rq (req); +ublk_put_req_ref (ubq, req); }/*
Signature · 1 line
2.39.2
PATCH v5 13/16 block: ublk_drv: support to copy any part of request pages
In reply to Ming LeiAdd 'offset' to 'struct ublk_map_data', so that ublk_copy_user_pages() can be used to copy any sub-buffer(linear mapped) of the request.
--- drivers/block/ublk_drv.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-)
drivers/block/ublk_drv.c +24 -7
@@ -511,19 +511,36 @@ static void ublk_copy_io_pages(struct ublk_io_iter *data, } } +static bool ublk_advance_io_iter (const struct request *req, +struct ublk_io_iter *iter,unsigned int offset) +{ +struct bio *bio = req->bio; + +for_each_bio (bio) { +if (bio->bi_iter.bi_size > offset) { + iter->bio = bio; + iter->iter = bio->bi_iter; +bio_advance_iter (iter->bio, &iter->iter, offset); +return true; + } + offset -= bio->bi_iter.bi_size; + } +return false; +} +/* * Copy data between request pages and io_iter, and 'offset' * is the start point of linear offset of request. */ static size_t ublk_copy_user_pages (const struct request *req, -struct iov_iter *uiter,int dir) +unsigned offset,struct iov_iter *uiter,int dir) { -struct ublk_io_iter iter = { - .bio = req->bio, - .iter = req->bio->bi_iter, - }; +struct ublk_io_iter iter;size_t done =0 ; +if (!ublk_advance_io_iter (req, &iter, offset)) +return 0 ; +while (iov_iter_count (uiter) && iter.bio) {unsigned nr_pages;size_t len, off;
@@ -576,7 +593,7 @@ static int ublk_map_io(const struct ublk_queue *ubq, const struct request *req,import_single_range (dir,u64_to_user_ptr (io->addr), rq_bytes, &iov, &iter); -return ublk_copy_user_pages (req, &iter, dir); +return ublk_copy_user_pages (req,0 , &iter, dir); }return rq_bytes; }
@@ -596,7 +613,7 @@ static int ublk_unmap_io(const struct ublk_queue *ubq,import_single_range (dir,u64_to_user_ptr (io->addr), io->res, &iov, &iter); -return ublk_copy_user_pages (req, &iter, dir); +return ublk_copy_user_pages (req,0 , &iter, dir); }return rq_bytes; }
Signature · 1 line
2.39.2
PATCH v5 14/16 block: ublk_drv: add read()/write() support for ublk char device
In reply to Ming LeiWe are going to support zero copy by fused uring command, the userspace can't read from or write to the io buffer any more, it becomes not flexible for applications:
1) some targets need to zero buffer explicitly, such as when reading unmapped qcow2 cluster
2) some targets need to support passthrough command, such as zoned report zones, and still need to read/write the io buffer
Support pread()/pwrite() on ublk char device for reading/writing request io buffer, so ublk server can handle the above cases easily.
This also can help to make zero copy becoming the primary option, and non-zero-copy will become legacy code path since the added read()/write() can cover non-zero-copy feature.
--- drivers/block/ublk_drv.c | 131 ++++++++++++++++++++++++++++++++++ include/uapi/linux/ublk_cmd.h | 31 +++++++- 2 files changed, 161 insertions(+), 1 deletion(-)
drivers/block/ublk_drv.c +131 -0
@@ -1322,6 +1322,36 @@ static void ublk_handle_need_get_data(struct ublk_device *ub, int q_id,ublk_queue_cmd (ubq, req); } +static inline struct request *__ublk_check_and_get_req (struct ublk_device *ub, +struct ublk_queue *ubq,int tag,size_t offset) +{ +struct request *req; + +if (!ublk_support_zc (ubq)) +return NULL ; + + req =blk_mq_tag_to_rq (ub->tag_set.tags[ubq->q_id], tag); +if (!req) +return NULL ; + +if (!ublk_get_req_ref (ubq, req)) +return NULL ; + +if (unlikely (!blk_mq_request_started (req) || req->tag != tag)) + goto fail_put; + +if (!ublk_rq_has_data (req)) + goto fail_put; + +if (offset >blk_rq_bytes (req)) + goto fail_put; + +return req; +fail_put: +ublk_put_req_ref (ubq, req); +return NULL ; +} +static int ublk_ch_uring_cmd (struct io_uring_cmd *cmd,unsigned int issue_flags) {struct ublksrv_io_cmd *ub_cmd = (struct ublksrv_io_cmd *)cmd->cmd;
@@ -1423,11 +1453,112 @@ static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags)return -EIOCBQUEUED ; } +static inline bool ublk_check_ubuf_dir (const struct request *req, +int ubuf_dir) +{ +/* copy ubuf to request pages */ +if (req_op (req) ==REQ_OP_READ && ubuf_dir ==ITER_SOURCE ) +return true; + +/* copy request pages to ubuf */ +if (req_op (req) ==REQ_OP_WRITE && ubuf_dir ==ITER_DEST ) +return true; + +return false; +} + +static struct request *ublk_check_and_get_req (struct kiocb *iocb, +struct iov_iter *iter,size_t *off,int dir) +{ +struct ublk_device *ub = iocb->ki_filp->private_data; +struct ublk_queue *ubq; +struct request *req; +size_t buf_off; +u16 tag, q_id; + +if (!ub) +return ERR_PTR (-EACCES ); + +if (!user_backed_iter (iter)) +return ERR_PTR (-EACCES ); + +if (ub->dev_info.state ==UBLK_S_DEV_DEAD ) +return ERR_PTR (-EACCES ); + + tag =ublk_pos_to_tag (iocb->ki_pos); + q_id =ublk_pos_to_hwq (iocb->ki_pos); + buf_off =ublk_pos_to_buf_offset (iocb->ki_pos); + +if (q_id >= ub->dev_info.nr_hw_queues) +return ERR_PTR (-EINVAL ); + + ubq =ublk_get_queue (ub, q_id); +if (!ubq) +return ERR_PTR (-EINVAL ); + +if (tag >= ubq->q_depth) +return ERR_PTR (-EINVAL ); + + req =__ublk_check_and_get_req (ub, ubq, tag, buf_off); +if (!req) +return ERR_PTR (-EINVAL ); + +if (!req->mq_hctx || !req->mq_hctx->driver_data) + goto fail; + +if (!ublk_check_ubuf_dir (req, dir)) + goto fail; + + *off = buf_off; +return req; +fail: +ublk_put_req_ref (ubq, req); +return ERR_PTR (-EACCES ); +} + +static ssize_t ublk_ch_read_iter (struct kiocb *iocb,struct iov_iter *to) +{ +struct ublk_queue *ubq; +struct request *req; +size_t buf_off; +size_t ret; + + req =ublk_check_and_get_req (iocb, to, &buf_off,ITER_DEST ); +if (unlikely (IS_ERR (req))) +return PTR_ERR (req); + + ret =ublk_copy_user_pages (req, buf_off, to,ITER_DEST ); + ubq = req->mq_hctx->driver_data; +ublk_put_req_ref (ubq, req); + +return ret; +} + +static ssize_t ublk_ch_write_iter (struct kiocb *iocb,struct iov_iter *from) +{ +struct ublk_queue *ubq; +struct request *req; +size_t buf_off; +size_t ret; + + req =ublk_check_and_get_req (iocb, from, &buf_off,ITER_SOURCE ); +if (unlikely (IS_ERR (req))) +return PTR_ERR (req); + + ret =ublk_copy_user_pages (req, buf_off, from,ITER_SOURCE ); + ubq = req->mq_hctx->driver_data; +ublk_put_req_ref (ubq, req); + +return ret; +} +static const struct file_operations ublk_ch_fops = { .owner =THIS_MODULE , .open = ublk_ch_open, .release = ublk_ch_release, .llseek = no_llseek, + .read_iter = ublk_ch_read_iter, + .write_iter = ublk_ch_write_iter, .uring_cmd = ublk_ch_uring_cmd, .mmap = ublk_ch_mmap, };
include/uapi/linux/ublk_cmd.h +30 -1
@@ -54,7 +54,36 @@#define UBLKSRV_IO_BUF_OFFSET 0x80000000/* tag bit is 12bit, so at most 4096 IOs for each queue */ -#define UBLK_MAX_QUEUE_DEPTH 4096 +#define UBLK_TAG_BITS 12 +#define UBLK_MAX_QUEUE_DEPTH (1U << UBLK_TAG_BITS) + +/* used for locating each io buffer for pread()/pwrite() on char device */ +#define UBLK_BUFS_SIZE_BITS 42 +#define UBLK_BUFS_SIZE_MASK ((1ULL << UBLK_BUFS_SIZE_BITS) - 1) +#define UBLK_BUF_SIZE_BITS (UBLK_BUFS_SIZE_BITS - UBLK_TAG_BITS) +#define UBLK_BUF_MAX_SIZE (1ULL << UBLK_BUF_SIZE_BITS) + +static inline __u16 ublk_pos_to_hwq (__u64 pos) +{ +return pos >>UBLK_BUFS_SIZE_BITS ; +} + +static inline __u32 ublk_pos_to_buf_offset (__u64 pos) +{ +return (pos &UBLK_BUFS_SIZE_MASK ) & (UBLK_BUF_MAX_SIZE -1 ); +} + +static inline __u16 ublk_pos_to_tag (__u64 pos) +{ +return (pos &UBLK_BUFS_SIZE_MASK ) >>UBLK_BUF_SIZE_BITS ; +} + +/* offset of single buffer, which has to be < UBLK_BUX_MAX_SIZE */ +static inline __u64 ublk_pos (__u16 q_id,__u16 tag,__u32 offset) +{ +return (((__u64 )q_id) <<UBLK_BUFS_SIZE_BITS ) | + ((((__u64 )tag) <<UBLK_BUF_SIZE_BITS ) + offset); +}/* * zero copy requires 4k block size, and can remap ublk driver's io
Signature · 1 line
2.39.2
PATCH v5 15/16 block: ublk_drv: don't check buffer in case of zero copy
In reply to Ming LeiIn case of zero copy, ublk server needn't to pre-allocate IO buffer and provide it to driver more.
Meantime not set the buffer in case of zero copy any more, and the userspace can use pread()/pwrite() to read from/write to the io request buffer, which is easier & simpler from userspace viewpoint.
--- drivers/block/ublk_drv.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/block/ublk_drv.c +14 -9
@@ -1410,25 +1410,30 @@ static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags)if (io->flags &UBLK_IO_FLAG_OWNED_BY_SRV ) goto out;/* FETCH_RQ has to provide IO buffer if NEED GET DATA is not enabled */ -if (!ub_cmd->addr && !ublk_need_get_data (ubq)) - goto out; +if (!ublk_support_zc (ubq)) { +if (!ub_cmd->addr && !ublk_need_get_data (ubq)) + goto out; + io->addr = ub_cmd->addr; + } io->cmd = cmd; io->flags |=UBLK_IO_FLAG_ACTIVE ; - io->addr = ub_cmd->addr; -ublk_mark_io_ready (ub, ubq);break ;case UBLK_IO_COMMIT_AND_FETCH_REQ : req =blk_mq_tag_to_rq (ub->tag_set.tags[ub_cmd->q_id], tag); + +if (!(io->flags &UBLK_IO_FLAG_OWNED_BY_SRV )) + goto out;/* * COMMIT_AND_FETCH_REQ has to provide IO buffer if NEED GET DATA is * not enabled or it is Read IO. */ -if (!ub_cmd->addr && (!ublk_need_get_data (ubq) ||req_op (req) ==REQ_OP_READ )) - goto out; -if (!(io->flags &UBLK_IO_FLAG_OWNED_BY_SRV )) - goto out; - io->addr = ub_cmd->addr; +if (!ublk_support_zc (ubq)) { +if (!ub_cmd->addr && (!ublk_need_get_data (ubq) || +req_op (req) ==REQ_OP_READ )) + goto out; + io->addr = ub_cmd->addr; + } io->flags |=UBLK_IO_FLAG_ACTIVE ; io->cmd = cmd;ublk_commit_completion (ub, ub_cmd);
Signature · 1 line
2.39.2
PATCH v5 16/16 block: ublk_drv: apply io_uring FUSED_CMD for supporting zero copy
In reply to Ming LeiApply io_uring fused command for supporting zero copy:
1) init the fused cmd buffer(io_mapped_buf) in ublk_map_io(), and deinit it in ublk_unmap_io(), and this buffer is immutable, so it is just fine to retrieve it from concurrent fused command.
1) add sub-command opcode of UBLK_IO_FUSED_SUBMIT_IO for retrieving this fused cmd(zero copy) buffer
2) call io_fused_cmd_start_secondary_req() to provide buffer to secondary request and submit secondary request; meantime setup complete callback via this API, once secondary request is completed, the complete callback is called for freeing the buffer and completing the fused command
Also request reference is held during fused command lifetime, and this way guarantees that request buffer won't be freed until all inflight fused commands are completed.
userspace(only implement sqe128 fused command):
https://github.com/ming1/ubdsrv/tree/fused-cmd-zc-for-v5
liburing test(only implement normal sqe fused command: two 64byte SQEs)
https://github.com/ming1/liburing/tree/fused_cmd_miniublk_for_v5
--- Documentation/block/ublk.rst | 126 ++++++++++++++++++++-- drivers/block/ublk_drv.c | 192 ++++++++++++++++++++++++++++++++-- include/uapi/linux/ublk_cmd.h | 6 +- 3 files changed, 303 insertions(+), 21 deletions(-)
Documentation/block/ublk.rst +117 -9
@@ -297,18 +297,126 @@ with specified IO tag in the command data: ``UBLK_IO_COMMIT_AND_FETCH_REQ`` to the server, ublkdrv needs to copy the server buffer (pages) read to the IO request pages. -Future development -================== +- ``UBLK_IO_FUSED_SUBMIT_IO`` + + Used for implementing zero copy feature. + + It has to been the primary command of io_uring fused command. This command + submits the generic secondary IO request with io buffer provided by our primary + command, and won't be completed until the secondary request is done. + + The provided buffer is represented as ``io_uring_bvec_buf``, which is + actually ublk request buffer's reference, and the reference is shared & + read-only, so the generic secondary request can retrieve any part of the buffer + by passing buffer offset & length. Zero copy ---------- +========= + +What is zero copy? +------------------ + +When application submits IO to ``/dev/ublkb*``, userspace buffer(direct io) +or page cache buffer(buffered io) or kernel buffer(meta io often) is used +for submitting data to ublk driver, and all kinds of these buffers are +represented by bio/bvecs(ublk request buffer) finally. Before supporting +zero copy, data in these buffers has to be copied to ublk server userspace +buffer before handling WRITE IO, or after handing READ IO, so that ublk +server can handle IO for ``/dev/ublkb*`` with the copied data. + +The extra copy between ublk request buffer and ublk server userspace buffer +not only increases CPU utilization(such as pinning pages, copy data), but +also consumes memory bandwidth, and the cost could be very big when IO size +is big. It is observed that ublk-null IOPS may be increased to ~5X if the +extra copy can be avoided. + +So zero copy is very important for supporting high performance block device +in userspace. + +Technical requirements +---------------------- + +- ublk request buffer use + +ublk request buffer is represented by bio/bvec, which is immutable, so do +not try to change bvec via buffer reference; data can be read from or +written to the buffer according to buffer direction, but bvec can't be +changed + +- buffer lifetime + +Ublk server borrows ublk request buffer for handling ublk IO, ublk request +buffer reference is used. Reference can't outlive the referent buffer. That +means all request buffer references have to be released by ublk server +before ublk driver completes this request, when request buffer ownership +is transferred to upper layer(FS, application, ...). + +Also after ublk request is completed, any page belonging to this ublk +request can not be written or read any more from ublk server since it is +one block device from kernel viewpoint. + +- buffer direction + +For ublk WRITE request, ublk request buffer should only be accessed as data +source, and the buffer can't be written by ublk server + +For ublk READ request, ublk request buffer should only be accessed as data +destination, and the buffer can't be read by ublk server, otherwise kernel +data is leaked to ublk server, which can be unprivileged application. + +- arbitrary size sub-buffer needs to be retrieved from ublk server + +ublk is one generic framework for implementing block device in userspace, +and typical requirements include logical volume manager(mirror, stripped, ...), +distributed network storage, compressed target, ... + +ublk server needs to retrieve arbitrary size sub-buffer of ublk request, and +ublk server needs to submit IOs with these sub-buffer(s). That also means +arbitrary size sub-buffer(s) can be used to submit IO multiple times. + +Any sub-buffer is actually one reference of ublk request buffer, which +ownership can't be transferred to upper layer if any reference is held +by ublk server. + +Why slice isn't good for ublk zero copy +--------------------------------------- + +- spliced page from ->splice_read() can't be written + +ublk READ request can't be handled because spliced page can't be written to, and +extending splice for ublk zero copy isn't one good solution [#splice_extend]_ + +- it is very hard to meet above requirements wrt. request buffer lifetime + +splice/pipe focuses on page reference lifetime, but ublk zero copy pays more +attention to ublk request buffer lifetime. If is very inefficient to respect +request buffer lifetime by using all pipe buffer's ->release() which requires +all pipe buffers and pipe to be kept when ublk server handles IO. That means +one single dedicated ``pipe_inode_info`` has to be allocated runtime for each +provided buffer, and the pipe needs to be populated with pages in ublk request +buffer. + + +io_uring fused command based zero copy +-------------------------------------- + +io_uring fused command includes one primary command(uring command) and one +generic secondary request. The primary command is responsible for submitting +secondary request with provided buffer from ublk request, and primary command +won't be completed until the secondary request is completed. + +Typical ublk IO handling includes network and FS IO, so it is usual enough +for io_uring net & fs to support IO with provided buffer from primary command. -Zero copy is a generic requirement for nbd, fuse or similar drivers. A -problem [#xiaoguang]_ Xiaoguang mentioned is that pages mapped to userspace -can't be remapped any more in kernel with existing mm interfaces. This can -occurs when destining direct IO to ``/dev/ublkb*``. Also, he reported that -big requests (IO size >= 256 KB) may benefit a lot from zero copy. +Once primary command is submitted successfully, ublk driver guarantees that +the ublk request buffer won't be gone away since secondary request actually +grabs the buffer's reference. This way also guarantees that multiple +concurrent fused commands associated with same request buffer works fine, +as the provided buffer reference is shared & read-only. +Also buffer usage direction flag is passed to primary command from userspace, +so ublk driver can validate if it is legal to use buffer with requested +direction. References ==========
@@ -323,4 +431,4 @@ References .. [#stefan] https://lore.kernel.org/linux-block/[email protected]/ -.. [#xiaoguang] https://lore.kernel.org/linux-block/[email protected]/ +.. [#splice_extend] https://lore.kernel.org/linux-block/CAHk-=wgJsi7t7YYpuo6ewXGnHz2nmj67iWR6KPGoz5TBu34mWQ@mail.gmail.com/
drivers/block/ublk_drv.c +184 -8
282 lines not on this page · raw message
include/uapi/linux/ublk_cmd.h +2 -4
@@ -44,6 +44,7 @@#define UBLK_IO_FETCH_REQ 0x20#define UBLK_IO_COMMIT_AND_FETCH_REQ 0x21#define UBLK_IO_NEED_GET_DATA 0x22 +#define UBLK_IO_FUSED_SUBMIT_IO 0x23/* only ABORT means that no re-fetch */ #define UBLK_IO_RES_OK 0
@@ -85,10 +86,7 @@ static inline __u64 ublk_pos(__u16 q_id, __u16 tag, __u32 offset) ((((__u64 )tag) <<UBLK_BUF_SIZE_BITS ) + offset); } -/* -* zero copy requires 4k block size, and can remap ublk driver's io -* request into ublksrv's vm space -*/ +/* io_uring fused command based zero copy */ #define UBLK_F_SUPPORT_ZERO_COPY (1ULL << 0)/*
Signature · 1 line
2.39.2
Re: [PATCH V5 16/16] block: ublk_drv: apply io_uring FUSED_CMD for supporting zero copy
Quoted 2 lines · Ming Lei
Apply
io_uringfused command for supporting zero copy:
[...]
Quoted 4 lines
drivers/block/ublk_drv.c +0
-0@@ -1374,7 +1533,12 @@ static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags)if (!ubq || ub_cmd->q_id != ubq->q_id) goto out;
drivers/block/ublk_drv.c static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags) · line 1543
Quoted 10 lines
drivers/block/ublk_drv.c +6
-1-if (ubq->ubq_daemon && ubq->ubq_daemon != current) +/* +* The fused command reads the io buffer data structure only, so it +* is fine to be issued from other context. +*/ +if ((ubq->ubq_daemon && ubq->ubq_daemon != current) && + (cmd_op !=UBLK_IO_FUSED_SUBMIT_IO )) goto out;
Hi Ming,
What is your use case that fused io_uring cmd is issued from another thread? I think it is good practice to operate one io_uring instance in one thread only.
Regards,
Zhang
Re: [PATCH V5 16/16] block: ublk_drv: apply io_uring FUSED_CMD for supporting zero copy
Quoted 23 lines · Ziyang Zhang
Quoted 2 lines · Ming Lei
Apply
io_uringfused command for supporting zero copy:[...]
Quoted 4 lines
drivers/block/ublk_drv.c +0
-0@@ -1374,7 +1533,12 @@ static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags)if (!ubq || ub_cmd->q_id != ubq->q_id) goto out;drivers/block/ublk_drv.c static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags) · line 1543
Quoted 10 lines
drivers/block/ublk_drv.c +6
-1-if (ubq->ubq_daemon && ubq->ubq_daemon != current) +/* +* The fused command reads the io buffer data structure only, so it +* is fine to be issued from other context. +*/ +if ((ubq->ubq_daemon && ubq->ubq_daemon != current) && + (cmd_op !=UBLK_IO_FUSED_SUBMIT_IO )) goto out;Hi Ming,
Quoted 3 lines
What is your use case that fused
io_uringcmd is issued from another thread? I think it is good practice to operate oneio_uringinstance in one thread only.
So far we limit io command has to be issued from the queue context, which is still not friendly from userspace viewpoint, the reason is that we can't get io_uring exit notification and ublk's use case is very special since the queued io command may not be completed forever, see:
https://lore.kernel.org/linux-fsdevel/[email protected]/
I remember that people raised concern about this implementation.
But for normal IO, it could be issued from io wq simply because of link(dependency) or whatever, and userspace is still allowed to submit io from another pthread via same io_uring ctx.
thanks,
Ming
Re: [PATCH V5 16/16] block: ublk_drv: apply io_uring FUSED_CMD for supporting zero copy
Quoted 24 lines · Ming Lei
Quoted 23 lines · Ziyang Zhang
Quoted 2 lines · Ming Lei
Apply
io_uringfused command for supporting zero copy:[...]
Quoted 4 lines
drivers/block/ublk_drv.c +0
-0@@ -1374,7 +1533,12 @@ static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags)if (!ubq || ub_cmd->q_id != ubq->q_id) goto out;drivers/block/ublk_drv.c static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags) · line 1543
Quoted 10 lines
drivers/block/ublk_drv.c +6
-1-if (ubq->ubq_daemon && ubq->ubq_daemon != current) +/* +* The fused command reads the io buffer data structure only, so it +* is fine to be issued from other context. +*/ +if ((ubq->ubq_daemon && ubq->ubq_daemon != current) && + (cmd_op !=UBLK_IO_FUSED_SUBMIT_IO )) goto out;Hi Ming,
Quoted 8 lines
Quoted 3 lines
What is your use case that fused
io_uringcmd is issued from another thread? I think it is good practice to operate oneio_uringinstance in one thread only.So far we limit io command has to be issued from the queue context, which is still not friendly from userspace viewpoint, the reason is that we can't get
io_uringexit notification and ublk's use case is very special since the queued io command may not be completed forever,
OK, so UBLK_IO_FUSED_SUBMIT_IO is guaranteed to be completed because it is not queued. FETCH_REQ and COMMIT_AMD_FETCH are queued io commands and could not be completed forever so they have to be issued from ubq_daemon. Right?
BTW, maybe NEED_GET_DATA can be issued from other context...
Quoted 9 lines
see:
https://lore.kernel.org/linux-fsdevel/[email protected]/
I remember that people raised concern about this implementation.
But for normal IO, it could be issued from io wq simply because of link(dependency) or whatever, and userspace is still allowed to submit io from another pthread via same
io_uringctx.
Yes, we can submit to the same ctx from different pthread but lock may be required. IMO, users may only choose ubq_daemon as the only submitter.
Regards,
Zhang
Re: [PATCH V5 16/16] block: ublk_drv: apply io_uring FUSED_CMD for supporting zero copy
Quoted 29 lines · Ziyang Zhang
Quoted 28 lines · Ming Lei
Quoted 26 lines · Ziyang Zhang
Quoted 2 lines · Ming Lei
Apply
io_uringfused command for supporting zero copy:[...]
Quoted 4 lines
drivers/block/ublk_drv.c +0
-0@@ -1374,7 +1533,12 @@ static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags)if (!ubq || ub_cmd->q_id != ubq->q_id) goto out;drivers/block/ublk_drv.c static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags) · line 1543
Quoted 10 lines
drivers/block/ublk_drv.c +6
-1-if (ubq->ubq_daemon && ubq->ubq_daemon != current) +/* +* The fused command reads the io buffer data structure only, so it +* is fine to be issued from other context. +*/ +if ((ubq->ubq_daemon && ubq->ubq_daemon != current) && + (cmd_op !=UBLK_IO_FUSED_SUBMIT_IO )) goto out;Hi Ming,
What is your use case that fused
io_uringcmd is issued from another thread? I think it is good practice to operate oneio_uringinstance in one thread only.
Quoted 8 lines
Quoted 4 lines
So far we limit io command has to be issued from the queue context, which is still not friendly from userspace viewpoint, the reason is that we can't get
io_uringexit notification and ublk's use case is very special since the queued io command may not be completed forever,OK, so
UBLK_IO_FUSED_SUBMIT_IOis guaranteed to be completed because it is not queued.FETCH_REQandCOMMIT_AMD_FETCHare queued io commands and could not be completed forever so they have to be issued fromubq_daemon. Right?
Yeah, any io command should be issued from ubq daemon context.
Quoted 2 lines
BTW, maybe
NEED_GET_DATAcan be issued from other context...
So far it won't be supported.
As I mentioned in the link, if io_uring can provide io_uring exit callback, we may relax this limit.
Quoted 5 lines
Quoted 5 lines
see:
Quoted 7 lines
Quoted 5 lines
I remember that people raised concern about this implementation.
But for normal IO, it could be issued from io wq simply because of link(dependency) or whatever, and userspace is still allowed to submit io from another pthread via same
io_uringctx.Yes, we can submit to the same ctx from different pthread but lock may be required.
Right.
Quoted 1 line
IMO, users may only choose
ubq_daemonas the only submitter.
At least any io command should be issued from ubq daemon now, but normal io can be issued from any context.
Thanks,
Ming
Re: [PATCH V5 16/16] block: ublk_drv: apply io_uring FUSED_CMD for supporting zero copy
Quoted 42 lines · Ming Lei
Quoted 29 lines · Ziyang Zhang
Quoted 28 lines · Ming Lei
Quoted 26 lines · Ziyang Zhang
Quoted 2 lines · Ming Lei
Apply
io_uringfused command for supporting zero copy:[...]
Quoted 4 lines
drivers/block/ublk_drv.c +0
-0@@ -1374,7 +1533,12 @@ static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags)if (!ubq || ub_cmd->q_id != ubq->q_id) goto out;drivers/block/ublk_drv.c static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags) · line 1543
Quoted 10 lines
drivers/block/ublk_drv.c +6
-1-if (ubq->ubq_daemon && ubq->ubq_daemon != current) +/* +* The fused command reads the io buffer data structure only, so it +* is fine to be issued from other context. +*/ +if ((ubq->ubq_daemon && ubq->ubq_daemon != current) && + (cmd_op !=UBLK_IO_FUSED_SUBMIT_IO )) goto out;Hi Ming,
What is your use case that fused
io_uringcmd is issued from another thread? I think it is good practice to operate oneio_uringinstance in one thread only.Quoted 8 lines
Quoted 4 lines
So far we limit io command has to be issued from the queue context, which is still not friendly from userspace viewpoint, the reason is that we can't get
io_uringexit notification and ublk's use case is very special since the queued io command may not be completed forever,OK, so
UBLK_IO_FUSED_SUBMIT_IOis guaranteed to be completed because it is not queued.FETCH_REQandCOMMIT_AMD_FETCHare queued io commands and could not be completed forever so they have to be issued fromubq_daemon. Right?Yeah, any io command should be issued from ubq daemon context.
Quoted 1 line
Quoted 7 lines
Quoted 1 line
BTW, maybe
NEED_GET_DATAcan be issued from other context...So far it won't be supported.
As I mentioned in the link, if
io_uringcan provideio_uringexit callback, we may relax this limit.
Hi, Ming
Sorry, I do not understand... I think UBLK_IO_NEED_GET_DATA is normal IO just like UBLK_IO_FUSED_SUBMIT_IO. It is issued from one pthread(ubq_daemon for now) and is completed just in time(not queued). So I think we can allow UBLK_IO_NEED_GET_DATA to be issued from other context.
Re: [PATCH V5 16/16] block: ublk_drv: apply io_uring FUSED_CMD for supporting zero copy
Quoted 51 lines · Ziyang Zhang
Quoted 42 lines · Ming Lei
Quoted 29 lines · Ziyang Zhang
Quoted 28 lines · Ming Lei
Quoted 26 lines · Ziyang Zhang
Quoted 2 lines · Ming Lei
Apply
io_uringfused command for supporting zero copy:[...]
Quoted 4 lines
drivers/block/ublk_drv.c +0
-0@@ -1374,7 +1533,12 @@ static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags)if (!ubq || ub_cmd->q_id != ubq->q_id) goto out;drivers/block/ublk_drv.c static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags) · line 1543
Quoted 10 lines
drivers/block/ublk_drv.c +6
-1-if (ubq->ubq_daemon && ubq->ubq_daemon != current) +/* +* The fused command reads the io buffer data structure only, so it +* is fine to be issued from other context. +*/ +if ((ubq->ubq_daemon && ubq->ubq_daemon != current) && + (cmd_op !=UBLK_IO_FUSED_SUBMIT_IO )) goto out;Hi Ming,
What is your use case that fused
io_uringcmd is issued from another thread? I think it is good practice to operate oneio_uringinstance in one thread only.Quoted 8 lines
Quoted 4 lines
So far we limit io command has to be issued from the queue context, which is still not friendly from userspace viewpoint, the reason is that we can't get
io_uringexit notification and ublk's use case is very special since the queued io command may not be completed forever,OK, so
UBLK_IO_FUSED_SUBMIT_IOis guaranteed to be completed because it is not queued.FETCH_REQandCOMMIT_AMD_FETCHare queued io commands and could not be completed forever so they have to be issued fromubq_daemon. Right?Yeah, any io command should be issued from ubq daemon context.
Quoted 1 line
Quoted 7 lines
Quoted 1 line
BTW, maybe
NEED_GET_DATAcan be issued from other context...So far it won't be supported.
As I mentioned in the link, if
io_uringcan provideio_uringexit callback, we may relax this limit.
Quoted 6 lines
Hi, Ming
Sorry, I do not understand... I think
UBLK_IO_NEED_GET_DATAis normal IO just likeUBLK_IO_FUSED_SUBMIT_IO. It is issued from onepthread(ubq_daemon for now)and is completed just in time(not queued). So I think we can allowUBLK_IO_NEED_GET_DATAto be issued from other context.
No, it isn't.
UBLK_IO_FUSED_SUBMIT_IO is actually for handling target IO, and this command just reads/provides IO buffer meta to io_uring in read-only approach, and io buffer meta won't be changed, and any io state won't be changed, so it is fine to call concurrently.
UBLK_IO_NEED_GET_DATA is still part of io commands, in which io->addr needs to be set, and io->flags is touched, and it can't be done safely concurrently.
Also after zero-copy is supported, UBLK_IO_NEED_GET_DATA may become legacy code path, because ublk server can read/write io data directly in userspace via read()/write(), and there isn't buffer allocation issue any more.
Thanks,
Ming