From: Chao Leng <lengchao@huawei.com>
To: Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>,
Keith Busch <kbusch@kernel.org>, Sagi Grimberg <sagi@grimberg.me>
Cc: Ming Lei <ming.lei@redhat.com>, <linux-nvme@lists.infradead.org>,
<linux-block@vger.kernel.org>
Subject: Re: [PATCH 4/8] blk-mq: pass a tagset to blk_mq_wait_quiesce_done
Date: Fri, 21 Oct 2022 10:49:29 +0800 [thread overview]
Message-ID: <404f5e5c-df21-3d1b-e263-2132ba7791d0@huawei.com> (raw)
In-Reply-To: <20221020105608.1581940-5-hch@lst.de>
Reviewed-by: Chao Leng <lengchao@huawei.com>
On 2022/10/20 18:56, Christoph Hellwig wrote:
> Noting in blk_mq_wait_quiesce_done needs the request_queue now, so just
> pass the tagset, and move the non-mq check into the only caller that
> needs it.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> block/blk-mq.c | 10 +++++-----
> drivers/nvme/host/core.c | 4 ++--
> drivers/scsi/scsi_lib.c | 2 +-
> include/linux/blk-mq.h | 2 +-
> 4 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index 4a81a2da43328..cf8f9f9a96c35 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -254,15 +254,15 @@ EXPORT_SYMBOL_GPL(blk_mq_quiesce_queue_nowait);
>
> /**
> * blk_mq_wait_quiesce_done() - wait until in-progress quiesce is done
> - * @q: request queue.
> + * @set: tag_set to wait on
> *
> * Note: it is driver's responsibility for making sure that quiesce has
> * been started.
> */
> -void blk_mq_wait_quiesce_done(struct request_queue *q)
> +void blk_mq_wait_quiesce_done(struct blk_mq_tag_set *set)
> {
> - if (q->tag_set->flags & BLK_MQ_F_BLOCKING)
> - synchronize_srcu(&q->tag_set->srcu);
> + if (set->flags & BLK_MQ_F_BLOCKING)
> + synchronize_srcu(&set->srcu);
> else
> synchronize_rcu();
> }
> @@ -282,7 +282,7 @@ void blk_mq_quiesce_queue(struct request_queue *q)
> blk_mq_quiesce_queue_nowait(q);
> /* nothing to wait for non-mq queues */
> if (queue_is_mq(q))
> - blk_mq_wait_quiesce_done(q);
> + blk_mq_wait_quiesce_done(q->tag_set);
> }
> EXPORT_SYMBOL_GPL(blk_mq_quiesce_queue);
>
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 44a5321743128..a74212a4f1a5f 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -5100,7 +5100,7 @@ static void nvme_stop_ns_queue(struct nvme_ns *ns)
> if (!test_and_set_bit(NVME_NS_STOPPED, &ns->flags))
> blk_mq_quiesce_queue(ns->queue);
> else
> - blk_mq_wait_quiesce_done(ns->queue);
> + blk_mq_wait_quiesce_done(ns->queue->tag_set);
> }
>
> /*
> @@ -5216,7 +5216,7 @@ void nvme_stop_admin_queue(struct nvme_ctrl *ctrl)
> if (!test_and_set_bit(NVME_CTRL_ADMIN_Q_STOPPED, &ctrl->flags))
> blk_mq_quiesce_queue(ctrl->admin_q);
> else
> - blk_mq_wait_quiesce_done(ctrl->admin_q);
> + blk_mq_wait_quiesce_done(ctrl->admin_q->tag_set);
> }
> EXPORT_SYMBOL_GPL(nvme_stop_admin_queue);
>
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index 8b89fab7c4206..249757ddd8fea 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -2735,7 +2735,7 @@ static void scsi_stop_queue(struct scsi_device *sdev, bool nowait)
> blk_mq_quiesce_queue(sdev->request_queue);
> } else {
> if (!nowait)
> - blk_mq_wait_quiesce_done(sdev->request_queue);
> + blk_mq_wait_quiesce_done(sdev->request_queue->tag_set);
> }
> }
>
> diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
> index f040a7cab5dbf..dfd565c4fb84e 100644
> --- a/include/linux/blk-mq.h
> +++ b/include/linux/blk-mq.h
> @@ -881,7 +881,7 @@ void blk_mq_start_hw_queues(struct request_queue *q);
> void blk_mq_start_stopped_hw_queue(struct blk_mq_hw_ctx *hctx, bool async);
> void blk_mq_start_stopped_hw_queues(struct request_queue *q, bool async);
> void blk_mq_quiesce_queue(struct request_queue *q);
> -void blk_mq_wait_quiesce_done(struct request_queue *q);
> +void blk_mq_wait_quiesce_done(struct blk_mq_tag_set *set);
> void blk_mq_unquiesce_queue(struct request_queue *q);
> void blk_mq_delay_run_hw_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs);
> void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async);
>
next prev parent reply other threads:[~2022-10-21 2:49 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-20 10:56 per-tagset SRCU struct and quiesce Christoph Hellwig
2022-10-20 10:56 ` [PATCH 1/8] block: set the disk capacity to 0 in blk_mark_disk_dead Christoph Hellwig
2022-10-20 13:16 ` Sagi Grimberg
2022-10-21 1:09 ` Ming Lei
2022-10-21 13:11 ` Christoph Hellwig
2022-10-21 1:53 ` Chao Leng
2022-10-21 6:49 ` Hannes Reinecke
2022-10-21 13:13 ` Christoph Hellwig
2022-10-21 21:12 ` Bart Van Assche
2022-10-20 10:56 ` [PATCH 2/8] blk-mq: skip non-mq queues in blk_mq_quiesce_queue Christoph Hellwig
2022-10-20 13:16 ` Sagi Grimberg
2022-10-21 1:13 ` Ming Lei
2022-10-21 13:19 ` Christoph Hellwig
2022-10-21 15:08 ` Ming Lei
2022-10-21 2:47 ` Chao Leng
2022-10-21 3:16 ` Chao Leng
2022-10-21 6:49 ` Hannes Reinecke
2022-10-20 10:56 ` [PATCH 3/8] blk-mq: move the srcu_struct used for quiescing to the tagset Christoph Hellwig
2022-10-20 13:23 ` Sagi Grimberg
2022-10-20 17:26 ` Keith Busch
2022-10-21 13:20 ` Christoph Hellwig
2022-10-21 1:41 ` Ming Lei
2022-10-21 2:49 ` Chao Leng
2022-10-21 6:50 ` Hannes Reinecke
2022-10-21 7:16 ` Chao Leng
2022-10-21 13:22 ` Christoph Hellwig
2022-10-20 10:56 ` [PATCH 4/8] blk-mq: pass a tagset to blk_mq_wait_quiesce_done Christoph Hellwig
2022-10-20 13:23 ` Sagi Grimberg
2022-10-21 1:46 ` Ming Lei
2022-10-21 13:23 ` Christoph Hellwig
2022-10-21 2:49 ` Chao Leng [this message]
2022-10-21 6:50 ` Hannes Reinecke
2022-10-21 21:18 ` Bart Van Assche
2022-10-20 10:56 ` [PATCH 5/8] blk-mq: add tagset quiesce interface Christoph Hellwig
2022-10-20 13:24 ` Sagi Grimberg
2022-10-21 1:53 ` Ming Lei
2022-10-21 2:49 ` Chao Leng
2022-10-21 6:51 ` Hannes Reinecke
2022-10-21 21:22 ` Bart Van Assche
2022-10-24 1:57 ` Chao Leng
2022-10-24 13:35 ` Bart Van Assche
2022-10-25 1:38 ` Chao Leng
2022-10-20 10:56 ` [PATCH 6/8] nvme: move the NS_DEAD flag to the controller Christoph Hellwig
2022-10-20 13:30 ` Sagi Grimberg
2022-10-21 13:28 ` Christoph Hellwig
2022-10-24 8:43 ` Sagi Grimberg
2022-10-24 8:50 ` Sagi Grimberg
2022-10-21 2:49 ` Chao Leng
2022-10-21 6:51 ` Hannes Reinecke
2022-10-20 10:56 ` [PATCH 7/8] nvme: remove nvme_set_queue_dying Christoph Hellwig
2022-10-20 13:10 ` Sagi Grimberg
2022-10-21 13:29 ` Christoph Hellwig
2022-10-24 8:48 ` Sagi Grimberg
2022-10-21 2:50 ` Chao Leng
2022-10-21 6:52 ` Hannes Reinecke
2022-10-20 10:56 ` [PATCH 8/8] nvme: use blk_mq_[un]quiesce_tagset Christoph Hellwig
2022-10-20 13:35 ` Sagi Grimberg
2022-10-21 2:50 ` Chao Leng
2022-10-21 6:52 ` Hannes Reinecke
2022-10-20 13:16 ` per-tagset SRCU struct and quiesce Sagi Grimberg
2022-10-21 18:06 ` 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=404f5e5c-df21-3d1b-e263-2132ba7791d0@huawei.com \
--to=lengchao@huawei.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=ming.lei@redhat.com \
--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