From: Ming Lei <ming.lei@redhat.com>
To: Jens Axboe <axboe@fb.com>,
linux-block@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>,
linux-scsi@vger.kernel.org,
"Martin K . Petersen" <martin.petersen@oracle.com>,
"James E . J . Bottomley" <jejb@linux.vnet.ibm.com>
Cc: Bart Van Assche <bart.vanassche@sandisk.com>,
Oleksandr Natalenko <oleksandr@natalenko.name>,
Johannes Thumshirn <jthumshirn@suse.de>,
Cathy Avery <cavery@redhat.com>,
Martin Steigerwald <martin@lichtvoll.de>,
linux-kernel@vger.kernel.org, Hannes Reinecke <hare@suse.com>,
Ming Lei <ming.lei@redhat.com>,
Bart Van Assche <Bart.VanAssche@wdc.com>
Subject: [PATCH V7 5/6] block: support PREEMPT_ONLY
Date: Sat, 30 Sep 2017 14:12:13 +0800 [thread overview]
Message-ID: <20170930061214.10622-6-ming.lei@redhat.com> (raw)
In-Reply-To: <20170930061214.10622-1-ming.lei@redhat.com>
When queue is in PREEMPT_ONLY mode, only RQF_PREEMPT request
can be allocated and dispatched, other requests won't be allowed
to enter I/O path.
This is useful for supporting safe SCSI quiesce.
Part of this patch is from Bart's '[PATCH v4 4∕7] block: Add the QUEUE_FLAG_PREEMPT_ONLY
request queue flag'.
Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Tested-by: Martin Steigerwald <martin@lichtvoll.de>
Cc: Bart Van Assche <Bart.VanAssche@wdc.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
block/blk-core.c | 26 ++++++++++++++++++++++++--
include/linux/blkdev.h | 5 +++++
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index 95b1c5e50be3..bb683bfe37b2 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -346,6 +346,17 @@ void blk_sync_queue(struct request_queue *q)
}
EXPORT_SYMBOL(blk_sync_queue);
+void blk_set_preempt_only(struct request_queue *q, bool preempt_only)
+{
+ blk_mq_freeze_queue(q);
+ if (preempt_only)
+ queue_flag_set_unlocked(QUEUE_FLAG_PREEMPT_ONLY, q);
+ else
+ queue_flag_clear_unlocked(QUEUE_FLAG_PREEMPT_ONLY, q);
+ blk_mq_unfreeze_queue(q);
+}
+EXPORT_SYMBOL(blk_set_preempt_only);
+
/**
* __blk_run_queue_uncond - run a queue whether or not it has been stopped
* @q: The queue to run
@@ -771,9 +782,18 @@ int blk_queue_enter(struct request_queue *q, unsigned flags)
while (true) {
int ret;
+ /*
+ * preempt_only flag has to be set after queue is frozen,
+ * so it can be checked here lockless and safely
+ */
+ if (blk_queue_preempt_only(q)) {
+ if (!(flags & BLK_REQ_PREEMPT))
+ goto slow_path;
+ }
+
if (percpu_ref_tryget_live(&q->q_usage_counter))
return 0;
-
+ slow_path:
if (flags & BLK_REQ_NOWAIT)
return -EBUSY;
@@ -787,7 +807,9 @@ int blk_queue_enter(struct request_queue *q, unsigned flags)
smp_rmb();
ret = wait_event_interruptible(q->mq_freeze_wq,
- !atomic_read(&q->mq_freeze_depth) ||
+ (!atomic_read(&q->mq_freeze_depth) &&
+ ((flags & BLK_REQ_PREEMPT) ||
+ !blk_queue_preempt_only(q))) ||
blk_queue_dying(q));
if (blk_queue_dying(q))
return -ENODEV;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 68445adc8765..b01a0c6bb1f0 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -631,6 +631,7 @@ struct request_queue {
#define QUEUE_FLAG_REGISTERED 26 /* queue has been registered to a disk */
#define QUEUE_FLAG_SCSI_PASSTHROUGH 27 /* queue supports SCSI commands */
#define QUEUE_FLAG_QUIESCED 28 /* queue has been quiesced */
+#define QUEUE_FLAG_PREEMPT_ONLY 29 /* only process REQ_PREEMPT requests */
#define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \
(1 << QUEUE_FLAG_STACKABLE) | \
@@ -735,6 +736,10 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)
((rq)->cmd_flags & (REQ_FAILFAST_DEV|REQ_FAILFAST_TRANSPORT| \
REQ_FAILFAST_DRIVER))
#define blk_queue_quiesced(q) test_bit(QUEUE_FLAG_QUIESCED, &(q)->queue_flags)
+#define blk_queue_preempt_only(q) \
+ test_bit(QUEUE_FLAG_PREEMPT_ONLY, &(q)->queue_flags)
+
+extern void blk_set_preempt_only(struct request_queue *q, bool preempt_only);
static inline bool blk_account_rq(struct request *rq)
{
--
2.9.5
next prev parent reply other threads:[~2017-09-30 6:12 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-30 6:12 [PATCH V7 0/6] block/scsi: safe SCSI quiescing Ming Lei
2017-09-30 6:12 ` [PATCH V7 1/6] blk-mq: only run hw queues for blk-mq Ming Lei
2017-10-02 13:31 ` Christoph Hellwig
2017-09-30 6:12 ` [PATCH V7 2/6] block: tracking request allocation with q_usage_counter Ming Lei
2017-10-02 13:32 ` Christoph Hellwig
2017-10-02 16:01 ` Bart Van Assche
2017-09-30 6:12 ` [PATCH V7 3/6] block: pass flags to blk_queue_enter() Ming Lei
2017-10-02 13:40 ` Christoph Hellwig
2017-10-03 7:21 ` Ming Lei
2017-09-30 6:12 ` [PATCH V7 4/6] block: prepare for passing RQF_PREEMPT to request allocation Ming Lei
2017-10-02 13:45 ` Christoph Hellwig
2017-09-30 6:12 ` Ming Lei [this message]
2017-10-02 13:50 ` [PATCH V7 5/6] block: support PREEMPT_ONLY Christoph Hellwig
2017-10-03 8:22 ` Ming Lei
2017-10-02 16:27 ` Bart Van Assche
2017-10-03 8:13 ` Ming Lei
2017-09-30 6:12 ` [PATCH V7 6/6] SCSI: set block queue at preempt only when SCSI device is put into quiesce Ming Lei
2017-10-02 13:52 ` Christoph Hellwig
2017-10-03 8:17 ` Ming Lei
2017-09-30 9:47 ` [PATCH V7 0/6] block/scsi: safe SCSI quiescing Martin Steigerwald
2017-09-30 9:51 ` 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=20170930061214.10622-6-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=Bart.VanAssche@wdc.com \
--cc=axboe@fb.com \
--cc=bart.vanassche@sandisk.com \
--cc=cavery@redhat.com \
--cc=hare@suse.com \
--cc=hch@infradead.org \
--cc=jejb@linux.vnet.ibm.com \
--cc=jthumshirn@suse.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=martin@lichtvoll.de \
--cc=oleksandr@natalenko.name \
/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).