2018-02-12 16:52:27

by jianchao.wang

Subject: [PATCH] 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 <[email protected]>
Reviewed-by: Sagi Grimberg <[email protected]>
Signed-off-by: Jianchao Wang <[email protected]>
---
drivers/nvme/host/pci.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index ab9c195..4a7c420 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2186,7 +2186,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
@@ -2195,11 +2199,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);
}
--
2.7.4

2018-02-12 18:41:45

by Sagi Grimberg

Subject: Re: [PATCH] nvme-pci: quiesce IO queues prior to disabling device HMB accesses

Thanks, I picked this up for 4.17 (unless someone thinks
this is 4.16-rc material?)

2018-02-16 19:35:52

by James Smart

Subject: Re: [PATCH] nvme-pci: quiesce IO queues prior to disabling device HMB accesses

On 2/12/2018 10:40 AM, Sagi Grimberg wrote:
> Thanks, I picked this up for 4.17 (unless someone thinks
> this is 4.16-rc material?)
>
> _______________________________________________
> Linux-nvme mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-nvme

Note: I really hope that we can eventually commonize all the
quiesce/unquiesce logic and points relative to controller state.  We
have just enough differences to be interesting.

-- james