From: kbusch@kernel.org
To: linux-nvme@lists.infradead.org, Sagi Grimberg <sagi@grimberg.me>,
Christoph Hellwig <hch@lst.de>
Cc: Keith Busch <kbusch@kernel.org>,
Edmund Nadolski <edmund.nadolski@intel.com>,
James Smart <james.smart@broadcom.com>
Subject: [PATCHv2 5/6] nvme: Prevent resets during paused states
Date: Fri, 20 Sep 2019 06:34:30 +0900 [thread overview]
Message-ID: <20190919213431.7864-6-kbusch@kernel.org> (raw)
In-Reply-To: <20190919213431.7864-1-kbusch@kernel.org>
From: Keith Busch <kbusch@kernel.org>
A paused controller is doing critical internal activation work in the
background. Block any controller reset from occurring during this period
by setting it to the controller state to RESETTING first.
Signed-off-by: Keith Busch <kbusch@kernel.org>
---
drivers/nvme/host/core.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 95b74d020506..33b5729763c2 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3742,15 +3742,14 @@ static void nvme_fw_act_work(struct work_struct *work)
if (time_after(jiffies, fw_act_timeout)) {
dev_warn(ctrl->device,
"Fw activation timeout, reset controller\n");
- nvme_reset_ctrl(ctrl);
- break;
+ nvme_reset_continue(ctrl);
+ return;
}
msleep(100);
}
- if (ctrl->state != NVME_CTRL_LIVE)
+ if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_LIVE))
return;
-
nvme_start_queues(ctrl);
/* read FW slot information to clear the AER */
nvme_get_fw_slot_info(ctrl);
@@ -3768,7 +3767,8 @@ static void nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result)
nvme_queue_scan(ctrl);
break;
case NVME_AER_NOTICE_FW_ACT_STARTING:
- queue_work(nvme_wq, &ctrl->fw_act_work);
+ if (nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING))
+ queue_work(nvme_wq, &ctrl->fw_act_work);
break;
#ifdef CONFIG_NVME_MULTIPATH
case NVME_AER_NOTICE_ANA:
--
2.21.0
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2019-09-19 21:35 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-19 21:34 [PATCHv2 0/6] nvme: double reset prevention kbusch
2019-09-19 21:34 ` [PATCHv2 1/6] nvme-pci: Free tagset if no IO queues kbusch
2019-09-20 17:49 ` Sagi Grimberg
2019-09-20 17:53 ` Keith Busch
2019-09-20 17:56 ` Sagi Grimberg
2019-09-27 21:33 ` Christoph Hellwig
2019-09-19 21:34 ` [PATCHv2 2/6] nvme: Remove ADMIN_ONLY state kbusch
2019-09-20 17:53 ` Sagi Grimberg
2019-09-27 21:35 ` Christoph Hellwig
2019-09-19 21:34 ` [PATCHv2 3/6] nvme: Restart request timers in resetting state kbusch
2019-09-20 17:53 ` Sagi Grimberg
2019-09-27 21:36 ` Christoph Hellwig
2019-09-19 21:34 ` [PATCHv2 4/6] nvme: Introduce nvme_reset_continue kbusch
2019-09-20 18:15 ` Sagi Grimberg
2019-09-27 21:37 ` Christoph Hellwig
2019-09-27 21:44 ` Christoph Hellwig
2019-09-19 21:34 ` kbusch [this message]
2019-09-20 18:03 ` [PATCHv2 5/6] nvme: Prevent resets during paused states Sagi Grimberg
2019-09-20 18:05 ` Sagi Grimberg
2019-09-20 18:08 ` Keith Busch
2019-09-20 18:14 ` Sagi Grimberg
2019-09-27 21:41 ` Christoph Hellwig
2019-09-28 0:23 ` Keith Busch
[not found] ` <CGME20191010120317uscas1p1e4483ca19dbb0e550c413c18c5928537@uscas1p1.samsung.com>
2019-10-10 12:03 ` Judy Brock
2019-10-10 13:59 ` Keith Busch
2019-10-10 14:03 ` Christoph Hellwig
2019-10-11 0:51 ` Judy Brock
2019-10-11 14:23 ` Keith Busch
2019-09-19 21:34 ` [PATCHv2 6/6] nvme: Wait for reset state when required kbusch
2019-09-20 18:13 ` Sagi Grimberg
2019-09-20 18:26 ` Keith Busch
2019-09-20 19:29 ` Keith Busch
2019-09-20 20:49 ` Sagi Grimberg
2019-09-20 21:06 ` Keith Busch
2019-09-27 21:43 ` Christoph Hellwig
2019-09-20 17:51 ` [PATCHv2 0/6] nvme: double reset prevention Sagi Grimberg
2019-09-20 17:54 ` Keith Busch
2019-09-23 22:09 ` Sagi Grimberg
2019-09-24 15:07 ` Keith Busch
2019-09-24 18:07 ` Sagi Grimberg
2019-09-24 18:12 ` Keith Busch
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=20190919213431.7864-6-kbusch@kernel.org \
--to=kbusch@kernel.org \
--cc=edmund.nadolski@intel.com \
--cc=hch@lst.de \
--cc=james.smart@broadcom.com \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).