lkml.org 
[lkml]   [2021]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 031/167] nvme-pci: do not call nvme_dev_remove_admin from nvme_remove
    Date
    From: Casey Chen <cachen@purestorage.com>

    [ 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: Casey Chen <cachen@purestorage.com>
    Reviewed-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 | 1 -
    1 file changed, 1 deletion(-)

    diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
    index 3f05df98697d..80e1d45b0668 100644
    --- a/drivers/nvme/host/pci.c
    +++ b/drivers/nvme/host/pci.c
    @@ -3003,7 +3003,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);
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-26 18:17    [W:3.731 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site