Commit 90b87490 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe

io_uring: maintain CQE order of a failed link

Arguably we want CQEs of linked requests be in a strict order of
submission as it always was. Now if init of a request fails its CQE may
be posted before all prior linked requests including the head of the
link. Fix it by failing it last.

Fixes: de59bc10 ("io_uring: fail links more in io_submit_sqe()")
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/b7a96b05832e7ab23ad55f84092a2548c4a888b0.1616699075.git.asml.silence@gmail.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f5d2d23b
...@@ -6480,8 +6480,6 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req, ...@@ -6480,8 +6480,6 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
ret = io_init_req(ctx, req, sqe); ret = io_init_req(ctx, req, sqe);
if (unlikely(ret)) { if (unlikely(ret)) {
fail_req: fail_req:
io_put_req(req);
io_req_complete(req, ret);
if (link->head) { if (link->head) {
/* fail even hard links since we don't submit */ /* fail even hard links since we don't submit */
link->head->flags |= REQ_F_FAIL_LINK; link->head->flags |= REQ_F_FAIL_LINK;
...@@ -6489,6 +6487,8 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req, ...@@ -6489,6 +6487,8 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
io_req_complete(link->head, -ECANCELED); io_req_complete(link->head, -ECANCELED);
link->head = NULL; link->head = NULL;
} }
io_put_req(req);
io_req_complete(req, ret);
return ret; return ret;
} }
ret = io_req_prep(req, sqe); ret = io_req_prep(req, sqe);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment