| From 093ab4363f562833457ea6bd7900153794a0fce5 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 26 May 2021 17:23:17 +0200 |
| Subject: nvme-loop: check for NVME_LOOP_Q_LIVE in |
| nvme_loop_destroy_admin_queue() |
| |
| From: Hannes Reinecke <hare@suse.de> |
| |
| [ Upstream commit 4237de2f73a669e4f89ac0aa2b44fb1a1d9ec583 ] |
| |
| 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: Hannes Reinecke <hare@suse.de> |
| Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> |
| Signed-off-by: Christoph Hellwig <hch@lst.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/nvme/target/loop.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c |
| index dba0b0145f48..08b52f3ed0c3 100644 |
| --- a/drivers/nvme/target/loop.c |
| +++ b/drivers/nvme/target/loop.c |
| @@ -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) |
| { |
| - 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); |
| blk_cleanup_queue(ctrl->ctrl.admin_q); |
| blk_mq_free_tag_set(&ctrl->admin_tag_set); |
| -- |
| 2.30.2 |
| |
