Commit 1c38b061 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

arm64, riscv, perf: Remove RCU_NONIDLE() usage 



The PM notifiers should no longer be ran with RCU disabled (per the
previous patches), as such this hack is no longer required either.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20230112195542.151174682@infradead.org
parent f176d4cc

drivers/perf/arm_pmu.c

+1 −10
Original line number Diff line number Diff line
@@ -758,17 +758,8 @@ static void cpu_pm_pmu_setup(struct arm_pmu *armpmu, unsigned long cmd) 
		case CPU_PM_ENTER_FAILED:

			 /*

			  * Restore and enable the counter.

			  * armpmu_start() indirectly calls

			  *

			  * perf_event_update_userpage()

			  *

			  * that requires RCU read locking to be functional,

			  * wrap the call within RCU_NONIDLE to make the

			  * RCU subsystem aware this cpu is not idle from

			  * an RCU perspective for the armpmu_start() call

			  * duration.

			  */

			RCU_NONIDLE(armpmu_start(event, PERF_EF_RELOAD));

			armpmu_start(event, PERF_EF_RELOAD);

			break;

		default:

			break;

drivers/perf/riscv_pmu_sbi.c

+1 −7
Original line number Diff line number Diff line
@@ -771,14 +771,8 @@ static int riscv_pm_pmu_notify(struct notifier_block *b, unsigned long cmd, 
		case CPU_PM_ENTER_FAILED:

			/*

			 * Restore and enable the counter.

			 *

			 * Requires RCU read locking to be functional,

			 * wrap the call within RCU_NONIDLE to make the

			 * RCU subsystem aware this cpu is not idle from

			 * an RCU perspective for the riscv_pmu_start() call

			 * duration.

			 */

			RCU_NONIDLE(riscv_pmu_start(event, PERF_EF_RELOAD));

			riscv_pmu_start(event, PERF_EF_RELOAD);

			break;

		default:

			break;