Commit 8ae3b81f authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Yang Yingliang
Browse files

nvme-loop: reset queue count to 1 in nvme_loop_destroy_io_queues() 



stable inclusion
from linux-4.19.196
commit a0a60f6092b50a0cc261e829bb5fbb2ac33dac29

--------------------------------

[ Upstream commit a6c144f3 ]

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: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parent 9d549836

drivers/nvme/target/loop.c

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,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)