diff mbox series

hw/block/nvme: fix bug with PCI IRQ pins on teardown

Message ID 20181121181013.4983-1-logang@deltatee.com (mailing list archive)
State New, archived
Headers show
Series hw/block/nvme: fix bug with PCI IRQ pins on teardown | expand

Commit Message

Logan Gunthorpe Nov. 21, 2018, 6:10 p.m. UTC 
When the submission and completion queues are being torn down
the IRQ will be asserted for the completion queue when the
submsission queue is deleted. Then when the completion queue
is deleted it stays asserted. Thus, on systems that do
not use MSI, no further interrupts can be triggered on the host.

Linux sees this as a long delay when unbinding the nvme device.
Eventually the interrupt timeout occurs and it continues.

To fix this we ensure we deassert the IRQ for a CQ when it is
deleted.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
---
 hw/block/nvme.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Kevin Wolf Nov. 22, 2018, 3:24 p.m. UTC | #1 
Am 21.11.2018 um 19:10 hat Logan Gunthorpe geschrieben:
> When the submission and completion queues are being torn down
> the IRQ will be asserted for the completion queue when the
> submsission queue is deleted. Then when the completion queue
> is deleted it stays asserted. Thus, on systems that do
> not use MSI, no further interrupts can be triggered on the host.
> 
> Linux sees this as a long delay when unbinding the nvme device.
> Eventually the interrupt timeout occurs and it continues.
> 
> To fix this we ensure we deassert the IRQ for a CQ when it is
> deleted.
> 
> Signed-off-by: Logan Gunthorpe <logang@deltatee.com>

Thanks, applied to the block branch.

Kevin
diff mbox series

Patch

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index fc7dacb816c8..7cbed75ce5fd 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -554,6 +554,7 @@  static uint16_t nvme_del_cq(NvmeCtrl *n, NvmeCmd *cmd)
         trace_nvme_err_invalid_del_cq_notempty(qid);
         return NVME_INVALID_QUEUE_DEL;
     }
+    nvme_irq_deassert(n, cq);
     trace_nvme_del_cq(qid);
     nvme_free_cq(cq, n);
     return NVME_SUCCESS;