Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b248990a authored by Casey Chen's avatar Casey Chen Committed by Greg Kroah-Hartman
Browse files

nvme-pci: do not call nvme_dev_remove_admin from nvme_remove 



[ Upstream commit 251ef6f71be2adfd09546a26643426fe62585173 ]

nvme_dev_remove_admin could free dev->admin_q and the admin_tagset
while they are being accessed by nvme_dev_disable(), which can be called
by nvme_reset_work via nvme_remove_dead_ctrl.

Commit cb4bfda62afa ("nvme-pci: fix hot removal during error handling")
intended to avoid requests being stuck on a removed controller by killing
the admin queue. But the later fix c8e9e9b7646e ("nvme-pci: unquiesce
admin queue on shutdown"), together with nvme_dev_disable(dev, true)
right before nvme_dev_remove_admin() could help dispatch requests and
fail them early, so we don't need nvme_dev_remove_admin() any more.

Fixes: cb4bfda62afa ("nvme-pci: fix hot removal during error handling")
Signed-off-by: default avatarCasey Chen <cachen@purestorage.com>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bff0854e

drivers/nvme/host/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -2605,7 +2605,6 @@ static void nvme_remove(struct pci_dev *pdev) 
	if (!pci_device_is_present(pdev)) {

		nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_DEAD);

		nvme_dev_disable(dev, true);

		nvme_dev_remove_admin(dev);

	}



	flush_work(&dev->ctrl.reset_work);