When issue request directly and the task is migrated out of the
original cpu where it allocates request, hctx could be ran on
the cpu where it is not mapped. To fix this, insert the request
if BLK_MQ_F_BLOCKING is set, check whether the current is mapped
to the hctx and invoke __blk_mq_issue_directly under preemption
disabled.
Signed-off-by: Jianchao Wang <jianchao.w.wang@xxxxxxxxxx>
---
block/blk-mq.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 9c6c858..ced3346 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1770,6 +1770,17 @@ static blk_status_t blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,
blk_status_t ret = BLK_STS_RESOURCE;
int srcu_idx;
+ if (hctx->flags & BLK_MQ_F_BLOCKING) {
+ force = true;
+ goto out;
+ }
+
+ if (!cpumask_test_cpu(get_cpu(), hctx->cpumask)) {
+ put_cpu();
+ force = true;
+ goto out;
+ }
+
hctx_lock(hctx, &srcu_idx);
/*
* hctx_lock is needed before checking quiesced flag.
@@ -1798,7 +1809,8 @@ static blk_status_t blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,
ret = __blk_mq_issue_directly(hctx, rq, cookie);
out_unlock:
hctx_unlock(hctx, srcu_idx);
-
+ put_cpu();
+out:
dec = blk_mq_make_dicision(ret, bypass_insert, force);
switch(dec) {
case MQ_INSERT_DISPATCH:
--
2.7.4
