From: Ming Lei <ming.lei@redhat.com>
To: Jens Axboe <axboe@fb.com>,
linux-block@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>
Cc: Bart Van Assche <bart.vanassche@sandisk.com>,
Ming Lei <ming.lei@redhat.com>,
linux-nvme@lists.infradead.org
Subject: [PATCH v5 07/12] nvme: host: unquiesce queue in nvme_kill_queues()
Date: Tue, 6 Jun 2017 23:22:05 +0800 [thread overview]
Message-ID: <20170606152210.22806-8-ming.lei@redhat.com> (raw)
In-Reply-To: <20170606152210.22806-1-ming.lei@redhat.com>
When nvme_kill_queues() is run, queues may be in
quiesced state, so we forcibly unquiesce queues to avoid
blocking dispatch, and I/O hang can be avoided in
remove path.
Peviously we use blk_mq_start_stopped_hw_queues() as
counterpart of blk_mq_quiesce_queue(), now we have
introduced blk_mq_unquiesce_queue(), so use it explicitly.
Cc: linux-nvme@lists.infradead.org
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
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 c3f189e54d10..d4e5fc95da4b 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2438,6 +2438,9 @@ void nvme_kill_queues(struct nvme_ctrl *ctrl)
struct nvme_ns *ns;
mutex_lock(&ctrl->namespaces_mutex);
+
+ /* Forcibly unquiesce queues to avoid blocking dispatch */
+ blk_mq_unquiesce_queue(ctrl->admin_q);
list_for_each_entry(ns, &ctrl->namespaces, list) {
/*
* Revalidating a dead namespace sets capacity to 0. This will
@@ -2448,6 +2451,9 @@ void nvme_kill_queues(struct nvme_ctrl *ctrl)
revalidate_disk(ns->disk);
blk_set_queue_dying(ns->queue);
+ /* Forcibly unquiesce queues to avoid blocking dispatch */
+ blk_mq_unquiesce_queue(ns->queue);
+
/*
* Forcibly start all queues to avoid having stuck requests.
* Note that we must ensure the queues are not stopped
--
2.9.4
next prev parent reply other threads:[~2017-06-06 15:23 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-06 15:21 [PATCH v5 00/12] blk-mq: fix & improve queue quiescing Ming Lei
2017-06-06 15:21 ` [PATCH v5 01/12] blk-mq: pass correct hctx to blk_mq_try_issue_directly Ming Lei
2017-06-06 15:59 ` Bart Van Assche
2017-06-06 15:22 ` [PATCH v5 02/12] blk-mq: fix direct issue Ming Lei
2017-06-06 16:02 ` Bart Van Assche
2017-06-07 2:50 ` Ming Lei
2017-06-06 15:22 ` [PATCH v5 03/12] blk-mq: move blk_mq_quiesce_queue() into include/linux/blk-mq.h Ming Lei
2017-06-06 16:06 ` Bart Van Assche
2017-06-06 15:22 ` [PATCH v5 04/12] blk-mq: introduce blk_mq_quiesce_queue_nowait() Ming Lei
2017-06-06 15:22 ` [PATCH v5 05/12] blk-mq: introduce blk_mq_unquiesce_queue Ming Lei
2017-06-06 15:22 ` [PATCH v5 06/12] blk-mq: use the introduced blk_mq_unquiesce_queue() Ming Lei
2017-06-06 15:22 ` Ming Lei [this message]
2017-06-06 15:22 ` [PATCH v5 08/12] blk-mq: use QUEUE_FLAG_QUIESCED to quiesce queue Ming Lei
2017-06-06 16:03 ` Bart Van Assche
2017-06-06 15:22 ` [PATCH v5 09/12] blk-mq: update comments on blk_mq_quiesce_queue() Ming Lei
2017-06-06 15:22 ` [PATCH v5 10/12] blk-mq: don't stop queue for quiescing Ming Lei
2017-06-06 15:22 ` [PATCH v5 11/12] blk-mq: clarify dispatch may not be drained/blocked by stopping queue Ming Lei
2017-06-06 16:07 ` Bart Van Assche
2017-06-06 15:22 ` [PATCH v5 12/12] Revert "blk-mq: don't use sync workqueue flushing from drivers" Ming Lei
2017-06-06 16:03 ` [PATCH v5 00/12] blk-mq: fix & improve queue quiescing Jens Axboe
2017-06-13 2:15 ` Ming Lei
2017-06-18 20:26 ` Jens Axboe
2017-06-18 23:05 ` Bart Van Assche
2017-06-18 23:48 ` Jens Axboe
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=20170606152210.22806-8-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=axboe@fb.com \
--cc=bart.vanassche@sandisk.com \
--cc=hch@infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox