All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tyler Ramer <tyaramer@gmail.com>
Cc: Sagi Grimberg <sagi@grimberg.me>,
	linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org,
	Jens Axboe <axboe@fb.com>,
	tyaramer@gmail.com, Keith Busch <kbusch@kernel.org>,
	Balbir Singh <sblbir@amazon.com>, Christoph Hellwig <hch@lst.de>
Subject: [PATCH v3] Always shutdown the controller when nvme_remove_dead_ctrl is reached.
Date: Fri, 11 Oct 2019 10:28:26 -0400	[thread overview]
Message-ID: <20191011142826.8497-1-tyaramer@gmail.com> (raw)
In-Reply-To: <7042458bf65523747514c98db36ceaa5fa390679.camel@amazon.com>

nvme_timeout() will go through nvme_should_reset() path which won't
shutdown a device during nvme_dev_disable(). If the reset fails, then
the controller is bad and won't be coming back online, so it makes sense
to explicitly call a full shutdown during nvme_remove_dead_ctrl().

Signed-off-by: Tyler Ramer <tyaramer@gmail.com>
Reviewed-by: Balbir Singh <sblbir@amazon.com>

---
Changes since v2:
  * Clean up commit message with comment from Balbir
  * Still call nvme_kill_queues()
---
 drivers/nvme/host/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index c0808f9eb8ab..c3f5ba22c625 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2509,7 +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_dev_disable(dev, true);
 	nvme_kill_queues(&dev->ctrl);
 	if (!queue_work(nvme_wq, &dev->remove_work))
 		nvme_put_ctrl(&dev->ctrl);
-- 
2.23.0


_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

WARNING: multiple messages have this Message-ID (diff)
From: Tyler Ramer <tyaramer@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: tyaramer@gmail.com, Balbir Singh <sblbir@amazon.com>,
	Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@fb.com>,
	Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>,
	linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3] Always shutdown the controller when nvme_remove_dead_ctrl is reached.
Date: Fri, 11 Oct 2019 10:28:26 -0400	[thread overview]
Message-ID: <20191011142826.8497-1-tyaramer@gmail.com> (raw)
In-Reply-To: <7042458bf65523747514c98db36ceaa5fa390679.camel@amazon.com>

nvme_timeout() will go through nvme_should_reset() path which won't
shutdown a device during nvme_dev_disable(). If the reset fails, then
the controller is bad and won't be coming back online, so it makes sense
to explicitly call a full shutdown during nvme_remove_dead_ctrl().

Signed-off-by: Tyler Ramer <tyaramer@gmail.com>
Reviewed-by: Balbir Singh <sblbir@amazon.com>

---
Changes since v2:
  * Clean up commit message with comment from Balbir
  * Still call nvme_kill_queues()
---
 drivers/nvme/host/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index c0808f9eb8ab..c3f5ba22c625 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2509,7 +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_dev_disable(dev, true);
 	nvme_kill_queues(&dev->ctrl);
 	if (!queue_work(nvme_wq, &dev->remove_work))
 		nvme_put_ctrl(&dev->ctrl);
-- 
2.23.0


  reply	other threads:[~2019-10-11 14:28 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-03 19:13 [PATCH] nvme-pci: Shutdown when removing dead controller Tyler Ramer
2019-10-03 19:13 ` Tyler Ramer
2019-10-04 15:36 ` Tyler Ramer
2019-10-04 15:36   ` Tyler Ramer
2019-10-05  2:07   ` Singh, Balbir
2019-10-05  2:07     ` Singh, Balbir
2019-10-05 21:58     ` Tyler Ramer
2019-10-05 21:58       ` Tyler Ramer
2019-10-06 19:21   ` Keith Busch
2019-10-06 19:21     ` Keith Busch
2019-10-07 15:13     ` Tyler Ramer
2019-10-07 15:13       ` Tyler Ramer
2019-10-07 15:44       ` Keith Busch
2019-10-07 15:44         ` Keith Busch
2019-10-07 17:50         ` [PATCH v2] " Tyler Ramer
2019-10-07 17:50           ` Tyler Ramer
2019-10-07 18:28           ` Keith Busch
2019-10-07 18:28             ` Keith Busch
2019-10-07 19:32             ` Tyler Ramer
2019-10-07 19:32               ` Tyler Ramer
2019-10-07 22:11 ` [PATCH] " Singh, Balbir
2019-10-07 22:11   ` Singh, Balbir
2019-10-11 14:28   ` Tyler Ramer [this message]
2019-10-11 14:28     ` [PATCH v3] Always shutdown the controller when nvme_remove_dead_ctrl is reached Tyler Ramer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191011142826.8497-1-tyaramer@gmail.com \
    --to=tyaramer@gmail.com \
    --cc=axboe@fb.com \
    --cc=hch@lst.de \
    --cc=kbusch@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=sagi@grimberg.me \
    --cc=sblbir@amazon.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.