From: Ming Lei <ming.lei@redhat.com>
To: Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>,
"Martin K . Petersen" <martin.petersen@oracle.com>
Cc: Sagi Grimberg <sagi@grimberg.me>,
linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
linux-scsi@vger.kernel.org, Keith Busch <kbusch@kernel.org>,
Ming Lei <ming.lei@redhat.com>
Subject: [PATCH 5/5] scsi: use blk-mq quiesce APIs to implement scsi_host_block
Date: Fri, 19 Nov 2021 10:18:49 +0800 [thread overview]
Message-ID: <20211119021849.2259254-6-ming.lei@redhat.com> (raw)
In-Reply-To: <20211119021849.2259254-1-ming.lei@redhat.com>
scsi_host_block() calls synchronize_rcu() directly to wait for
quiesce done, this way is ugly since it exposes blk-mq quiesce's
implementation details.
Instead apply blk_mq_wait_quiesce_done() and
blk_mq_global_quiesce_wait() for scsi_host_block().
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
drivers/scsi/scsi_lib.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 5e8b5ecb3245..b0da6a4a1784 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2952,15 +2952,15 @@ scsi_host_block(struct Scsi_Host *shost)
}
}
- /*
- * SCSI never enables blk-mq's BLK_MQ_F_BLOCKING flag so
- * calling synchronize_rcu() once is enough.
- */
- WARN_ON_ONCE(shost->tag_set.flags & BLK_MQ_F_BLOCKING);
-
- if (!ret)
- synchronize_rcu();
+ if (!ret) {
+ shost_for_each_device(sdev, shost) {
+ struct request_queue *q = sdev->request_queue;
+ blk_mq_wait_quiesce_done(q);
+ if (blk_mq_global_quiesce_wait(q))
+ break;
+ }
+ }
return ret;
}
EXPORT_SYMBOL_GPL(scsi_host_block);
--
2.31.1
prev parent reply other threads:[~2021-11-19 2:19 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-19 2:18 [PATCH 0/5] blk-mq: quiesce improvement Ming Lei
2021-11-19 2:18 ` [PATCH 1/5] blk-mq: move srcu from blk_mq_hw_ctx to request_queue Ming Lei
2021-11-19 4:30 ` Bart Van Assche
2021-11-19 8:10 ` Ming Lei
2021-11-22 7:48 ` Sagi Grimberg
2021-11-22 13:08 ` Ming Lei
2021-11-22 13:47 ` Sagi Grimberg
2021-11-19 2:18 ` [PATCH 2/5] blk-mq: rename hctx_lock & hctx_unlock Ming Lei
2021-11-22 7:53 ` Sagi Grimberg
2021-11-22 13:20 ` Ming Lei
2021-11-22 13:50 ` Sagi Grimberg
2021-11-23 0:08 ` Ming Lei
2021-11-23 8:54 ` Sagi Grimberg
2021-11-22 9:00 ` Christoph Hellwig
2021-11-19 2:18 ` [PATCH 3/5] blk-mq: add helper of blk_mq_global_quiesce_wait() Ming Lei
2021-11-22 7:56 ` Sagi Grimberg
2021-11-22 8:00 ` Sagi Grimberg
2021-11-22 13:26 ` Ming Lei
2021-11-22 13:55 ` Sagi Grimberg
2021-11-23 0:17 ` Ming Lei
2021-11-23 9:00 ` Sagi Grimberg
2021-11-30 2:33 ` Ming Lei
2021-12-08 12:49 ` Sagi Grimberg
2021-12-10 2:02 ` Ming Lei
2021-11-19 2:18 ` [PATCH 4/5] nvme: quiesce namespace queue in parallel Ming Lei
2021-11-22 8:07 ` Sagi Grimberg
2021-11-23 0:13 ` Ming Lei
2021-11-19 2:18 ` Ming Lei [this message]
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=20211119021849.2259254-6-ming.lei@redhat.com \
--to=ming.lei@redhat.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=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.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;
as well as URLs for NNTP newsgroup(s).