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

io_uring: fix io_timeout_remove locking 



io_timeout_cancel() posts CQEs so needs ->completion_lock to be held,
so grab it in io_timeout_remove().

Fixes: 48ecb6369f1f2 ("io_uring: run timeouts from task_work")
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/d6f03d653a4d7bf693ef6f39b6a426b6d97fd96f.1629280204.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 23a65db8

fs/io_uring.c

+10 −4
Original line number Diff line number Diff line
@@ -5572,6 +5572,7 @@ static struct io_kiocb *io_timeout_extract(struct io_ring_ctx *ctx, 
}



static int io_timeout_cancel(struct io_ring_ctx *ctx, __u64 user_data)

	__must_hold(&ctx->completion_lock)

	__must_hold(&ctx->timeout_lock)

{

	struct io_kiocb *req = io_timeout_extract(ctx, user_data);
@@ -5646,13 +5647,18 @@ static int io_timeout_remove(struct io_kiocb *req, unsigned int issue_flags) 
	struct io_ring_ctx *ctx = req->ctx;

	int ret;



	if (!(req->timeout_rem.flags & IORING_TIMEOUT_UPDATE)) {

		spin_lock(&ctx->completion_lock);

		spin_lock_irq(&ctx->timeout_lock);

	if (!(req->timeout_rem.flags & IORING_TIMEOUT_UPDATE))

		ret = io_timeout_cancel(ctx, tr->addr);

	else

		spin_unlock_irq(&ctx->timeout_lock);

		spin_unlock(&ctx->completion_lock);

	} else {

		spin_lock_irq(&ctx->timeout_lock);

		ret = io_timeout_update(ctx, tr->addr, &tr->ts,

					io_translate_timeout_mode(tr->flags));

		spin_unlock_irq(&ctx->timeout_lock);

	}



	if (ret < 0)

		req_set_fail(req);