nvme-pci: serialize polling interrupt queue with shutdown
PATCH 1/1 nvme-pci: serialize polling interrupt queue with shutdown
From: Keith Busch <[email protected]>
Polling an interrupt driven completion queue temporarilly disables the irq. If this occurs concurrently with another thread disabling the device, the irq vector may have been freed, which makes it available for reuse. Reenabling the irq after polling the queue may be referencing a stale irq at that point.
Fix this race by ensuring nvme_poll_irqdisable() can not run concurrently with nvme_dev_disable(), and skip polling the completion queue if the queue has already been disabled.
--- drivers/nvme/host/pci.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/nvme/host/pci.c +6 -2
@@ -1885,8 +1885,12 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req)*/ if (test_bit (NVMEQ_POLLED , &nvmeq->flags))nvme_poll (req->mq_hctx,NULL ); -else -nvme_poll_irqdisable (nvmeq); +else { +mutex_lock (&dev->shutdown_lock); +if (test_bit (NVMEQ_ENABLED , &nvmeq->flags)) +nvme_poll_irqdisable (nvmeq); +mutex_unlock (&dev->shutdown_lock); + }if (blk_mq_rq_state (req) !=MQ_RQ_IN_FLIGHT ) { dev_warn(dev->ctrl.device,
Signature · 1 line
2.53.0-Meta
Christoph Hellwig
maintainerQuoted 11 lines · Keith Busch
From: Keith Busch <[email protected]>
Polling an interrupt driven completion queue temporarilly disables the irq. If this occurs concurrently with another thread disabling the device, the irq vector may have been freed, which makes it available for reuse. Reenabling the irq after polling the queue may be referencing a stale irq at that point.
Fix this race by ensuring
nvme_poll_irqdisable()can not run concurrently withnvme_dev_disable(), and skip polling the completion queue if the queue has already been disabled.
Do we need the same change in nvme_suspend_queue? I.e., should the check and locking be moved into nvme_poll_irqdisable?
Keith Busch
maintainerQuoted 9 lines · Christoph Hellwig
Quoted 8 lines · Keith Busch
From: Keith Busch <[email protected]>
Polling an interrupt driven completion queue temporarilly disables the irq. If this occurs concurrently with another thread disabling the device, the irq vector may have been freed, which makes it available for reuse. Reenabling the irq after polling the queue may be referencing a stale irq at that point.
Quoted 6 lines
Quoted 3 lines
Fix this race by ensuring
nvme_poll_irqdisable()can not run concurrently withnvme_dev_disable(), and skip polling the completion queue if the queue has already been disabled.Do we need the same change in
nvme_suspend_queue? I.e., should the check and locking be moved intonvme_poll_irqdisable?
nvme_suspend_queue is called from only one place that already holds the same lock, so not necessary. And we can't do the locking within nvme_poll_irqdisable since nvme_dev_disable calls it with the lock already held too. I can add lockdep asserts to make the expectations clear, though.