blk-mq-sched: separate mark hctx and queue restart operations

Commit Message

Omar Sandoval Feb. 3, 2017, 7:35 p.m. UTC

From: Omar Sandoval <[e-mail]>

In blk_mq_sched_dispatch_requests(), we call blk_mq_sched_mark_restart()
after we dispatch requests left over on our hardware queue dispatch
list. This is so we'll go back and dispatch requests from the scheduler.
In this case, it's only necessary to restart the hardware queue that we
are running; there's no reason to run other hardware queues just because
we are using shared tags.

So, split out blk_mq_sched_mark_restart() into two operations: the "all"
variant is for when we really need to mark the request queue as needing
a restart, and we'll keep the original for just the hardware queue.

Signed-off-by: Omar Sandoval <[e-mail]>
---
Based on block/for-next. There might be a better name for this.

 block/blk-mq-sched.h | 15 +++++++++++++++
 block/blk-mq.c       |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

Comments

Omar Sandoval Feb. 3, 2017, 11:54 p.m. UTC | #1

On Fri, Feb 03, 2017 at 11:35:58AM -0800, Omar Sandoval wrote:
> From: Omar Sandoval <[e-mail]>
> 
> In blk_mq_sched_dispatch_requests(), we call blk_mq_sched_mark_restart()
> after we dispatch requests left over on our hardware queue dispatch
> list. This is so we'll go back and dispatch requests from the scheduler.
> In this case, it's only necessary to restart the hardware queue that we
> are running; there's no reason to run other hardware queues just because
> we are using shared tags.
> 
> So, split out blk_mq_sched_mark_restart() into two operations: the "all"
> variant is for when we really need to mark the request queue as needing
> a restart, and we'll keep the original for just the hardware queue.
> 
> Signed-off-by: Omar Sandoval <[e-mail]>
> ---
> Based on block/for-next. There might be a better name for this.
> 
>  block/blk-mq-sched.h | 15 +++++++++++++++
>  block/blk-mq.c       |  2 +-
>  2 files changed, 16 insertions(+), 1 deletion(-)

Actually, I think I want to do this slightly differently, ignore this
for now.

Patch

diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h
index 5954859c8670..2b42042bf6ea 100644
--- a/block/blk-mq-sched.h
+++ b/block/blk-mq-sched.h
@@ -121,8 +121,23 @@  static inline bool blk_mq_sched_has_work(struct blk_mq_hw_ctx *hctx)
 	return false;
 }
 
+/*
+ * Mark a hardware queue as needing a restart.
+ */
 static inline void blk_mq_sched_mark_restart(struct blk_mq_hw_ctx *hctx)
 {
+	if (!test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state))
+		set_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state);
+}
+
+/*
+ * Mark a hardware queue as needing a restart. If the hardware queue uses shared
+ * driver tags, also mark the request queue as needing a restart. Use this
+ * instead of blk_mq_sched_mark_restart() if a restart is required because we
+ * failed to allocate a driver tag.
+ */
+static inline void blk_mq_sched_mark_restart_all(struct blk_mq_hw_ctx *hctx)
+{
 	if (!test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state)) {
 		set_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state);
 		if (hctx->flags & BLK_MQ_F_TAG_SHARED) {
diff --git a/block/blk-mq.c b/block/blk-mq.c
index be183e6115a1..199a6ee470e9 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -937,7 +937,7 @@  bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list)
 			 * in case the needed IO completed right before we
 			 * marked the queue as needing a restart.
 			 */
-			blk_mq_sched_mark_restart(hctx);
+			blk_mq_sched_mark_restart_all(hctx);
 			if (!blk_mq_get_driver_tag(rq, &hctx, false))
 				break;
 		}