Skip to content

Commit 3d89321

Browse files
keithbuschChristoph Hellwig
authored andcommitted
nvme-pci: acquire cq_poll_lock in nvme_poll_irqdisable
We need to lock this queue for that condition because the timeout work executes per-namespace and can poll the poll CQ. Reported-by: Hannes Reinecke <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/ Fixes: a0fa964 ("NVMe: add blk polling support") Signed-off-by: Keith Busch <[email protected]> Signed-off-by: Daniel Wagner <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]>
1 parent 4069642 commit 3d89321

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/nvme/host/pci.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,9 @@ static void nvme_poll_irqdisable(struct nvme_queue *nvmeq)
12021202
WARN_ON_ONCE(test_bit(NVMEQ_POLLED, &nvmeq->flags));
12031203

12041204
disable_irq(pci_irq_vector(pdev, nvmeq->cq_vector));
1205+
spin_lock(&nvmeq->cq_poll_lock);
12051206
nvme_poll_cq(nvmeq, NULL);
1207+
spin_unlock(&nvmeq->cq_poll_lock);
12061208
enable_irq(pci_irq_vector(pdev, nvmeq->cq_vector));
12071209
}
12081210

0 commit comments

Comments
 (0)