[PATCH 10/14] blk-mq-sched: introduce helpers for query, change busy state
From: Ming Lei <hidden>
Date: 2017-07-31 16:51:07
Also in:
linux-scsi
Subsystem:
block layer, the rest · Maintainers:
Jens Axboe, Linus Torvalds
Signed-off-by: Ming Lei <redacted> --- block/blk-mq-sched.c | 6 +++--- block/blk-mq.h | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 07ff53187617..112270961af0 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c@@ -140,7 +140,7 @@ void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx) * BUSY won't be cleared until all requests * in hctx->dispatch are dispatched successfully */ - set_bit(BLK_MQ_S_BUSY, &hctx->state); + blk_mq_hctx_set_busy(hctx); } spin_unlock(&hctx->lock); }
@@ -158,11 +158,11 @@ void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx) blk_mq_sched_mark_restart_hctx(hctx); can_go = blk_mq_dispatch_rq_list(q, &rq_list); if (can_go) - clear_bit(BLK_MQ_S_BUSY, &hctx->state); + blk_mq_hctx_clear_busy(hctx); } /* can't go until ->dispatch is flushed */ - if (!can_go || test_bit(BLK_MQ_S_BUSY, &hctx->state)) + if (!can_go || blk_mq_hctx_is_busy(hctx)) return; /*
diff --git a/block/blk-mq.h b/block/blk-mq.h
index 44d3aaa03d7c..d9f875093613 100644
--- a/block/blk-mq.h
+++ b/block/blk-mq.h@@ -135,4 +135,19 @@ static inline bool blk_mq_hw_queue_mapped(struct blk_mq_hw_ctx *hctx) return hctx->nr_ctx && hctx->tags; } +static inline bool blk_mq_hctx_is_busy(struct blk_mq_hw_ctx *hctx) +{ + return test_bit(BLK_MQ_S_BUSY, &hctx->state); +} + +static inline void blk_mq_hctx_set_busy(struct blk_mq_hw_ctx *hctx) +{ + set_bit(BLK_MQ_S_BUSY, &hctx->state); +} + +static inline void blk_mq_hctx_clear_busy(struct blk_mq_hw_ctx *hctx) +{ + clear_bit(BLK_MQ_S_BUSY, &hctx->state); +} + #endif
--
2.9.4