]> git.baikalelectronics.ru Git - kernel.git/commit
nvme-pci: do not call nvme_dev_remove_admin from nvme_remove
authorCasey Chen <cachen@purestorage.com>
Wed, 7 Jul 2021 21:14:32 +0000 (14:14 -0700)
committerChristoph Hellwig <hch@lst.de>
Tue, 13 Jul 2021 10:03:20 +0000 (12:03 +0200)
commit251ef6f71be2adfd09546a26643426fe62585173
tree02dea016d91f5d2045cc2886c40743976cdbdf7a
parente4b9852a0f4afe40604afb442e3af4452722050a
nvme-pci: do not call nvme_dev_remove_admin from nvme_remove

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: Casey Chen <cachen@purestorage.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/pci.c