sched/topology: Fix sched_domain_topology_level alloc in sched_init_numa()
authorDietmar Eggemann <dietmar.eggemann@arm.com>
Mon, 1 Feb 2021 09:53:53 +0000 (10:53 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 17 Feb 2021 13:08:05 +0000 (14:08 +0100)
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
kernel/sched/topology.c

index bf5c9bd10bfe7c27538e65ebeb942524a48e48b6..09d35044bd889291e3cacb3f8c4f3aa2b9619e5f 100644 (file)
@@ -1702,7 +1702,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;