Commit 4ea672ab authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: fix ltimeout unprep 



io_unprep_linked_timeout() is broken, first it needs to return back
REQ_F_ARM_LTIMEOUT, so the linked timeout is enqueued and disarmed. But
now we refcounted it, and linked timeouts may get not executed at all,
leaking a request.

Just kill the unprep optimisation.

Fixes: 906c6caa ("io_uring: optimise io_prep_linked_timeout()")
Reported-by: default avatarBeld Zhang <beldzhang@gmail.com>
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/51b8e2bfc4bea8ee625cf2ba62b2a350cc9be031.1634719585.git.asml.silence@gmail.com
Link: https://github.com/axboe/liburing/issues/460


Reported-by: default avatarBeld Zhang <beldzhang@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e139a1ec

fs/io_uring.c

+1 −6
Original line number Diff line number Diff line
@@ -1370,11 +1370,6 @@ static void io_req_track_inflight(struct io_kiocb *req) 
	}

}



static inline void io_unprep_linked_timeout(struct io_kiocb *req)

{

	req->flags &= ~REQ_F_LINK_TIMEOUT;

}



static struct io_kiocb *__io_prep_linked_timeout(struct io_kiocb *req)

{

	if (WARN_ON_ONCE(!req->link))
@@ -6985,7 +6980,7 @@ static void __io_queue_sqe(struct io_kiocb *req) 
		switch (io_arm_poll_handler(req)) {

		case IO_APOLL_READY:

			if (linked_timeout)

				io_unprep_linked_timeout(req);

				io_queue_linked_timeout(linked_timeout);

			goto issue_sqe;

		case IO_APOLL_ABORTED:

			/*