IORING_URING_CMD_MULTISHOT fixups
cover IORING_URING_CMD_MULTISHOT fixups
One compile fix and a couple code simplifications for the recent series adding support for multishot uring_cmd buffer selection.
Caleb Sander Mateos (3):
io_uring/cmd: fix io_uring_mshot_cmd_post_cqe() for !CONFIG_IO_URING io_uring/cmd: deduplicate uring_cmd_flags checks io_uring/cmd: consolidate REQ_F_BUFFER_SELECT checks
include/linux/io_uring/cmd.h | 3 ++- io_uring/uring_cmd.c | 12 +++--------- 2 files changed, 5 insertions(+), 10 deletions(-)
Signature · 1 line
2.45.2
PATCH 1/3 io_uring/cmd: fix io_uring_mshot_cmd_post_cqe() for !CONFIG_IO_URING
io_uring_mshot_cmd_post_cqe() is declared with a different signature when CONFIG_IO_URING is defined than when it isn't. Match the !CONFIG_IO_URING definition's signature to the CONFIG_IO_URING one.
--- include/linux/io_uring/cmd.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/io_uring/cmd.h +2 -1
@@ -122,11 +122,12 @@ io_uring_cmd_buffer_select(struct io_uring_cmd *ioucmd, unsigned buf_group, size_t *len, unsigned int issue_flags); {return (struct io_br_sel ) { .val = -EOPNOTSUPP }; }static inline bool io_uring_mshot_cmd_post_cqe (struct io_uring_cmd *ioucmd, -ssize_t ret,unsigned int issue_flags) +struct io_br_sel *sel, +unsigned int issue_flags) {return true; }#endif
Signature · 1 line
2.45.2
Jens Axboe
maintainerRe: [PATCH 1/3] io_uring/cmd: fix io_uring_mshot_cmd_post_cqe() for !CONFIG_IO_URING
Quoted 3 lines · Caleb Sander Mateos
io_uring_mshot_cmd_post_cqe()is declared with a different signature whenCONFIG_IO_URINGis defined than when it isn't. Match the !CONFIG_IO_URING definition's signature to theCONFIG_IO_URINGone.
I screwed that up twice... I'll just fix this one up in-tree.
Signature · 1 line
Jens Axboe
PATCH 2/3 io_uring/cmd: deduplicate uring_cmd_flags checks
In reply to Caleb Sander Mateosio_uring_cmd_prep() currently has two checks for whether IORING_URING_CMD_FIXED and IORING_URING_CMD_MULTISHOT are both set in uring_cmd_flags. Remove the second check.
--- io_uring/uring_cmd.c | 2 -- 1 file changed, 2 deletions(-)
io_uring/uring_cmd.c +0 -2
@@ -200,12 +200,10 @@ int io_uring_cmd_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)return -EINVAL ; req->buf_index =READ_ONCE (sqe->buf_index); }if (ioucmd->flags &IORING_URING_CMD_MULTISHOT ) { -if (ioucmd->flags &IORING_URING_CMD_FIXED ) -return -EINVAL ;if (!(req->flags &REQ_F_BUFFER_SELECT ))return -EINVAL ; }else {if (req->flags &REQ_F_BUFFER_SELECT )return -EINVAL ;
Signature · 1 line
2.45.2
Re: [PATCH 2/3] io_uring/cmd: deduplicate uring_cmd_flags checks
Quoted 16 lines · Caleb Sander Mateos
io_uring_cmd_prep()currently has two checks for whetherIORING_URING_CMD_FIXEDandIORING_URING_CMD_MULTISHOTare both set inuring_cmd_flags. Remove the second check.Signed-off-by Caleb Sander Mateos <[email protected]>--- io_uring/uring_cmd.c | 2 -- 1 file changed, 2 deletions(-)io_uring/uring_cmd.c +0
-0@@ -200,12 +200,10 @@ int io_uring_cmd_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)return -EINVAL ; req->buf_index =READ_ONCE (sqe->buf_index);
io_uring/uring_cmd.c int io_uring_cmd_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) · line 209
Quoted 10 lines
io_uring/uring_cmd.c +0
-2}if (ioucmd->flags &IORING_URING_CMD_MULTISHOT ) { -if (ioucmd->flags &IORING_URING_CMD_FIXED ) -return -EINVAL ;if (!(req->flags &REQ_F_BUFFER_SELECT ))return -EINVAL ; }else {if (req->flags &REQ_F_BUFFER_SELECT )return -EINVAL ;
Thanks,
Ming
PATCH 3/3 io_uring/cmd: consolidate REQ_F_BUFFER_SELECT checks
In reply to Caleb Sander Mateosio_uring_cmd_prep() checks that REQ_F_BUFFER_SELECT is set in the io_kiocb's flags iff IORING_URING_CMD_MULTISHOT is set in the SQE's uring_cmd_flags. Consolidate the IORING_URING_CMD_MULTISHOT and !IORING_URING_CMD_MULTISHOT branches into a single check that the IORING_URING_CMD_MULTISHOT flag matches the REQ_F_BUFFER_SELECT flag.
--- io_uring/uring_cmd.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
io_uring/uring_cmd.c +3 -7
@@ -199,17 +199,13 @@ int io_uring_cmd_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)if (ioucmd->flags &IORING_URING_CMD_MULTISHOT )return -EINVAL ; req->buf_index =READ_ONCE (sqe->buf_index); } -if (ioucmd->flags &IORING_URING_CMD_MULTISHOT ) { -if (!(req->flags &REQ_F_BUFFER_SELECT )) -return -EINVAL ; - }else { -if (req->flags &REQ_F_BUFFER_SELECT ) -return -EINVAL ; - } +if (!!(ioucmd->flags &IORING_URING_CMD_MULTISHOT ) != + !!(req->flags &REQ_F_BUFFER_SELECT )) +return -EINVAL ; ioucmd->cmd_op =READ_ONCE (sqe->cmd_op); ac =io_uring_alloc_async_data (&req->ctx->cmd_cache, req);if (!ac)
Signature · 1 line
2.45.2
Re: [PATCH 3/3] io_uring/cmd: consolidate REQ_F_BUFFER_SELECT checks
Quoted 21 lines · Caleb Sander Mateos
io_uring_cmd_prep()checks thatREQ_F_BUFFER_SELECTis set in the io_kiocb's flags iffIORING_URING_CMD_MULTISHOTis set in the SQE'suring_cmd_flags. Consolidate theIORING_URING_CMD_MULTISHOTand !IORING_URING_CMD_MULTISHOT branches into a single check that theIORING_URING_CMD_MULTISHOTflag matches theREQ_F_BUFFER_SELECTflag.Signed-off-by Caleb Sander Mateos <[email protected]>--- io_uring/uring_cmd.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)io_uring/uring_cmd.c +0
-0@@ -199,17 +199,13 @@ int io_uring_cmd_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)if (ioucmd->flags &IORING_URING_CMD_MULTISHOT )return -EINVAL ; req->buf_index =READ_ONCE (sqe->buf_index); }
io_uring/uring_cmd.c int io_uring_cmd_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) · line 206
Quoted 10 lines
io_uring/uring_cmd.c +3
-7-if (ioucmd->flags &IORING_URING_CMD_MULTISHOT ) { -if (!(req->flags &REQ_F_BUFFER_SELECT )) -return -EINVAL ; - }else { -if (req->flags &REQ_F_BUFFER_SELECT ) -return -EINVAL ; - } +if (!!(ioucmd->flags &IORING_URING_CMD_MULTISHOT ) != + !!(req->flags &REQ_F_BUFFER_SELECT )) +return -EINVAL ;
Thanks,
Ming
Re: (subset) [PATCH 0/3] IORING_URING_CMD_MULTISHOT fixups
In reply to Caleb Sander MateosQuoted 9 lines · Caleb Sander Mateos
One compile fix and a couple code simplifications for the recent series adding support for multishot
uring_cmdbuffer selection.Caleb Sander Mateos (3):
io_uring/cmd: fixio_uring_mshot_cmd_post_cqe()for !CONFIG_IO_URINGio_uring/cmd: deduplicateuring_cmd_flagschecksio_uring/cmd: consolidateREQ_F_BUFFER_SELECTchecks[...]
Applied, thanks!
[2/3] io_uring/cmd: deduplicate uring_cmd_flags checks
commit: a9a2fe50a46df5a494811dd3840ceaa652e79c9e
[3/3] io_uring/cmd: consolidate REQ_F_BUFFER_SELECT checks
commit: ae6b528ace2fa1d0ed3daebbb39f76b9c7133861Best regards,
Signature · 1 line
Jens Axboe