Skip to content

Commit 48764ee

Browse files
nvme-pci: acquire cq_poll_lock in nvme_poll_irqdisable
JIRA: https://issues.redhat.com/browse/RHEL-96225 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]> (cherry picked from commit 3d89321) Signed-off-by: Maurizio Lombardi <[email protected]>
1 parent ee9c6ab commit 48764ee

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
@@ -1107,7 +1107,9 @@ static void nvme_poll_irqdisable(struct nvme_queue *nvmeq)
11071107
WARN_ON_ONCE(test_bit(NVMEQ_POLLED, &nvmeq->flags));
11081108

11091109
disable_irq(pci_irq_vector(pdev, nvmeq->cq_vector));
1110+
spin_lock(&nvmeq->cq_poll_lock);
11101111
nvme_poll_cq(nvmeq, NULL);
1112+
spin_unlock(&nvmeq->cq_poll_lock);
11111113
enable_irq(pci_irq_vector(pdev, nvmeq->cq_vector));
11121114
}
11131115

0 commit comments

Comments
 (0)