| From 71e5f6644fb2f3304fcb310145ded234a37e7cc1 Mon Sep 17 00:00:00 2001 |
| From: Dietmar Eggemann <dietmar.eggemann@arm.com> |
| Date: Mon, 1 Feb 2021 10:53:53 +0100 |
| Subject: sched/topology: Fix sched_domain_topology_level alloc in sched_init_numa() |
| |
| From: Dietmar Eggemann <dietmar.eggemann@arm.com> |
| |
| commit 71e5f6644fb2f3304fcb310145ded234a37e7cc1 upstream. |
| |
| Commit "sched/topology: Make sched_init_numa() use a set for the |
| deduplicating sort" allocates 'i + nr_levels (level)' instead of |
| 'i + nr_levels + 1' sched_domain_topology_level. |
| |
| This led to an Oops (on Arm64 juno with CONFIG_SCHED_DEBUG): |
| |
| sched_init_domains |
| build_sched_domains() |
| __free_domain_allocs() |
| __sdt_free() { |
| ... |
| for_each_sd_topology(tl) |
| ... |
| sd = *per_cpu_ptr(sdd->sd, j); <-- |
| ... |
| } |
| |
| Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com> |
| Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| Tested-by: Vincent Guittot <vincent.guittot@linaro.org> |
| Tested-by: Barry Song <song.bao.hua@hisilicon.com> |
| Link: https://lkml.kernel.org/r/6000e39e-7d28-c360-9cd6-8798fd22a9bf@arm.com |
| Signed-off-by: dann frazier <dann.frazier@canonical.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| kernel/sched/topology.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/kernel/sched/topology.c |
| +++ b/kernel/sched/topology.c |
| @@ -1658,7 +1658,7 @@ void sched_init_numa(void) |
| /* Compute default topology size */ |
| for (i = 0; sched_domain_topology[i].mask; i++); |
| |
| - tl = kzalloc((i + nr_levels) * |
| + tl = kzalloc((i + nr_levels + 1) * |
| sizeof(struct sched_domain_topology_level), GFP_KERNEL); |
| if (!tl) |
| return; |