diff options
| author | Ming Lei <ming.lei@redhat.com> | 2018-04-08 17:48:07 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-04-10 08:38:46 -0600 |
| commit | a1c735fb790745f94a359df45c11df4a69760389 (patch) | |
| tree | 0ec9fdf86086885756ceecadb154c44eec8973bf /block/blk-mq.c | |
| parent | bdac616db9bbadb90b7d6a406144571015e138f7 (diff) | |
| download | linux-stable-a1c735fb790745f94a359df45c11df4a69760389.tar.gz linux-stable-a1c735fb790745f94a359df45c11df4a69760389.tar.bz2 linux-stable-a1c735fb790745f94a359df45c11df4a69760389.zip | |
blk-mq: make sure that correct hctx->next_cpu is set
From commit 20e4d81393196 (blk-mq: simplify queue mapping & schedule
with each possisble CPU), one hctx can be mapped from all offline CPUs,
then hctx->next_cpu can be set as wrong.
This patch fixes this issue by making hctx->next_cpu pointing to the
first CPU in hctx->cpumask if all CPUs in hctx->cpumask are offline.
Cc: Stefan Haberland <sth@linux.vnet.ibm.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Fixes: 20e4d81393196 ("blk-mq: simplify queue mapping & schedule with each possisble CPU")
Cc: stable@vger.kernel.org
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 90f869a083a4..f489ec920807 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2431,6 +2431,8 @@ static void blk_mq_map_swqueue(struct request_queue *q) */ hctx->next_cpu = cpumask_first_and(hctx->cpumask, cpu_online_mask); + if (hctx->next_cpu >= nr_cpu_ids) + hctx->next_cpu = cpumask_first(hctx->cpumask); hctx->next_cpu_batch = BLK_MQ_CPU_WORK_BATCH; } } |