diff --git a/block/blk-mq.c b/block/blk-mq.c index 8538dc415499..0b06b4ea57f1 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -461,6 +461,8 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q, return ERR_PTR(-EXDEV); } cpu = cpumask_first_and(alloc_data.hctx->cpumask, cpu_online_mask); + if (cpu >= nr_cpu_ids) + cpu = cpumask_first(alloc_data.hctx->cpumask);
I'd just drop the cpu_online_mask test, we don't care about the cpu being online as this request is running already.
