Commit 64f9baad authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Yang Yingliang
Browse files

nvme-loop: check for NVME_LOOP_Q_LIVE in nvme_loop_destroy_admin_queue() 



stable inclusion
from linux-4.19.196
commit 9ccbe18eb48a9b27b646931e01d84dfe0bc8a10d

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

[ Upstream commit 4237de2f ]

We need to check the NVME_LOOP_Q_LIVE flag in
nvme_loop_destroy_admin_queue() to protect against duplicate
invocations eg 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 29b127f9

drivers/nvme/target/loop.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -274,7 +274,8 @@ static const struct blk_mq_ops nvme_loop_admin_mq_ops = { 




static void nvme_loop_destroy_admin_queue(struct nvme_loop_ctrl *ctrl)

static void nvme_loop_destroy_admin_queue(struct nvme_loop_ctrl *ctrl)

{

{

	clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[0].flags);

	if (!test_and_clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[0].flags))

		return;

	nvmet_sq_destroy(&ctrl->queues[0].nvme_sq);

	nvmet_sq_destroy(&ctrl->queues[0].nvme_sq);

	blk_cleanup_queue(ctrl->ctrl.admin_q);

	blk_cleanup_queue(ctrl->ctrl.admin_q);

	blk_mq_free_tag_set(&ctrl->admin_tag_set);

	blk_mq_free_tag_set(&ctrl->admin_tag_set);