Skip to content

Commit ad2b6e0

Browse files
anjutsudhakarmpe
authored andcommitted
powerpc/perf/imc: Fix nest-imc cpuhotplug callback failure
Oops is observed during boot: Faulting instruction address: 0xc000000000248340 cpu 0x0: Vector: 380 (Data Access Out of Range) at [c000000ff66fb850] pc: c000000000248340: event_function_call+0x50/0x1f0 lr: c00000000024878c: perf_remove_from_context+0x3c/0x100 sp: c000000ff66fbad0 msr: 9000000000009033 dar: 7d20e2a6f92d03c0 pid = 14, comm = cpuhp/0 While registering the cpuhotplug callbacks for nest-imc, if we fail in the cpuhotplug online path for any random node in a multi node system (because the opal call to stop nest-imc counters fails for that node), ppc_nest_imc_cpu_offline() will get invoked for other nodes who successfully returned from cpuhotplug online path. This call trace is generated since in the ppc_nest_imc_cpu_offline() path we are trying to migrate the event context, when nest-imc counters are not even initialized. Patch to add a check to ensure that nest-imc is registered before migrating the event context. Fixes: 885dcd7 ("powerpc/perf: Add nest IMC PMU support") Signed-off-by: Anju T Sudhakar <[email protected]> Reviewed-by: Madhavan Srinivasan <[email protected]> Signed-off-by: Michael Ellerman <[email protected]>
1 parent f41d84d commit ad2b6e0

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

arch/powerpc/perf/imc-pmu.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,19 @@ static int ppc_nest_imc_cpu_offline(unsigned int cpu)
309309
if (!cpumask_test_and_clear_cpu(cpu, &nest_imc_cpumask))
310310
return 0;
311311

312+
/*
313+
* Check whether nest_imc is registered. We could end up here if the
314+
* cpuhotplug callback registration fails. i.e, callback invokes the
315+
* offline path for all successfully registered nodes. At this stage,
316+
* nest_imc pmu will not be registered and we should return here.
317+
*
318+
* We return with a zero since this is not an offline failure. And
319+
* cpuhp_setup_state() returns the actual failure reason to the caller,
320+
* which in turn will call the cleanup routine.
321+
*/
322+
if (!nest_pmus)
323+
return 0;
324+
312325
/*
313326
* Now that this cpu is one of the designated,
314327
* find a next cpu a) which is online and b) in same chip.

0 commit comments

Comments
 (0)