Skip to content

Commit cbcc72e

Browse files
Lorenzo Pieralisictmarinas
Lorenzo Pieralisi
authored andcommitted
drivers/perf: arm-pmu: fix RCU usage on pmu resume from low-power
Commit da4e4f1 ("drivers/perf: arm_pmu: implement CPU_PM notifier") added code in the arm perf infrastructure that allows the kernel to save/restore perf counters whenever the CPU enters a low-power state. The kernel saves/restores the counters for each active event through the armpmu_{stop/start} ARM pmu API, so that the low-power state enter/exit cycle is emulated through pmu start/stop operations for each event in use. However, calling armpmu_start() for each active event on power up executes code that requires RCU locking (perf_event_update_userpage()) to be functional, so, given that the core may call the CPU_PM notifiers while running the idle thread in an quiescent RCU state this is not allowed as detected through the following splat when kernel is run with CONFIG_PROVE_LOCKING enabled: [ 49.293286] [ 49.294761] =============================== [ 49.298895] [ INFO: suspicious RCU usage. ] [ 49.303031] 4.6.0-rc3+ #421 Not tainted [ 49.306821] ------------------------------- [ 49.310956] include/linux/rcupdate.h:872 rcu_read_lock() used illegally while idle! [ 49.318530] [ 49.318530] other info that might help us debug this: [ 49.318530] [ 49.326451] [ 49.326451] RCU used illegally from idle CPU! [ 49.326451] rcu_scheduler_active = 1, debug_locks = 0 [ 49.337209] RCU used illegally from extended quiescent state! [ 49.342892] 2 locks held by swapper/2/0: [ 49.346768] #0: (cpu_pm_notifier_lock){......}, at: [<ffffff8008163c28>] cpu_pm_exit+0x18/0x80 [ 49.355492] #1: (rcu_read_lock){......}, at: [<ffffff800816dc38>] perf_event_update_userpage+0x0/0x260 This patch wraps the armpmu_start() call (that indirectly calls perf_event_update_userpage()) on CPU_PM notifier power state exit (or failed entry) within the RCU_NONIDLE() macro so that the RCU subsystem is made aware the calling cpu is not idle from an RCU perspective for the armpmu_start() call duration, therefore fixing the issue. Fixes: da4e4f1 ("drivers/perf: arm_pmu: implement CPU_PM notifier") Signed-off-by: Lorenzo Pieralisi <[email protected]> Reported-by: James Morse <[email protected]> Suggested-by: Kevin Hilman <[email protected]> Cc: Ashwin Chaugule <[email protected]> Cc: Kevin Hilman <[email protected]> Cc: Sudeep Holla <[email protected]> Cc: Daniel Lezcano <[email protected]> Cc: Mathieu Poirier <[email protected]> Acked-by: Mark Rutland <[email protected]> Acked-by: Paul E. McKenney <[email protected]> Acked-by: Will Deacon <[email protected]> Signed-off-by: Catalin Marinas <[email protected]>
1 parent 2fee7d5 commit cbcc72e

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

drivers/perf/arm_pmu.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -737,8 +737,19 @@ static void cpu_pm_pmu_setup(struct arm_pmu *armpmu, unsigned long cmd)
737737
break;
738738
case CPU_PM_EXIT:
739739
case CPU_PM_ENTER_FAILED:
740-
/* Restore and enable the counter */
741-
armpmu_start(event, PERF_EF_RELOAD);
740+
/*
741+
* Restore and enable the counter.
742+
* armpmu_start() indirectly calls
743+
*
744+
* perf_event_update_userpage()
745+
*
746+
* that requires RCU read locking to be functional,
747+
* wrap the call within RCU_NONIDLE to make the
748+
* RCU subsystem aware this cpu is not idle from
749+
* an RCU perspective for the armpmu_start() call
750+
* duration.
751+
*/
752+
RCU_NONIDLE(armpmu_start(event, PERF_EF_RELOAD));
742753
break;
743754
default:
744755
break;

0 commit comments

Comments
 (0)