]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
nvme-pci: fix queue unquiesce check on slot_reset
authorKeith Busch <kbusch@kernel.org>
Thu, 24 Apr 2025 17:18:01 +0000 (10:18 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 May 2025 07:44:00 +0000 (09:44 +0200)
[ Upstream commit a75401227eeb827b1a162df1aa9d5b33da921c43 ]

A zero return means the reset was successfully scheduled. We don't want
to unquiesce the queues while the reset_work is pending, as that will
just flush out requeued requests to a failed completion.

Fixes: 71a5bb153be104 ("nvme: ensure disabling pairs with unquiesce")
Reported-by: Dhankaran Singh Ajravat <dhankaran@meta.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/nvme/host/pci.c

index a763df0200ab46320a63d33b3849c2b9e8fe9dfd..fdde38903ebcd58863b31b057895e36fd751c169 100644 (file)
@@ -3377,7 +3377,7 @@ static pci_ers_result_t nvme_slot_reset(struct pci_dev *pdev)
 
        dev_info(dev->ctrl.device, "restart after slot reset\n");
        pci_restore_state(pdev);
-       if (!nvme_try_sched_reset(&dev->ctrl))
+       if (nvme_try_sched_reset(&dev->ctrl))
                nvme_unquiesce_io_queues(&dev->ctrl);
        return PCI_ERS_RESULT_RECOVERED;
 }