A polled queued doesn't trigger interrupts, so it's always safe
to grab the queue lock without disabling interrupts.

Cc: Keith Busch <keith.bu...@intel.com>
Cc: linux-n...@lists.infradead.org
Signed-off-by: Jens Axboe <ax...@kernel.dk>
---
 drivers/nvme/host/pci.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 6aa86dfcb32c..bb22ae567208 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1067,9 +1067,18 @@ static int __nvme_poll(struct nvme_queue *nvmeq, 
unsigned int tag)
        if (!nvme_cqe_pending(nvmeq))
                return 0;
 
-       spin_lock_irq(&nvmeq->cq_lock);
+       /*
+        * Polled queue doesn't have an IRQ, no need to disable ints
+        */
+       if (!nvmeq->polled)
+               local_irq_disable();
+
+       spin_lock(&nvmeq->cq_lock);
        found = nvme_process_cq(nvmeq, &start, &end, tag);
-       spin_unlock_irq(&nvmeq->cq_lock);
+       spin_unlock(&nvmeq->cq_lock);
+
+       if (!nvmeq->polled)
+               local_irq_enable();
 
        nvme_complete_cqes(nvmeq, start, end);
        return found;
-- 
2.17.1

Reply via email to