62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
From 693f3a3441b78284a309d854f118832a0735d4b3 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <693f3a3441b78284a309d854f118832a0735d4b3.1601675152.git.zanussi@kernel.org>
|
|
In-Reply-To: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
References: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Tue, 14 Jul 2015 14:26:34 +0200
|
|
Subject: [PATCH 179/333] block/mq: do not invoke preempt_disable()
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.148-rt64.tar.xz
|
|
|
|
preempt_disable() and get_cpu() don't play well together with the sleeping
|
|
locks it tries to allocate later.
|
|
It seems to be enough to replace it with get_cpu_light() and migrate_disable().
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
block/blk-mq.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/block/blk-mq.c b/block/blk-mq.c
|
|
index eae78363c036..830944372d51 100644
|
|
--- a/block/blk-mq.c
|
|
+++ b/block/blk-mq.c
|
|
@@ -570,7 +570,7 @@ static void __blk_mq_complete_request(struct request *rq)
|
|
return;
|
|
}
|
|
|
|
- cpu = get_cpu();
|
|
+ cpu = get_cpu_light();
|
|
if (!test_bit(QUEUE_FLAG_SAME_FORCE, &rq->q->queue_flags))
|
|
shared = cpus_share_cache(cpu, ctx->cpu);
|
|
|
|
@@ -582,7 +582,7 @@ static void __blk_mq_complete_request(struct request *rq)
|
|
} else {
|
|
rq->q->softirq_done_fn(rq);
|
|
}
|
|
- put_cpu();
|
|
+ put_cpu_light();
|
|
}
|
|
|
|
static void hctx_unlock(struct blk_mq_hw_ctx *hctx, int srcu_idx)
|
|
@@ -1380,14 +1380,14 @@ static void __blk_mq_delay_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async,
|
|
return;
|
|
|
|
if (!async && !(hctx->flags & BLK_MQ_F_BLOCKING)) {
|
|
- int cpu = get_cpu();
|
|
+ int cpu = get_cpu_light();
|
|
if (cpumask_test_cpu(cpu, hctx->cpumask)) {
|
|
__blk_mq_run_hw_queue(hctx);
|
|
- put_cpu();
|
|
+ put_cpu_light();
|
|
return;
|
|
}
|
|
|
|
- put_cpu();
|
|
+ put_cpu_light();
|
|
}
|
|
|
|
kblockd_mod_delayed_work_on(blk_mq_hctx_next_cpu(hctx), &hctx->run_work,
|
|
--
|
|
2.17.1
|
|
|