nvme: disable controller on reset state failure

keithbusch · keithbusch · commit 4e69d4dabd23 · 2023-06-30T10:48:20.000-07:00
If the controller is not in a RESETTING state at the point of reset
work, we have to conclude the controller is being deleted. Go to the
cleanup on this condition to ensure proper pairing of request_queue
quiesce state.

Reviewed-by: Christoph Hellwig &lt;hch@lst.de&gt;
Signed-off-by: Keith Busch &lt;kbusch@kernel.org&gt;
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
@@ -2690,7 +2690,8 @@ static void nvme_reset_work(struct work_struct *work)
 	if (dev->ctrl.state != NVME_CTRL_RESETTING) {
 		dev_warn(dev->ctrl.device, "ctrl state %d is not RESETTING\n",
 			 dev->ctrl.state);
-		return;
+		result = -ENODEV;
+		goto out;
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -2690,7 +2690,8 @@ static void nvme_reset_work(struct work_struct *work)`
`2690`	`2690`	`if (dev->ctrl.state != NVME_CTRL_RESETTING) {`
`2691`	`2691`	`dev_warn(dev->ctrl.device, "ctrl state %d is not RESETTING\n",`
`2692`	`2692`	`dev->ctrl.state);`
`2693`		`- return;`
	`2693`	`+ result = -ENODEV;`
	`2694`	`+ goto out;`
`2694`	`2695`	`}`
`2695`	`2696`
`2696`	`2697`	`/*`