nvme/pci: move cqe check after device shutdown
Keith Busch
maintainerPATCH 1/1 nvme/pci: move cqe check after device shutdown
Many users have reported nvme triggered irq_startup() warnings during shutdown. The driver uses the nvme queue's irq to synchronize scanning for completions, and enabling an interrupt affined to only offline CPUs triggers the alarming warning.
Move the final CQE check to after disabling the device and all registered interrupts have been torn down so that we do not have any IRQ to synchronize.
--- drivers/nvme/host/pci.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
drivers/nvme/host/pci.c +18 -5
@@ -1401,6 +1401,23 @@ static void nvme_disable_admin_queue(struct nvme_dev *dev, bool shutdown)nvme_poll_irqdisable (nvmeq,-1 ); } +/* +* Called only on a device that has been disabled and after all other threads +* that can check this device's completion queues have synced. This is the +* last chance for the driver to see a natural completion before +* nvme_cancel_request() terminates all incomplete requests. +*/ +static void nvme_reap_pending_cqes (struct nvme_dev *dev) +{ +u16 start, end; +int i; + +for (i = dev->ctrl.queue_count -1 ; i >0 ; i--) { +nvme_process_cq (&dev->queues[i], &start, &end,-1 ); +nvme_complete_cqes (&dev->queues[i], start, end); + } +} +static int nvme_cmb_qdepth (struct nvme_dev *dev,int nr_io_queues,int entry_size) {
@@ -2235,11 +2252,6 @@ static bool __nvme_disable_io_queues(struct nvme_dev *dev, u8 opcode)if (timeout ==0 )return false; -/* handle any remaining CQEs */ -if (opcode == nvme_admin_delete_cq && - !test_bit (NVMEQ_DELETE_ERROR , &nvmeq->flags)) -nvme_poll_irqdisable (nvmeq,-1 ); - sent--;if (nr_queues) goto retry;
@@ -2428,6 +2440,7 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)nvme_suspend_io_queues (dev);nvme_suspend_queue (&dev->queues[0 ]);nvme_pci_disable (dev); +nvme_reap_pending_cqes (dev);blk_mq_tagset_busy_iter (&dev->tagset, nvme_cancel_request, &dev->ctrl);blk_mq_tagset_busy_iter (&dev->admin_tagset, nvme_cancel_request, &dev->ctrl);
Signature · 7 lines
2.21.0 _______________________________________________ linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
s#nvme/pci#nvme-pci# in the subject.
Otherwise looks good:
_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Hi Keith,
Quoted 10 lines · Keith Busch
Many users have reported nvme triggered
irq_startup()warnings during shutdown. The driver uses the nvme queue's irq to synchronize scanning for completions, and enabling an interrupt affined to only offline CPUs triggers the alarming warning.Move the final CQE check to after disabling the device and all registered interrupts have been torn down so that we do not have any IRQ to synchronize.
Yi Zhang and Yanghang Liu both saw the above stack trace in virtual environment when removing NVMe device. This patch resolves both cases.
Thanks,
David
Quoted 47 lines
Signed-off-by Keith Busch <[email protected]>--- drivers/nvme/host/pci.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)drivers/nvme/host/pci.c +17
-5@@ -1401,6 +1401,23 @@ static void nvme_disable_admin_queue(struct nvme_dev *dev, bool shutdown)nvme_poll_irqdisable (nvmeq,-1 ); } +/* +* Called only on a device that has been disabled and after all other threads +* that can check this device's completion queues have synced. This is the +* last chance for the driver to see a natural completion before +* nvme_cancel_request() terminates all incomplete requests. +*/ +static void nvme_reap_pending_cqes (struct nvme_dev *dev) +{ +u16 start, end; +int i; + +for (i = dev->ctrl.queue_count -1 ; i >0 ; i--) { +nvme_process_cq (&dev->queues[i], &start, &end,-1 ); +nvme_complete_cqes (&dev->queues[i], start, end); + } +} +static int nvme_cmb_qdepth (struct nvme_dev *dev,int nr_io_queues,int entry_size) {@@ -2235,11 +2252,6 @@ static bool __nvme_disable_io_queues(struct nvme_dev *dev, u8 opcode)if (timeout ==0 )return false; -/* handle any remaining CQEs */ -if (opcode == nvme_admin_delete_cq && - !test_bit (NVMEQ_DELETE_ERROR , &nvmeq->flags)) -nvme_poll_irqdisable (nvmeq,-1 ); - sent--;if (nr_queues) goto retry;
drivers/nvme/host/pci.c static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) · line 2446
Quoted 7 lines
drivers/nvme/host/pci.c +1
-0@@ -2428,6 +2440,7 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)nvme_suspend_io_queues (dev);nvme_suspend_queue (&dev->queues[0 ]);nvme_pci_disable (dev); +nvme_reap_pending_cqes (dev);blk_mq_tagset_busy_iter (&dev->tagset, nvme_cancel_request, &dev->ctrl);blk_mq_tagset_busy_iter (&dev->admin_tagset, nvme_cancel_request, &dev->ctrl);
_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme