Commit c515db8c authored by Vincent Guittot's avatar Vincent Guittot Committed by Ingo Molnar

sched/numa: Fix initialization of sched_domain_topology for NUMA

Jet Chen has reported a kernel panics when booting qemu-system-x86_64 with
kvm64 cpu. A panic occured while building the sched_domain.

In sched_init_numa, we create a new topology table in which both default
levels and numa levels are copied. The last row of the table must have a null
pointer in the mask field.

The current implementation doesn't add this last row in the computation of the
table size. So we add 1 row in the allocation size that will be used as the
last row of the table. The kzalloc will ensure that the mask field is NULL.
Reported-by: default avatarJet Chen <jet.chen@intel.com>
Tested-by: default avatarJet Chen <jet.chen@intel.com>
Signed-off-by: default avatarVincent Guittot <vincent.guittot@linaro.org>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: fengguang.wu@intel.com
Link: http://lkml.kernel.org/r/1399972261-25693-1-git-send-email-vincent.guittot@linaro.orgSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 8bf21433
...@@ -6231,7 +6231,7 @@ static void sched_init_numa(void) ...@@ -6231,7 +6231,7 @@ static void sched_init_numa(void)
/* Compute default topology size */ /* Compute default topology size */
for (i = 0; sched_domain_topology[i].mask; i++); for (i = 0; sched_domain_topology[i].mask; i++);
tl = kzalloc((i + level) * tl = kzalloc((i + level + 1) *
sizeof(struct sched_domain_topology_level), GFP_KERNEL); sizeof(struct sched_domain_topology_level), GFP_KERNEL);
if (!tl) if (!tl)
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment