From: Jens Axboe Date: Mon, 24 Nov 2014 22:02:42 +0000 (-0700) Subject: blk-mq: use 'nr_cpu_ids' as highest CPU ID count for hwq <-> cpu map X-Git-Tag: v3.16.35~3320 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e4d0665e0b96e456b67fcfc8a3c6d0120cbbcf6;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: Luis Henriques --- diff --git a/block/blk-mq-cpumap.c b/block/blk-mq-cpumap.c index 1065d7c65fa15..72e5ed691e37a 100644 --- a/block/blk-mq-cpumap.c +++ b/block/blk-mq-cpumap.c @@ -90,7 +90,7 @@ unsigned int *blk_mq_make_queue_map(struct blk_mq_tag_set *set) 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, set->numa_node); if (!map) return NULL;