Commit 4d627628 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

cpuidle: Fix poll_idle() noinstr annotation 



The instrumentation_begin()/end() annotations in poll_idle() were
complete nonsense. Specifically they caused tracing to happen in the
middle of noinstr code, resulting in RCU splats.

Now that local_clock() is noinstr, mark up the rest and let it rip.

Fixes: 00717eb8 ("cpuidle: Annotate poll_idle()")
Reported-by: default avatarkernel test robot <oliver.sang@intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/oe-lkp/202301192148.58ece903-oliver.sang@intel.com
Link: https://lore.kernel.org/r/20230126151323.819534689@infradead.org
parent 776f2291

drivers/cpuidle/cpuidle.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ void cpuidle_reflect(struct cpuidle_device *dev, int index) 
 * @dev:   the cpuidle device

 *

 */

u64 cpuidle_poll_time(struct cpuidle_driver *drv,

__cpuidle u64 cpuidle_poll_time(struct cpuidle_driver *drv,

		      struct cpuidle_device *dev)

{

	int i;

drivers/cpuidle/poll_state.c

+0 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ static int __cpuidle poll_idle(struct cpuidle_device *dev, 
{

	u64 time_start;



	instrumentation_begin();

	time_start = local_clock();



	dev->poll_time_limit = false;
@@ -42,7 +41,6 @@ static int __cpuidle poll_idle(struct cpuidle_device *dev, 
	raw_local_irq_disable();



	current_clr_polling();

	instrumentation_end();



	return index;

}