[PATCH 08/11] powerpc/smp: Allocate cpumask only after searching thread group
flat view
STALE2277d
From: Srikar Dronamraju <hidden>
Date: 2020-07-14 04:51:45
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Linus Torvalds
If allocated earlier and the search fails, then cpumask need to be freed. However cpu_l1_cache_map can be allocated after we search thread group. Cc: linuxppc-dev <redacted> Cc: Michael Ellerman <redacted> Cc: Nick Piggin <redacted> Cc: Oliver OHalloran <redacted> Cc: Nathan Lynch <redacted> Cc: Michael Neuling <redacted> Cc: Anton Blanchard <redacted> Cc: Gautham R Shenoy <redacted> Cc: Vaidyanathan Srinivasan <redacted> Signed-off-by: Srikar Dronamraju <redacted> --- arch/powerpc/kernel/smp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 96e47450d9b3..ef19eeccd21e 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c@@ -797,10 +797,6 @@ static int init_cpu_l1_cache_map(int cpu) if (err) goto out; - zalloc_cpumask_var_node(&per_cpu(cpu_l1_cache_map, cpu), - GFP_KERNEL, - cpu_to_node(cpu)); - cpu_group_start = get_cpu_thread_group_start(cpu, &tg); if (unlikely(cpu_group_start == -1)) {
@@ -809,6 +805,9 @@ static int init_cpu_l1_cache_map(int cpu) goto out; } + zalloc_cpumask_var_node(&per_cpu(cpu_l1_cache_map, cpu), + GFP_KERNEL, cpu_to_node(cpu)); + for (i = first_thread; i < first_thread + threads_per_core; i++) { int i_group_start = get_cpu_thread_group_start(i, &tg);
--
2.17.1