io_uring: fix missing io_queue_linked_timeout() (f063c547) · Commits · 戴 / test

Whoever called io_prep_linked_timeout() should also do io_queue_linked_timeout(). __io_queue_sqe() doesn't follow that for the punting path leaving linked timeouts prepared but never queued. Fixes: ("io_uring: fix mis-refcounting linked timeouts") Signed-off-by:

Pavel Begunkov <asml.silence@gmail.com> Signed-off-by:

Jens Axboe <axboe@kernel.dk>

fs/io_uring.c

+13 −13

Original line number	Diff line number	Diff line
		@@ -5987,11 +5987,7 @@ again:
		* doesn't support non-blocking read/write attempts
		*/
		if (ret == -EAGAIN && !(req->flags & REQ_F_NOWAIT)) {
		if (io_arm_poll_handler(req)) {
		if (linked_timeout)
		io_queue_linked_timeout(linked_timeout);
		goto exit;
		}
		if (!io_arm_poll_handler(req)) {
		punt:
		ret = io_prep_work_files(req);
		if (unlikely(ret))
		@@ -6001,6 +5997,10 @@ punt:
		* submit reference when the iocb is actually submitted.
		*/
		io_queue_async_work(req);
		}

		if (linked_timeout)
		io_queue_linked_timeout(linked_timeout);
		goto exit;
		}

Admin message