[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-c515db8cd311ef77b2dc7cbd6b695022655bb0f3@git.kernel.org>
Date: Thu, 22 May 2014 05:27:24 -0700
From: tip-bot for Vincent Guittot <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
jet.chen@...el.com, peterz@...radead.org,
vincent.guittot@...aro.org, tglx@...utronix.de
Subject: [tip:sched/core] sched/numa:
Fix initialization of sched_domain_topology for NUMA
Commit-ID: c515db8cd311ef77b2dc7cbd6b695022655bb0f3
Gitweb: http://git.kernel.org/tip/c515db8cd311ef77b2dc7cbd6b695022655bb0f3
Author: Vincent Guittot <vincent.guittot@...aro.org>
AuthorDate: Tue, 13 May 2014 11:11:01 +0200
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Thu, 22 May 2014 11:16:29 +0200
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: Jet Chen <jet.chen@...el.com>
Tested-by: Jet Chen <jet.chen@...el.com>
Signed-off-by: Vincent Guittot <vincent.guittot@...aro.org>
Signed-off-by: Peter Zijlstra <peterz@...radead.org>
Cc: fengguang.wu@...el.com
Link: http://lkml.kernel.org/r/1399972261-25693-1-git-send-email-vincent.guittot@linaro.org
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
kernel/sched/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index a78c5b6..45d077e 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6231,7 +6231,7 @@ static void sched_init_numa(void)
/* Compute default topology size */
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);
if (!tl)
return;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists