nvme: Move nvme_freeze/unfreeze_queues to nvme core

Nothing pci specific about them and We'll need them exported
in other transports too.

Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
(cherry picked from commit 363c9aacb6c59bb63148dd115632880a4aed4d88)

Orabug: 25130845

Signed-off-by: Ashok Vairavan <ashok.vairavan@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index bb2c3c309cd9a3ffa714e7561885bee12e334f54..c88afd2de9af7a00c21f473478af12c67985e05b 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1223,6 +1223,34 @@ out:
        return ret;
 }
 
+void nvme_freeze_queues(struct nvme_ctrl *ctrl)
+{
+       struct nvme_ns *ns;
+
+       list_for_each_entry(ns, &ctrl->namespaces, list) {
+               blk_mq_freeze_queue_start(ns->queue);
+
+               spin_lock_irq(ns->queue->queue_lock);
+               queue_flag_set(QUEUE_FLAG_STOPPED, ns->queue);
+               spin_unlock_irq(ns->queue->queue_lock);
+
+               blk_mq_cancel_requeue_work(ns->queue);
+               blk_mq_stop_hw_queues(ns->queue);
+       }
+}
+
+void nvme_unfreeze_queues(struct nvme_ctrl *ctrl)
+{
+       struct nvme_ns *ns;
+
+       list_for_each_entry(ns, &ctrl->namespaces, list) {
+               queue_flag_clear_unlocked(QUEUE_FLAG_STOPPED, ns->queue);
+               blk_mq_unfreeze_queue(ns->queue);
+               blk_mq_start_stopped_hw_queues(ns->queue, true);
+               blk_mq_kick_requeue_list(ns->queue);
+       }
+}
+
 int __init nvme_core_init(void)
 {
        int result;

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 5b3d566d1cfa60acdcbeb48fd22ddba00b118235..8b5000d443000628f0dce95eecf0cb59aff1ad0b 100644 (file)
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -230,6 +230,9 @@ int nvme_init_identify(struct nvme_ctrl *ctrl);
 void nvme_scan_namespaces(struct nvme_ctrl *ctrl);
 void nvme_remove_namespaces(struct nvme_ctrl *ctrl);
 
+void nvme_freeze_queues(struct nvme_ctrl *ctrl);
+void nvme_unfreeze_queues(struct nvme_ctrl *ctrl);
+
 struct request *nvme_alloc_request(struct request_queue *q,
                struct nvme_command *cmd, unsigned int flags);
 void nvme_requeue_req(struct request *req);

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index acbc389c113ac927dce2018ae563b44caaf43822..89c078977c8c64e6d1fa2a1bf36c8464f87800e1 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1968,38 +1968,6 @@ static void nvme_dev_list_remove(struct nvme_dev *dev)
                kthread_stop(tmp);
 }
 
-static void nvme_freeze_queues(struct nvme_dev *dev)
-{
-       struct nvme_ns *ns;
-
-       mutex_lock(&dev->namespaces_mutex);
-       list_for_each_entry(ns, &dev->ctrl.namespaces, list) {
-               blk_mq_freeze_queue_start(ns->queue);
-
-               spin_lock(ns->queue->queue_lock);
-               queue_flag_set(QUEUE_FLAG_STOPPED, ns->queue);
-               spin_unlock(ns->queue->queue_lock);
-
-               blk_mq_cancel_requeue_work(ns->queue);
-               blk_mq_stop_hw_queues(ns->queue);
-       }
-       mutex_unlock(&dev->namespaces_mutex);
-}
-
-static void nvme_unfreeze_queues(struct nvme_dev *dev)
-{
-       struct nvme_ns *ns;
-
-       mutex_lock(&dev->namespaces_mutex);
-       list_for_each_entry(ns, &dev->ctrl.namespaces, list) {
-               queue_flag_clear_unlocked(QUEUE_FLAG_STOPPED, ns->queue);
-               blk_mq_unfreeze_queue(ns->queue);
-               blk_mq_start_stopped_hw_queues(ns->queue, true);
-               blk_mq_kick_requeue_list(ns->queue);
-       }
-       mutex_unlock(&dev->namespaces_mutex);
-}
-
 static void nvme_dev_shutdown(struct nvme_dev *dev)
 {
        int i;
@@ -2009,7 +1977,7 @@ static void nvme_dev_shutdown(struct nvme_dev *dev)
 
        mutex_lock(&dev->shutdown_lock);
        if (dev->bar) {
-               nvme_freeze_queues(dev);
+               nvme_freeze_queues(&dev->ctrl);
                csts = readl(dev->bar + NVME_REG_CSTS);
        }
        if (csts & NVME_CSTS_CFS || !(csts & NVME_CSTS_RDY)) {
@@ -2118,7 +2086,7 @@ static void nvme_reset_work(struct work_struct *work)
                dev_warn(dev->dev, "IO queues not created\n");
                nvme_remove_namespaces(&dev->ctrl);
        } else {
-               nvme_unfreeze_queues(dev);
+               nvme_unfreeze_queues(&dev->ctrl);
                nvme_dev_add(dev);
        }