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

io_uring: remove timeout.list after hrtimer cancel 



Remove timeouts from ctx->timeout_list after hrtimer_try_to_cancel()
successfully cancels it. With this we don't need to care whether there
was a race and it was removed in io_timeout_fn(), and that will be handy
for following patches.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0bdf7a2d

fs/io_uring.c

+2 −9
Original line number Diff line number Diff line
@@ -5301,16 +5301,10 @@ static enum hrtimer_restart io_timeout_fn(struct hrtimer *timer) 
	unsigned long flags;



	spin_lock_irqsave(&ctx->completion_lock, flags);

	list_del_init(&req->timeout.list);

	atomic_set(&req->ctx->cq_timeouts,

		atomic_read(&req->ctx->cq_timeouts) + 1);



	/*

	 * We could be racing with timeout deletion. If the list is empty,

	 * then timeout lookup already found it and will be handling it.

	 */

	if (!list_empty(&req->timeout.list))

		list_del_init(&req->timeout.list);



	io_cqring_fill_event(req, -ETIME);

	io_commit_cqring(ctx);

	spin_unlock_irqrestore(&ctx->completion_lock, flags);
@@ -5326,11 +5320,10 @@ static int __io_timeout_cancel(struct io_kiocb *req) 
	struct io_timeout_data *io = req->async_data;

	int ret;



	list_del_init(&req->timeout.list);



	ret = hrtimer_try_to_cancel(&io->timer);

	if (ret == -1)

		return -EALREADY;

	list_del_init(&req->timeout.list);



	req_set_fail_links(req);

	req->flags |= REQ_F_COMP_LOCKED;

CRA Git | Maintained and supported by SUSTech CRA and CCSE