Cleanup read/write prep handling
Jens Axboe
maintainercover Cleanup read/write prep handling
Hi,
Rather than have opcode checking in the generic read/write prep handler, add separate prep handlers for the opcodes that need special attention.
No functional changes intended in these patches, just a cleanup to make it easier to read/follow.
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerPATCH 1/2 io_uring/rw: add separate prep handler for readv/writev
Rather than sprinkle opcode checks in the generic read/write prep handler, have a separate prep handler for the vectored readv/writev operation.
Signed-off-by Jens Axboe <[email protected]>
--- io_uring/opdef.c | 4 ++-- io_uring/rw.c | 22 +++++++++++++++------- io_uring/rw.h | 1 + 3 files changed, 18 insertions(+), 9 deletions(-)
io_uring/opdef.c +2 -2
@@ -66,7 +66,7 @@ const struct io_issue_def io_issue_defs[] = { .iopoll = 1, .iopoll_queue = 1, .vectored = 1, - .prep = io_prep_rw, + .prep = io_prep_rwv, .issue = io_read, }, [IORING_OP_WRITEV] = {
@@ -80,7 +80,7 @@ const struct io_issue_def io_issue_defs[] = { .iopoll = 1, .iopoll_queue = 1, .vectored = 1, - .prep = io_prep_rw, + .prep = io_prep_rwv, .issue = io_write, }, [IORING_OP_FSYNC] = {
io_uring/rw.c +15 -7
@@ -110,15 +110,23 @@ int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe) rw->addr =READ_ONCE (sqe->addr); rw->len =READ_ONCE (sqe->len); rw->flags =READ_ONCE (sqe->rw_flags); +return 0 ; +} -/* Have to do this validation here, as this is in io_read() rw->len might -* have chanaged due to buffer selection +int io_prep_rwv (struct io_kiocb *req,const struct io_uring_sqe *sqe) +{ +int ret; + + ret =io_prep_rw (req, sqe); +if (unlikely (ret)) +return ret; + +/* +* Have to do this validation here, as this is in io_read() rw->len +* might have chanaged due to buffer selection */ -if (req->opcode ==IORING_OP_READV && req->flags &REQ_F_BUFFER_SELECT ) { - ret =io_iov_buffer_select_prep (req); -if (ret) -return ret; - } +if (req->flags &REQ_F_BUFFER_SELECT ) +return io_iov_buffer_select_prep (req);return 0 ; }
io_uring/rw.h +1 -0
@@ -16,6 +16,7 @@ struct io_async_rw { };int io_prep_rw (struct io_kiocb *req,const struct io_uring_sqe *sqe); +int io_prep_rwv (struct io_kiocb *req,const struct io_uring_sqe *sqe);int io_read (struct io_kiocb *req,unsigned int issue_flags);int io_readv_prep_async (struct io_kiocb *req);int io_write (struct io_kiocb *req,unsigned int issue_flags);
Signature · 1 line
2.42.0
Jens Axboe
maintainerPATCH 2/2 io_uring/rw: add separate prep handler for fixed read/write
In reply to Jens AxboeRather than sprinkle opcode checks in the generic read/write prep handler, have a separate prep handler for the vectored readv/writev operation.
Signed-off-by Jens Axboe <[email protected]>
--- io_uring/opdef.c | 4 ++-- io_uring/rw.c | 30 ++++++++++++++++++------------ io_uring/rw.h | 1 + 3 files changed, 21 insertions(+), 14 deletions(-)
io_uring/opdef.c +2 -2
@@ -98,7 +98,7 @@ const struct io_issue_def io_issue_defs[] = { .ioprio = 1, .iopoll = 1, .iopoll_queue = 1, - .prep = io_prep_rw, + .prep = io_prep_rw_fixed, .issue = io_read, }, [IORING_OP_WRITE_FIXED] = {
@@ -111,7 +111,7 @@ const struct io_issue_def io_issue_defs[] = { .ioprio = 1, .iopoll = 1, .iopoll_queue = 1, - .prep = io_prep_rw, + .prep = io_prep_rw_fixed, .issue = io_write, }, [IORING_OP_POLL_ADD] = {
io_uring/rw.c +18 -12
@@ -83,18 +83,6 @@ int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe)/* used for fixed read/write too - just read unconditionally */ req->buf_index =READ_ONCE (sqe->buf_index); -if (req->opcode ==IORING_OP_READ_FIXED || - req->opcode ==IORING_OP_WRITE_FIXED ) { -struct io_ring_ctx *ctx = req->ctx; -u16 index; - -if (unlikely (req->buf_index >= ctx->nr_user_bufs)) -return -EFAULT ; - index =array_index_nospec (req->buf_index, ctx->nr_user_bufs); - req->imu = ctx->user_bufs[index]; -io_req_set_rsrc_node (req, ctx,0 ); - } - ioprio =READ_ONCE (sqe->ioprio);if (ioprio) { ret =ioprio_check_cap (ioprio);
@@ -131,6 +119,24 @@ int io_prep_rwv(struct io_kiocb *req, const struct io_uring_sqe *sqe)return 0 ; } +int io_prep_rw_fixed (struct io_kiocb *req,const struct io_uring_sqe *sqe) +{ +struct io_ring_ctx *ctx = req->ctx; +u16 index; +int ret; + + ret =io_prep_rw (req, sqe); +if (unlikely (ret)) +return ret; + +if (unlikely (req->buf_index >= ctx->nr_user_bufs)) +return -EFAULT ; + index =array_index_nospec (req->buf_index, ctx->nr_user_bufs); + req->imu = ctx->user_bufs[index]; +io_req_set_rsrc_node (req, ctx,0 ); +return 0 ; +} +/* * Multishot read is prepared just like a normal read/write request, only * difference is that we set the MULTISHOT flag.
io_uring/rw.h +1 -0
@@ -17,6 +17,7 @@ struct io_async_rw {int io_prep_rw (struct io_kiocb *req,const struct io_uring_sqe *sqe);int io_prep_rwv (struct io_kiocb *req,const struct io_uring_sqe *sqe); +int io_prep_rw_fixed (struct io_kiocb *req,const struct io_uring_sqe *sqe);int io_read (struct io_kiocb *req,unsigned int issue_flags);int io_readv_prep_async (struct io_kiocb *req);int io_write (struct io_kiocb *req,unsigned int issue_flags);
Signature · 1 line
2.42.0