Skip to content

Commit 26bc0a8

Browse files
maurizio-lombardikeithbusch
authored andcommitted
nvme-pci: fix race condition between reset and nvme_dev_disable()
nvme_dev_disable() modifies the dev->online_queues field, therefore nvme_pci_update_nr_queues() should avoid racing against it, otherwise we could end up passing invalid values to blk_mq_update_nr_hw_queues(). WARNING: CPU: 39 PID: 61303 at drivers/pci/msi/api.c:347 pci_irq_get_affinity+0x187/0x210 Workqueue: nvme-reset-wq nvme_reset_work [nvme] RIP: 0010:pci_irq_get_affinity+0x187/0x210 Call Trace: <TASK> ? blk_mq_pci_map_queues+0x87/0x3c0 ? pci_irq_get_affinity+0x187/0x210 blk_mq_pci_map_queues+0x87/0x3c0 nvme_pci_map_queues+0x189/0x460 [nvme] blk_mq_update_nr_hw_queues+0x2a/0x40 nvme_reset_work+0x1be/0x2a0 [nvme] Fix the bug by locking the shutdown_lock mutex before using dev->online_queues. Give up if nvme_dev_disable() is running or if it has been executed already. Fixes: 949928c ("NVMe: Fix possible queue use after freed") Tested-by: Yi Zhang <yi.zhang@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Maurizio Lombardi <mlombard@redhat.com> Signed-off-by: Keith Busch <kbusch@kernel.org>
1 parent 1f02134 commit 26bc0a8

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

drivers/nvme/host/pci.c

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2506,17 +2506,29 @@ static unsigned int nvme_pci_nr_maps(struct nvme_dev *dev)
25062506
return 1;
25072507
}
25082508

2509-
static void nvme_pci_update_nr_queues(struct nvme_dev *dev)
2509+
static bool nvme_pci_update_nr_queues(struct nvme_dev *dev)
25102510
{
25112511
if (!dev->ctrl.tagset) {
25122512
nvme_alloc_io_tag_set(&dev->ctrl, &dev->tagset, &nvme_mq_ops,
25132513
nvme_pci_nr_maps(dev), sizeof(struct nvme_iod));
2514-
return;
2514+
return true;
2515+
}
2516+
2517+
/* Give up if we are racing with nvme_dev_disable() */
2518+
if (!mutex_trylock(&dev->shutdown_lock))
2519+
return false;
2520+
2521+
/* Check if nvme_dev_disable() has been executed already */
2522+
if (!dev->online_queues) {
2523+
mutex_unlock(&dev->shutdown_lock);
2524+
return false;
25152525
}
25162526

25172527
blk_mq_update_nr_hw_queues(&dev->tagset, dev->online_queues - 1);
25182528
/* free previously allocated queues that are no longer usable */
25192529
nvme_free_queues(dev, dev->online_queues);
2530+
mutex_unlock(&dev->shutdown_lock);
2531+
return true;
25202532
}
25212533

25222534
static int nvme_pci_enable(struct nvme_dev *dev)
@@ -2797,7 +2809,8 @@ static void nvme_reset_work(struct work_struct *work)
27972809
nvme_dbbuf_set(dev);
27982810
nvme_unquiesce_io_queues(&dev->ctrl);
27992811
nvme_wait_freeze(&dev->ctrl);
2800-
nvme_pci_update_nr_queues(dev);
2812+
if (!nvme_pci_update_nr_queues(dev))
2813+
goto out;
28012814
nvme_unfreeze(&dev->ctrl);
28022815
} else {
28032816
dev_warn(dev->ctrl.device, "IO queues lost\n");

0 commit comments

Comments
 (0)