[PATCH 4.3 156/200] sched: Fix crash in sched_init_numa()

From: Greg Kroah-Hartman
Date: Sun Feb 14 2016 - 18:47:52 EST


4.3-stable review patch. If anyone has any objections, please let me know.

------------------

From: Raghavendra K T <raghavendra.kt@xxxxxxxxxxxxxxxxxx>

commit 9c03ee147193645be4c186d3688232fa438c57c7 upstream.

The following PowerPC commit:

c118baf80256 ("arch/powerpc/mm/numa.c: do not allocate bootmem memory for non existing nodes")

avoids allocating bootmem memory for non existent nodes.

But when DEBUG_PER_CPU_MAPS=y is enabled, my powerNV system failed to boot
because in sched_init_numa(), cpumask_or() operation was done on
unallocated nodes.

Fix that by making cpumask_or() operation only on existing nodes.

[ Tested with and w/o DEBUG_PER_CPU_MAPS=y on x86 and PowerPC. ]

Reported-by: Jan Stancek <jstancek@xxxxxxxxxx>
Tested-by: Jan Stancek <jstancek@xxxxxxxxxx>
Signed-off-by: Raghavendra K T <raghavendra.kt@xxxxxxxxxxxxxxxxxx>
Cc: <gkurz@xxxxxxxxxxxxxxxxxx>
Cc: <grant.likely@xxxxxxxxxx>
Cc: <nikunj@xxxxxxxxxxxxxxxxxx>
Cc: <vdavydov@xxxxxxxxxxxxx>
Cc: <linuxppc-dev@xxxxxxxxxxxxxxxx>
Cc: <linux-mm@xxxxxxxxx>
Cc: <peterz@xxxxxxxxxxxxx>
Cc: <benh@xxxxxxxxxxxxxxxxxxx>
Cc: <paulus@xxxxxxxxx>
Cc: <mpe@xxxxxxxxxxxxxx>
Cc: <anton@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1452884483-11676-1-git-send-email-raghavendra.kt@xxxxxxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
kernel/sched/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6678,7 +6678,7 @@ static void sched_init_numa(void)

sched_domains_numa_masks[i][j] = mask;

- for (k = 0; k < nr_node_ids; k++) {
+ for_each_node(k) {
if (node_distance(j, k) > sched_domains_numa_distance[i])
continue;