nvme-pci: quiesce IO queues prior to disabling device HMB accesses

Quiesce IO queues prior to disabling device HMB accesses. A controller
using HMB may relay on it to efficiently complete IO commands.

Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jianchao Wang <jianchao.w.wang@oracle.com>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 5933a5c732e8349731766eeb7b7c0b0b9b6bea6c..aacc8e4b0051b8633988cdd2f7fe301ebb59a735 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2196,7 +2196,11 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
        if (!dead) {
                if (shutdown)
                        nvme_wait_freeze_timeout(&dev->ctrl, NVME_IO_TIMEOUT);
+       }
+
+       nvme_stop_queues(&dev->ctrl);
 
+       if (!dead) {
                /*
                 * If the controller is still alive tell it to stop using the
                 * host memory buffer.  In theory the shutdown / reset should
@@ -2205,11 +2209,6 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
                 */
                if (dev->host_mem_descs)
                        nvme_set_host_mem(dev, 0);
-
-       }
-       nvme_stop_queues(&dev->ctrl);
-
-       if (!dead) {
                nvme_disable_io_queues(dev);
                nvme_disable_admin_queue(dev, shutdown);
        }