nvme-pci: serialize pci resets

sagigrimberg · Christoph Hellwig · commit 79c48ccf2fec · 2018-01-15T16:20:10.000+01:00
Signed-off-by: Sagi Grimberg &lt;sagi@grimberg.me&gt;
Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
@@ -95,7 +95,7 @@ int nvme_reset_ctrl(struct nvme_ctrl *ctrl)
 }
 EXPORT_SYMBOL_GPL(nvme_reset_ctrl);
 
-static int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl)
+int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl)
 {
 	int ret;
 
@@ -104,6 +104,7 @@ static int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl)
 		flush_work(&ctrl->reset_work);
 	return ret;
 }
+EXPORT_SYMBOL_GPL(nvme_reset_ctrl_sync);
 
 static void nvme_delete_ctrl_work(struct work_struct *work)
 {
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
@@ -394,6 +394,7 @@ int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count);
 void nvme_start_keep_alive(struct nvme_ctrl *ctrl);
 void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);
 int nvme_reset_ctrl(struct nvme_ctrl *ctrl);
+int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl);
 int nvme_delete_ctrl(struct nvme_ctrl *ctrl);
 int nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl);
 
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
@@ -2537,7 +2537,7 @@ static void nvme_reset_prepare(struct pci_dev *pdev)
 static void nvme_reset_done(struct pci_dev *pdev)
 {
 	struct nvme_dev *dev = pci_get_drvdata(pdev);
-	nvme_reset_ctrl(&dev->ctrl);
+	nvme_reset_ctrl_sync(&dev->ctrl);
 }
 
 static void nvme_shutdown(struct pci_dev *pdev)

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ int nvme_reset_ctrl(struct nvme_ctrl *ctrl)`
`95`	`95`	`}`
`96`	`96`	`EXPORT_SYMBOL_GPL(nvme_reset_ctrl);`
`97`	`97`
`98`		`-static int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl)`
	`98`	`+int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl)`
`99`	`99`	`{`
`100`	`100`	`int ret;`
`101`	`101`
`@@ -104,6 +104,7 @@ static int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl)`
`104`	`104`	`flush_work(&ctrl->reset_work);`
`105`	`105`	`return ret;`
`106`	`106`	`}`
	`107`	`+EXPORT_SYMBOL_GPL(nvme_reset_ctrl_sync);`
`107`	`108`
`108`	`109`	`static void nvme_delete_ctrl_work(struct work_struct *work)`
`109`	`110`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2537,7 +2537,7 @@ static void nvme_reset_prepare(struct pci_dev *pdev)`
`2537`	`2537`	`static void nvme_reset_done(struct pci_dev *pdev)`
`2538`	`2538`	`{`
`2539`	`2539`	`struct nvme_dev *dev = pci_get_drvdata(pdev);`
`2540`		`- nvme_reset_ctrl(&dev->ctrl);`
	`2540`	`+ nvme_reset_ctrl_sync(&dev->ctrl);`
`2541`	`2541`	`}`
`2542`	`2542`
`2543`	`2543`	`static void nvme_shutdown(struct pci_dev *pdev)`