diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2015-07-14 14:26:34 +0200 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2015-12-23 23:36:54 +0100 |
| commit | 8d9ee8dee4ad76218761f3a341a8623265c83c11 (patch) | |
| tree | 14e77c79a69b44c5ae56e9019d5aa24d8bc7c896 /block | |
| parent | e6b4217e8cb87df0e4db11592db0a6503ab2c0b2 (diff) | |
block/mq: do not invoke preempt_disable()
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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 208ac7985725..33ceddfd81a2 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -343,7 +343,7 @@ static void blk_mq_ipi_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); @@ -355,7 +355,7 @@ static void blk_mq_ipi_complete_request(struct request *rq) } else { rq->q->softirq_done_fn(rq); } - put_cpu(); + put_cpu_light(); } static void __blk_mq_complete_request(struct request *rq) @@ -862,14 +862,14 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async) return; if (!async) { - 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_schedule_delayed_work_on(blk_mq_hctx_next_cpu(hctx), |