]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
powerpc/perf: fix preempt count underflow in fsl_emb_pmu_del
authorAboorva Devarajan <aboorvad@linux.ibm.com>
Fri, 5 Jun 2026 08:29:10 +0000 (13:59 +0530)
committerMadhavan Srinivasan <maddy@linux.ibm.com>
Mon, 15 Jun 2026 10:55:21 +0000 (16:25 +0530)
fsl_emb_pmu_del() unconditionally calls put_cpu_var(cpu_hw_events) at
the 'out:' label, but only calls the matching get_cpu_var() after the
'i < 0' early-return check. When event->hw.idx is negative the
function jumps to 'out:' without having taken get_cpu_var(), and the
trailing put_cpu_var() then issues an unmatched preempt_enable(),
underflowing preempt_count.

On a CONFIG_PREEMPT=y kernel preempt_count would underflow and
eventually present as a 'scheduling while atomic' BUG.

Move put_cpu_var() to pair with get_cpu_var() so the percpu access is
correctly bracketed and the 'out:' label only handles perf_pmu_enable.

Fixes: a11106544f33 ("powerpc/perf: e500 support")
Reviewed-by: Shrikanth Hegde <sshegde@linux.ibm.com>
Signed-off-by: Aboorva Devarajan <aboorvad@linux.ibm.com>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20260605082912.305100-2-aboorvad@linux.ibm.com
arch/powerpc/perf/core-fsl-emb.c

index 7120ab20cbfecb7d195b00070592e8c9d028d13f..02b5dd74c187a00f8c6b7d6ea6fec2ee535b7dc7 100644 (file)
@@ -366,9 +366,10 @@ static void fsl_emb_pmu_del(struct perf_event *event, int flags)
 
        cpuhw->n_events--;
 
+       put_cpu_var(cpu_hw_events);
+
  out:
        perf_pmu_enable(event->pmu);
-       put_cpu_var(cpu_hw_events);
 }
 
 static void fsl_emb_pmu_start(struct perf_event *event, int ef_flags)