From: keith.busch@intel.com (Keith Busch)
Subject: [PATCH 3/3] nvme: quiesce admin queue for fw activation
Date: Fri, 24 May 2019 14:20:36 -0600 [thread overview]
Message-ID: <20190524202036.17265-4-keith.busch@intel.com> (raw)
In-Reply-To: <20190524202036.17265-1-keith.busch@intel.com>
From: Keith Busch <kbusch@kernel.org>
The controller's admin queue processing is paused during firmware
activation, just like IO queues. Quiesce these, and inform the syslog
this uncommon event is happening.
Signed-off-by: Keith Busch <kbusch at kernel.org>
---
drivers/nvme/host/core.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 96dac2292897..5a6d27823f7f 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3604,7 +3604,10 @@ static void nvme_fw_act_work(struct work_struct *work)
fw_act_timeout = jiffies +
msecs_to_jiffies(admin_timeout * 1000);
+ dev_info(ctrl->device, "processing paused for fw activation\n");
nvme_stop_queues(ctrl);
+ blk_mq_quiesce_queue(ctrl->admin_q);
+
while (nvme_ctrl_pp_status(ctrl)) {
if (time_after(jiffies, fw_act_timeout)) {
dev_warn(ctrl->device,
@@ -3619,7 +3622,10 @@ static void nvme_fw_act_work(struct work_struct *work)
ctrl->state != NVME_CTRL_ADMIN_ONLY)
return;
+ dev_info(ctrl->device, "processing resumed\n");
+ blk_mq_unquiesce_queue(ctrl->admin_q);
nvme_start_queues(ctrl);
+
/* read FW slot information to clear the AER */
nvme_get_fw_slot_info(ctrl);
}
--
2.14.4
next prev parent reply other threads:[~2019-05-24 20:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-24 20:20 [PATCH 0/3] nvme: Improve processing paused support Keith Busch
2019-05-24 20:20 ` [PATCH 1/3] nvme-pci: reset timeout when processing is paused Keith Busch
2019-05-25 13:22 ` Minwoo Im
2019-06-01 9:07 ` Christoph Hellwig
2019-05-24 20:20 ` [PATCH 2/3] nvme: rearm fw notification in admin only state Keith Busch
2019-06-01 9:08 ` Christoph Hellwig
2019-05-24 20:20 ` Keith Busch [this message]
2019-05-25 13:17 ` [PATCH 3/3] nvme: quiesce admin queue for fw activation Minwoo Im
2019-05-25 14:07 ` Keith Busch
2019-05-25 15:05 ` Minwoo Im
2019-05-31 23:32 ` [PATCH 0/3] nvme: Improve processing paused support Sagi Grimberg
2019-06-01 2:45 ` Minwoo Im
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=20190524202036.17265-4-keith.busch@intel.com \
--to=keith.busch@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox