Re: [PATCH v2] nvme-pci: Shutdown when removing dead controller

Keith Busch
2019-10-07T18:28:17Z

On Mon, Oct 07, 2019 at 01:50:11PM -0400, Tyler Ramer wrote:
> Shutdown the controller when nvme_remove_dead_controller is
> reached.
>
> If nvme_remove_dead_controller() is called, the controller won't
> be comming back online, so we should shut it down rather than just
> disabling.
>
> Remove nvme_kill_queues() as nvme_dev_remove() will take care of
> unquiescing queues.

We do still need to kill the queues, though. The shutdown == true just flushes
all pending requests. Killing queues does that too, but it also sets the
request_queue to dying, which will terminate syncing any dirty pages.

> ---
>
> Changes since v1:
> * Clean up commit message
> * Remove nvme_kill_queues()
> ---
> drivers/nvme/host/pci.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index c0808f9eb8ab..68d5fb880d80 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -2509,8 +2509,7 @@ static void nvme_pci_free_ctrl(struct nvme_ctrl *ctrl)
> static void nvme_remove_dead_ctrl(struct nvme_dev *dev)
> {
> nvme_get_ctrl(&dev->ctrl);
> - nvme_dev_disable(dev, false);
> - nvme_kill_queues(&dev->ctrl);
> + nvme_dev_disable(dev, true);
> if (!queue_work(nvme_wq, &dev->remove_work))
> nvme_put_ctrl(&dev->ctrl);
> }
> --
> 2.23.0
>