]> git.baikalelectronics.ru Git - kernel.git/commit
nvme-pci: avoid race between nvme_reap_pending_cqes() and nvme_poll()
authorDongli Zhang <dongli.zhang@oracle.com>
Wed, 27 May 2020 16:13:52 +0000 (09:13 -0700)
committerChristoph Hellwig <hch@lst.de>
Wed, 27 May 2020 18:32:56 +0000 (20:32 +0200)
commitc9dd1f8afe0bacf42be7624e18bb5424571cc579
treec6d6b2a13976b6ac723df68bcc7c7312fc5bb397
parent0411e615a62b8e6d784ee47fecd2ec5913f997a5
nvme-pci: avoid race between nvme_reap_pending_cqes() and nvme_poll()

There may be a race between nvme_reap_pending_cqes() and nvme_poll(), e.g.,
when doing live reset while polling the nvme device.

      CPU X                        CPU Y
                               nvme_poll()
nvme_dev_disable()
-> nvme_stop_queues()
-> nvme_suspend_io_queues()
-> nvme_suspend_queue()
                               -> spin_lock(&nvmeq->cq_poll_lock);
-> nvme_reap_pending_cqes()
   -> nvme_process_cq()        -> nvme_process_cq()

In the above scenario, the nvme_process_cq() for the same queue may be
running on both CPU X and CPU Y concurrently.

It is much more easier to reproduce the issue when CONFIG_PREEMPT is
enabled in kernel. When CONFIG_PREEMPT is disabled, it would take longer
time for nvme_stop_queues()-->blk_mq_quiesce_queue() to wait for grace
period.

This patch protects nvme_process_cq() with nvmeq->cq_poll_lock in
nvme_reap_pending_cqes().

Fixes: 60266beac222 ("nvme/pci: move cqe check after device shutdown")
Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/pci.c