nvme: move namespace scanning to core

Move the scan work item and surrounding code to the common code.  For now
we need a new finish_scan method to allow the PCI driver to set the
irq affinity hints, but I have plans in the works to obsolete this as well.

Note that this moves the namespace scanning from nvme_wq to the system
workqueue, but as we don't rely on namespace scanning to finish from reset
or I/O this should be fine.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by Jon Derrick: <jonathan.derrick@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 5 insertions, 27 deletions

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 9b2deba0bc91..15bc33755324 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -92,7 +92,6 @@ struct nvme_dev {
         struct msix_entry *entry;
         void __iomem *bar;
         struct work_struct reset_work;
-        struct work_struct scan_work;
         struct work_struct remove_work;
         struct work_struct async_work;
         struct timer_list watchdog_timer;
@@ -266,16 +265,6 @@ static int nvme_init_request(void *data, struct request *req,
         return 0;
 }
 
-static void nvme_queue_scan(struct nvme_dev *dev)
-{
-        /*
-         * Do not queue new scan work when a controller is reset during
-         * removal.
-         */
-        if (dev->ctrl.state == NVME_CTRL_LIVE)
-                queue_work(nvme_workq, &dev->scan_work);
-}
-
 static void nvme_complete_async_event(struct nvme_dev *dev,
                 struct nvme_completion *cqe)
 {
@@ -293,7 +282,7 @@ static void nvme_complete_async_event(struct nvme_dev *dev,
         switch (result & 0xff07) {
         case NVME_AER_NOTICE_NS_CHANGED:
                 dev_info(dev->ctrl.device, "rescanning\n");
-                nvme_queue_scan(dev);
+                nvme_queue_scan(&dev->ctrl);
         default:
                 dev_warn(dev->ctrl.device, "async event result %08x\n", result);
         }
@@ -1520,8 +1509,9 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
         return result;
 }
 
-static void nvme_set_irq_hints(struct nvme_dev *dev)
+static void nvme_pci_post_scan(struct nvme_ctrl *ctrl)
 {
+        struct nvme_dev *dev = to_nvme_dev(ctrl);
         struct nvme_queue *nvmeq;
         int i;
 
@@ -1536,16 +1526,6 @@ static void nvme_set_irq_hints(struct nvme_dev *dev)
         }
 }
 
-static void nvme_dev_scan(struct work_struct *work)
-{
-        struct nvme_dev *dev = container_of(work, struct nvme_dev, scan_work);
-
-        if (!dev->tagset.tags)
-                return;
-        nvme_scan_namespaces(&dev->ctrl);
-        nvme_set_irq_hints(dev);
-}
-
 static void nvme_del_queue_end(struct request *req, int error)
 {
         struct nvme_queue *nvmeq = req->end_io_data;
@@ -1894,7 +1874,7 @@ static void nvme_reset_work(struct work_struct *work)
         }
 
         if (dev->online_queues > 1)
-                nvme_queue_scan(dev);
+                nvme_queue_scan(&dev->ctrl);
         return;
 
  out:
@@ -1954,6 +1934,7 @@ static const struct nvme_ctrl_ops nvme_pci_ctrl_ops = {
         .reg_read64             = nvme_pci_reg_read64,
         .reset_ctrl             = nvme_pci_reset_ctrl,
         .free_ctrl              = nvme_pci_free_ctrl,
+        .post_scan              = nvme_pci_post_scan,
 };
 
 static int nvme_dev_map(struct nvme_dev *dev)
@@ -2005,7 +1986,6 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         if (result)
                 goto free;
 
-        INIT_WORK(&dev->scan_work, nvme_dev_scan);
         INIT_WORK(&dev->reset_work, nvme_reset_work);
         INIT_WORK(&dev->remove_work, nvme_remove_dead_ctrl_work);
         INIT_WORK(&dev->async_work, nvme_async_event_work);
@@ -2071,8 +2051,6 @@ static void nvme_remove(struct pci_dev *pdev)
 
         pci_set_drvdata(pdev, NULL);
         flush_work(&dev->async_work);
-        flush_work(&dev->scan_work);
-        nvme_remove_namespaces(&dev->ctrl);
         nvme_uninit_ctrl(&dev->ctrl);
         nvme_dev_disable(dev, true);
         flush_work(&dev->reset_work);