Linux block layer
 help / color / mirror / Atom feed
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 v3 4/9] nvme: host: unquiesce queue in nvme_kill_queues()
Date: Wed, 31 May 2017 20:37:01 +0800	[thread overview]
Message-ID: <20170531123706.20885-5-ming.lei@redhat.com> (raw)
In-Reply-To: <20170531123706.20885-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 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index c3f189e54d10..e44326d5cf19 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2448,6 +2448,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

  parent reply	other threads:[~2017-05-31 12:38 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-31 12:36 [PATCH v3 0/8] blk-mq: fix & improve queue quiescing Ming Lei
2017-05-31 12:36 ` [PATCH v3 1/9] blk-mq: introduce blk_mq_unquiesce_queue Ming Lei
2017-05-31 12:36 ` [PATCH v3 2/9] block: introduce flag of QUEUE_FLAG_QUIESCED Ming Lei
2017-05-31 12:37 ` [PATCH v3 3/9] blk-mq: use the introduced blk_mq_unquiesce_queue() Ming Lei
2017-05-31 15:21   ` Bart Van Assche
2017-06-01  0:54     ` Ming Lei
2017-06-01 23:09       ` Bart Van Assche
2017-06-02  2:00         ` Ming Lei
2017-06-02 22:19           ` Bart Van Assche
2017-05-31 12:37 ` Ming Lei [this message]
2017-05-31 12:37 ` [PATCH v3 5/9] blk-mq: fix blk_mq_quiesce_queue Ming Lei
2017-05-31 15:37   ` Bart Van Assche
2017-06-01  2:21     ` Ming Lei
2017-06-01 23:19       ` Bart Van Assche
2017-06-02  2:02         ` Ming Lei
2017-05-31 12:37 ` [PATCH v3 6/9] blk-mq: update comments on blk_mq_quiesce_queue() Ming Lei
2017-05-31 12:37 ` [PATCH v3 7/9] blk-mq: don't stop queue for quiescing Ming Lei
2017-05-31 12:37 ` [PATCH v3 8/9] blk-mq: clarify dispatch may not be drained/blocked by stopping queue Ming Lei
2017-05-31 12:37 ` [PATCH v3 9/9] Revert "blk-mq: don't use sync workqueue flushing from drivers" 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=20170531123706.20885-5-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