From: Hannes Reinecke Date: Wed, 26 May 2021 15:23:15 +0000 (+0200) Subject: nvme-loop: reset queue count to 1 in nvme_loop_destroy_io_queues() X-Git-Tag: v5.4.127~9 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ed4bee6e1bb7419311b72ad464e5a383aff69a40;p=users%2Fdwmw2%2Flinux.git nvme-loop: reset queue count to 1 in nvme_loop_destroy_io_queues() [ Upstream commit a6c144f3d2e230f2b3ac5ed8c51e0f0391556197 ] The queue count is increased in nvme_loop_init_io_queues(), so we need to reset it to 1 at the end of nvme_loop_destroy_io_queues(). Otherwise the function is not re-entrant safe, and crash will happen during concurrent reset and remove calls. Signed-off-by: Hannes Reinecke Reviewed-by: Chaitanya Kulkarni Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c index 82b87a4c50f63..b4f5503ae5703 100644 --- a/drivers/nvme/target/loop.c +++ b/drivers/nvme/target/loop.c @@ -288,6 +288,7 @@ static void nvme_loop_destroy_io_queues(struct nvme_loop_ctrl *ctrl) clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[i].flags); nvmet_sq_destroy(&ctrl->queues[i].nvme_sq); } + ctrl->ctrl.queue_count = 1; } static int nvme_loop_init_io_queues(struct nvme_loop_ctrl *ctrl)