leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

io_uring: fail links more in io_submit_sqe()

Browse Source 
Instead of marking a link with REQ_F_FAIL_LINK on an error and delaying
its failing to the caller, do it eagerly right when after getting an
error in io_submit_sqe(). This renders FAIL_LINK checks in
io_queue_link_head() useless and we can skip it.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2021-02-18 18:29:47 +00:00 committed by Jens Axboe
parent 1ee43ba8d2
commit de59bc104c
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/io_uring.c
View File

@ -6645,15 +6645,6 @@ fail_req:
} }
} }
static inline void io_queue_link_head(struct io_kiocb *req)
{
if (unlikely(req->flags & REQ_F_FAIL_LINK)) {
io_put_req(req);
io_req_complete(req, -ECANCELED);
} else
io_queue_sqe(req);
}
/* /*
* Check SQE restrictions (opcode and flags). * Check SQE restrictions (opcode and flags).
* *
@ -6768,9 +6759,13 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
fail_req: fail_req:
io_put_req(req); io_put_req(req);
io_req_complete(req, ret); io_req_complete(req, ret);
/* fail even hard links since we don't submit */ if (link->head) {
if (link->head) /* fail even hard links since we don't submit */
link->head->flags |= REQ_F_FAIL_LINK; link->head->flags |= REQ_F_FAIL_LINK;
io_put_req(link->head);
io_req_complete(link->head, -ECANCELED);
link->head = NULL;
}
return ret; return ret;
} }
ret = io_req_prep(req, sqe); ret = io_req_prep(req, sqe);
@ -6811,7 +6806,7 @@ fail_req:
/* last request of a link, enqueue the link */ /* last request of a link, enqueue the link */
if (!(req->flags & (REQ_F_LINK | REQ_F_HARDLINK))) { if (!(req->flags & (REQ_F_LINK | REQ_F_HARDLINK))) {
io_queue_link_head(head); io_queue_sqe(head);
link->head = NULL; link->head = NULL;
} }
} else { } else {
@ -6837,7 +6832,7 @@ static void io_submit_state_end(struct io_submit_state *state,
struct io_ring_ctx *ctx) struct io_ring_ctx *ctx)
{ {
if (state->link.head) if (state->link.head)
io_queue_link_head(state->link.head); io_queue_sqe(state->link.head);
if (state->comp.nr) if (state->comp.nr)
io_submit_flush_completions(&state->comp, ctx); io_submit_flush_completions(&state->comp, ctx);
if (state->plug_started) if (state->plug_started)