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

hreinecke · Christoph Hellwig · commit a6c144f3d2e2 · 2021-06-02T10:06:53.000+03:00
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 &lt;hare@suse.de&gt;
Reviewed-by: Chaitanya Kulkarni &lt;chaitanya.kulkarni@wdc.com&gt;
Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c
@@ -299,6 +299,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)

Original file line number	Diff line number	Diff line change
`@@ -299,6 +299,7 @@ static void nvme_loop_destroy_io_queues(struct nvme_loop_ctrl *ctrl)`
`299`	`299`	`clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[i].flags);`
`300`	`300`	`nvmet_sq_destroy(&ctrl->queues[i].nvme_sq);`
`301`	`301`	`}`
	`302`	`+ ctrl->ctrl.queue_count = 1;`
`302`	`303`	`}`
`303`	`304`
`304`	`305`	`static int nvme_loop_init_io_queues(struct nvme_loop_ctrl *ctrl)`