https://github.com/torvalds/linux
Revision 9210c075cef29c1f764b4252f93105103bdfb292 authored by Dongli Zhang on 27 May 2020, 16:13:52 UTC, committed by Christoph Hellwig on 27 May 2020, 18:32:56 UTC
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: fa46c6fb5d61 ("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>
1 parent b69e2ef
Tip revision: 9210c075cef29c1f764b4252f93105103bdfb292 authored by Dongli Zhang on 27 May 2020, 16:13:52 UTC
nvme-pci: avoid race between nvme_reap_pending_cqes() and nvme_poll()
nvme-pci: avoid race between nvme_reap_pending_cqes() and nvme_poll()
Tip revision: 9210c07
File | Mode | Size |
---|---|---|
Kconfig | -rw-r--r-- | 73.5 KB |
Makefile | -rw-r--r-- | 1.2 KB |
calibrate.c | -rw-r--r-- | 8.6 KB |
do_mounts.c | -rw-r--r-- | 16.0 KB |
do_mounts.h | -rw-r--r-- | 1.1 KB |
do_mounts_initrd.c | -rw-r--r-- | 3.4 KB |
do_mounts_md.c | -rw-r--r-- | 7.9 KB |
do_mounts_rd.c | -rw-r--r-- | 8.1 KB |
init_task.c | -rw-r--r-- | 5.4 KB |
initramfs.c | -rw-r--r-- | 14.5 KB |
main.c | -rw-r--r-- | 35.8 KB |
noinitramfs.c | -rw-r--r-- | 873 bytes |
version.c | -rw-r--r-- | 1.3 KB |
Computing file changes ...