blk-mq: use 'nr_cpu_ids' as highest CPU ID count for hwq <-> cpu map

commit a33c1ba2913802b6fb23e974bb2f6a4e73c8b7ce upstream.

We currently use num_possible_cpus(), but that breaks on sparc64 where
the CPU ID space is discontig. Use nr_cpu_ids as the highest CPU ID
instead, so we don't end up reading from invalid memory.

Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/block/blk-mq-cpumap.c b/block/blk-mq-cpumap.c
index f872127..78d3835 100644 (file)
--- a/block/blk-mq-cpumap.c
+++ b/block/blk-mq-cpumap.c
@@ -95,7 +95,7 @@ unsigned int *blk_mq_make_queue_map(struct blk_mq_reg *reg)
        unsigned int *map;
 
        /* If cpus are offline, map them to first hctx */
-       map = kzalloc_node(sizeof(*map) * num_possible_cpus(), GFP_KERNEL,
+       map = kzalloc_node(sizeof(*map) * nr_cpu_ids, GFP_KERNEL,
                                reg->numa_node);
        if (!map)
                return NULL;