submission cleanups
cover submission cleanups
2 small patches cleaning up io_req_init() and file related submit_state.
Pavel Begunkov (2):
io_uring: change submit file state invariant
io_uring: fix miscounting ios_left
fs/io_uring.c | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-)
Signature · 1 line
2.24.0
PATCH 1/2 io_uring: change submit file state invariant
Keep submit state invariant of whether there are file refs left based on state->nr_refs instead of (state->file==NULL), and always check against the first one. It's easier to track and allows to remove 1 if. It also automatically leaves struct submit_state in a consistent state after io_submit_state_end(), that's not used yet but nice.
btw rename has_refs to file_refs for more clarity.
--- fs/io_uring.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
fs/io_uring.c +10 -11
@@ -764,7 +764,7 @@ struct io_submit_state {*/ struct file *file;unsigned int fd; -unsigned int has_refs; +unsigned int file_refs;unsigned int ios_left; };
@@ -2765,16 +2765,15 @@ static void io_iopoll_req_issued(struct io_kiocb *req, bool in_async)wake_up (&ctx->sq_data->wait); } -static void __io_state_file_put (struct io_submit_state *state) +static inline void __io_state_file_put (struct io_submit_state *state) { -if (state->has_refs) -fput_many (state->file, state->has_refs); - state->file =NULL ; +fput_many (state->file, state->file_refs); + state->file_refs =0 ; }static inline void io_state_file_put (struct io_submit_state *state) { -if (state->file) +if (state->file_refs)__io_state_file_put (state); }
@@ -2788,19 +2787,19 @@ static struct file *__io_file_get(struct io_submit_state *state, int fd)if (!state)return fget (fd); -if (state->file) { +if (state->file_refs) {if (state->fd == fd) { - state->has_refs--; + state->file_refs--;return state->file; }__io_state_file_put (state); } state->file =fget_many (fd, state->ios_left); -if (!state->file) +if (unlikely (!state->file))return NULL ; state->fd = fd; - state->has_refs = state->ios_left -1 ; + state->file_refs = state->ios_left -1 ;return state->file; }
@@ -6635,7 +6634,7 @@ static void io_submit_state_start(struct io_submit_state *state,INIT_LIST_HEAD (&state->comp.list); state->comp.ctx = ctx; state->free_reqs =0 ; - state->file =NULL ; + state->file_refs =0 ; state->ios_left = max_ios; }
Signature · 1 line
2.24.0
PATCH 2/2 io_uring: fix miscounting ios_left
In reply to Pavel Begunkovio_req_init() doesn't decrement state->ios_left if a request doesn't need ->file, it just returns before that on if(!needs_file). That's not really a problem but may cause overhead for an additional fput(). Also inline and kill io_req_set_file() as it's of no use anymore.
--- fs/io_uring.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
fs/io_uring.c +9 -12
@@ -6361,15 +6361,6 @@ static struct file *io_file_get(struct io_submit_state *state,return file; } -static int io_req_set_file (struct io_submit_state *state,struct io_kiocb *req, -int fd) -{ - req->file =io_file_get (state, req, fd, req->flags &REQ_F_FIXED_FILE ); -if (req->file || io_op_defs[req->opcode].needs_file_no_error) -return 0 ; -return -EBADF ; -} -static enum hrtimer_restart io_link_timeout_fn (struct hrtimer *timer) { struct io_timeout_data *data = container_of(timer,
@@ -6782,10 +6773,16 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req, state->plug_started = true; } -if (!io_op_defs[req->opcode].needs_file) -return 0 ; + ret =0 ; +if (io_op_defs[req->opcode].needs_file) { +bool fixed = req->flags &REQ_F_FIXED_FILE ; + + req->file =io_file_get (state, req,READ_ONCE (sqe->fd), fixed); +if (unlikely (!req->file && + !io_op_defs[req->opcode].needs_file_no_error)) + ret = -EBADF ; + } - ret =io_req_set_file (state, req,READ_ONCE (sqe->fd)); state->ios_left--;return ret; }
Signature · 1 line
2.24.0