io_uring: add missing REQ_F_COMP_LOCKED for nested requests (9b7adba9) · Commits · 戴 / test

When we traverse into failing links or timeouts, we need to ensure we propagate the REQ_F_COMP_LOCKED flag to ensure that we correctly signal to the completion side that we already hold the completion lock. Signed-off-by:

Jens Axboe <axboe@kernel.dk>

fs/io_uring.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1609,6 +1609,7 @@ static bool __io_kill_linked_timeout(struct io_kiocb *req)
		return false;

		list_del_init(&link->link_list);
		link->flags \|= REQ_F_COMP_LOCKED;
		wake_ev = io_link_cancel_timeout(link);
		req->flags &= ~REQ_F_LINK_TIMEOUT;
		return wake_ev;
		@@ -1667,6 +1668,7 @@ static void __io_fail_links(struct io_kiocb *req)
		trace_io_uring_fail_link(req, link);

		io_cqring_fill_event(link, -ECANCELED);
		link->flags \|= REQ_F_COMP_LOCKED;
		__io_double_put_req(link);
		req->flags &= ~REQ_F_LINK_TIMEOUT;
		}
		@@ -5071,6 +5073,7 @@ static int io_timeout_cancel(struct io_ring_ctx *ctx, __u64 user_data)
		return -EALREADY;

		req_set_fail_links(req);
		req->flags \|= REQ_F_COMP_LOCKED;
		io_cqring_fill_event(req, -ECANCELED);
		io_put_req(req);
		return 0;

Admin message