Skip to content

Commit a127d2b

Browse files
Preeti U MurthyIngo Molnar
authored andcommitted
timers/tick/broadcast-hrtimer: Fix suspicious RCU usage in idle loop
The hrtimer mode of broadcast queues hrtimers in the idle entry path so as to wakeup cpus in deep idle states. The associated call graph is : cpuidle_idle_call() |____ clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, ....)) |_____tick_broadcast_set_event() |____clockevents_program_event() |____bc_set_next() The hrtimer_{start/cancel} functions call into tracing which uses RCU. But it is not legal to call into RCU in cpuidle because it is one of the quiescent states. Hence protect this region with RCU_NONIDLE which informs RCU that the cpu is momentarily non-idle. As an aside it is helpful to point out that the clock event device that is programmed here is not a per-cpu clock device; it is a pseudo clock device, used by the broadcast framework alone. The per-cpu clock device programming never goes through bc_set_next(). Signed-off-by: Preeti U Murthy <preeti@linux.vnet.ibm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: linuxppc-dev@ozlabs.org Cc: mpe@ellerman.id.au Cc: tglx@linutronix.de Link: http://lkml.kernel.org/r/20150318104705.17763.56668.stgit@preeti.in.ibm.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent bc465aa commit a127d2b

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

kernel/time/tick-broadcast-hrtimer.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ static void bc_set_mode(enum clock_event_mode mode,
4949
*/
5050
static int bc_set_next(ktime_t expires, struct clock_event_device *bc)
5151
{
52+
int bc_moved;
5253
/*
5354
* We try to cancel the timer first. If the callback is on
5455
* flight on some other cpu then we let it handle it. If we
@@ -60,9 +61,15 @@ static int bc_set_next(ktime_t expires, struct clock_event_device *bc)
6061
* restart the timer because we are in the callback, but we
6162
* can set the expiry time and let the callback return
6263
* HRTIMER_RESTART.
64+
*
65+
* Since we are in the idle loop at this point and because
66+
* hrtimer_{start/cancel} functions call into tracing,
67+
* calls to these functions must be bound within RCU_NONIDLE.
6368
*/
64-
if (hrtimer_try_to_cancel(&bctimer) >= 0) {
65-
hrtimer_start(&bctimer, expires, HRTIMER_MODE_ABS_PINNED);
69+
RCU_NONIDLE(bc_moved = (hrtimer_try_to_cancel(&bctimer) >= 0) ?
70+
!hrtimer_start(&bctimer, expires, HRTIMER_MODE_ABS_PINNED) :
71+
0);
72+
if (bc_moved) {
6673
/* Bind the "device" to the cpu */
6774
bc->bound_on = smp_processor_id();
6875
} else if (bc->bound_on == smp_processor_id()) {

0 commit comments

Comments
 (0)