ublk: move ublk_cancel_dev() out of ub->mutex
authorMing Lei <ming.lei@redhat.com>
Mon, 9 Oct 2023 09:33:18 +0000 (17:33 +0800)
committerJens Axboe <axboe@kernel.dk>
Tue, 17 Oct 2023 14:27:55 +0000 (08:27 -0600)
commit85248d670b71d9edda9459ee14fdc85c8e9632c0
tree81daebf9d7990c8ebc0827b09496d35bd99e96e1
parent3421c7f68bba52281bbb38bc76c18dc03cb689e4
ublk: move ublk_cancel_dev() out of ub->mutex

ublk_cancel_dev() just calls ublk_cancel_queue() to cancel all pending
io commands after ublk request queue is idle. The only protection is just
the read & write of ubq->nr_io_ready and avoid duplicated command cancel,
so add one per-queue lock with cancel flag for providing this protection,
meantime move ublk_cancel_dev() out of ub->mutex.

Then we needn't to call io_uring_cmd_complete_in_task() to cancel
pending command. And the same cancel logic will be re-used for
cancelable uring command.

This patch basically reverts commit ac5902f84bb5 ("ublk: fix AB-BA lockdep warning").

Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20231009093324.957829-4-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/ublk_drv.c