From: Ming Lei <ming.lei@redhat.com>
To: Sagi Grimberg <sagi@grimberg.me>
Cc: Jens Axboe <axboe@kernel.dk>,
linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
Christoph Hellwig <hch@lst.de>,
Keith Busch <keith.busch@intel.com>
Subject: Re: [PATCH v2 1/8] nvme-rdma: quiesce/unquiesce admin_q instead of start/stop its hw queues
Date: Wed, 5 Jul 2017 15:12:58 +0800 [thread overview]
Message-ID: <20170705071257.GA11084@ming.t460p> (raw)
In-Reply-To: <1499237591-15861-2-git-send-email-sagi@grimberg.me>
On Wed, Jul 05, 2017 at 09:53:04AM +0300, Sagi Grimberg wrote:
> unlike blk_mq_stop_hw_queues and blk_mq_start_stopped_hw_queues
> quiescing/unquiescing respects the submission path rcu grace.
> Also make sure to kick the requeue list when appropriate.
>
> Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
> ---
> drivers/nvme/host/rdma.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
> index cfb22531fc16..c8bf2606ba64 100644
> --- a/drivers/nvme/host/rdma.c
> +++ b/drivers/nvme/host/rdma.c
> @@ -778,7 +778,7 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work)
>
> if (ctrl->ctrl.queue_count > 1)
> nvme_stop_queues(&ctrl->ctrl);
> - blk_mq_stop_hw_queues(ctrl->ctrl.admin_q);
> + blk_mq_quiesce_queue(ctrl->ctrl.admin_q);
>
> /* We must take care of fastfail/requeue all our inflight requests */
> if (ctrl->ctrl.queue_count > 1)
> @@ -791,7 +791,8 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work)
> * queues are not a live anymore, so restart the queues to fail fast
> * new IO
> */
> - blk_mq_start_stopped_hw_queues(ctrl->ctrl.admin_q, true);
> + blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);
> + blk_mq_kick_requeue_list(ctrl->ctrl.admin_q);
As I commented yesterday, blk_mq_kick_requeue_list() isn't needed.
> nvme_start_queues(&ctrl->ctrl);
>
> nvme_rdma_reconnect_or_remove(ctrl);
> @@ -1636,9 +1637,10 @@ static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl)
> if (test_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[0].flags))
> nvme_shutdown_ctrl(&ctrl->ctrl);
>
> - blk_mq_stop_hw_queues(ctrl->ctrl.admin_q);
> + blk_mq_quiesce_queue(ctrl->ctrl.admin_q);
> blk_mq_tagset_busy_iter(&ctrl->admin_tag_set,
> nvme_cancel_request, &ctrl->ctrl);
> + blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);
> nvme_rdma_destroy_admin_queue(ctrl);
> }
>
> --
> 2.7.4
>
--
Ming
next prev parent reply other threads:[~2017-07-05 7:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-05 6:53 [PATCH v2 0/8] correct quiescing in several block drivers Sagi Grimberg
2017-07-05 6:53 ` [PATCH v2 1/8] nvme-rdma: quiesce/unquiesce admin_q instead of start/stop its hw queues Sagi Grimberg
2017-07-05 7:12 ` Ming Lei [this message]
2017-07-05 7:15 ` Sagi Grimberg
2017-07-05 7:34 ` Ming Lei
2017-07-05 6:53 ` [PATCH v2 2/8] nvme-fc: " Sagi Grimberg
2017-07-05 7:16 ` Ming Lei
2017-07-05 6:53 ` [PATCH v2 3/8] nvme-loop: " Sagi Grimberg
2017-07-05 7:14 ` Ming Lei
2017-07-05 6:53 ` [PATCH v2 4/8] nvme-pci: " Sagi Grimberg
2017-07-05 7:20 ` Ming Lei
2017-07-05 6:53 ` [PATCH v2 5/8] nvme: kick requeue list when requeueing a request instead of when starting the queues Sagi Grimberg
2017-07-05 7:22 ` Ming Lei
2017-07-05 6:53 ` [PATCH v2 6/8] nbd: quiesce request queues to make sure no submissions are inflight Sagi Grimberg
2017-07-05 6:53 ` [PATCH v2 7/8] mtip32xx: " Sagi Grimberg
2017-07-05 7:28 ` Ming Lei
2017-07-05 6:53 ` [PATCH v2 8/8] virtio_blk: quiesce/unquiesce live IO when entering PM states Sagi Grimberg
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=20170705071257.GA11084@ming.t460p \
--to=ming.lei@redhat.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=keith.busch@intel.com \
--cc=linux-block@vger.kernel.org \
--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