From: Keith Busch <keith.busch@intel.com>
To: Ming Lei <ming.lei@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>, Sagi Grimberg <sagi@grimberg.me>,
stable@vger.kernel.org, linux-block@vger.kernel.org,
linux-nvme@lists.infradead.org, Christoph Hellwig <hch@lst.de>
Subject: Re: [PATCH] nvme: remove disk after hw queue is started
Date: Mon, 8 May 2017 11:11:24 -0400 [thread overview]
Message-ID: <20170508151123.GA463@localhost.localdomain> (raw)
In-Reply-To: <20170508150720.GB32736@localhost.localdomain>
On Mon, May 08, 2017 at 11:07:20AM -0400, Keith Busch wrote:
> I'm almost certain the remove_work shouldn't even be running in this
> case. If the reset work can't transition the controller state correctly,
> it should assume something is handling the controller.
Here's the more complete version of what I had in mind. Does this solve
the reported issue?
---
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 26a5fd0..46a37fb 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1792,7 +1792,7 @@ static void nvme_reset_work(struct work_struct *work)
nvme_dev_disable(dev, false);
if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_RESETTING))
- goto out;
+ return;
result = nvme_pci_enable(dev);
if (result)
@@ -1854,7 +1854,7 @@ static void nvme_reset_work(struct work_struct *work)
if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_LIVE)) {
dev_warn(dev->ctrl.device, "failed to mark controller live\n");
- goto out;
+ return;
}
if (dev->online_queues > 1)
--
WARNING: multiple messages have this Message-ID (diff)
From: keith.busch@intel.com (Keith Busch)
Subject: [PATCH] nvme: remove disk after hw queue is started
Date: Mon, 8 May 2017 11:11:24 -0400 [thread overview]
Message-ID: <20170508151123.GA463@localhost.localdomain> (raw)
In-Reply-To: <20170508150720.GB32736@localhost.localdomain>
On Mon, May 08, 2017@11:07:20AM -0400, Keith Busch wrote:
> I'm almost certain the remove_work shouldn't even be running in this
> case. If the reset work can't transition the controller state correctly,
> it should assume something is handling the controller.
Here's the more complete version of what I had in mind. Does this solve
the reported issue?
---
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 26a5fd0..46a37fb 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1792,7 +1792,7 @@ static void nvme_reset_work(struct work_struct *work)
nvme_dev_disable(dev, false);
if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_RESETTING))
- goto out;
+ return;
result = nvme_pci_enable(dev);
if (result)
@@ -1854,7 +1854,7 @@ static void nvme_reset_work(struct work_struct *work)
if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_LIVE)) {
dev_warn(dev->ctrl.device, "failed to mark controller live\n");
- goto out;
+ return;
}
if (dev->online_queues > 1)
--
next prev parent reply other threads:[~2017-05-08 15:11 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-08 11:24 [PATCH] nvme: remove disk after hw queue is started Ming Lei
2017-05-08 11:24 ` Ming Lei
2017-05-08 12:46 ` Ming Lei
2017-05-08 12:46 ` Ming Lei
2017-05-08 15:07 ` Keith Busch
2017-05-08 15:07 ` Keith Busch
2017-05-08 15:11 ` Keith Busch [this message]
2017-05-08 15:11 ` Keith Busch
2017-05-08 16:15 ` Ming Lei
2017-05-08 16:15 ` Ming Lei
2017-05-08 17:25 ` Keith Busch
2017-05-08 17:25 ` Keith Busch
2017-05-09 1:10 ` Ming Lei
2017-05-09 1:10 ` Ming Lei
2017-05-09 3:26 ` Ming Lei
2017-05-09 3:26 ` Ming Lei
[not found] <CAOSXXT6nGggnZj6e0Mo4eBwq63HfWRrVe3ddVA-YORvPJd9Raw@mail.gmail.com>
2017-05-09 5:58 ` Keith Busch
2017-05-09 8:30 ` Ming Lei
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=20170508151123.GA463@localhost.localdomain \
--to=keith.busch@intel.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=ming.lei@redhat.com \
--cc=sagi@grimberg.me \
--cc=stable@vger.kernel.org \
/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.