Commit 27c9cd7e authored Nov 18, 2011 by Jeff Ohlstein Committed by Thomas Gleixner Nov 19, 2011

hrtimer: Fix extra wakeups from __remove_hrtimer()



__remove_hrtimer() attempts to reprogram the clockevent device when
the timer being removed is the next to expire. However,
__remove_hrtimer() reprograms the clockevent *before* removing the
timer from the timerqueue and thus when hrtimer_force_reprogram()
finds the next timer to expire it finds the timer we're trying to
remove.

This is especially noticeable when the system switches to NOHz mode
and the system tick is removed. The timer tick is removed from the
system but the clockevent is programmed to wakeup in another HZ
anyway.

Silence the extra wakeup by removing the timer from the timerqueue
before calling hrtimer_force_reprogram() so that we actually program
the clockevent for the next timer to expire.

This was broken by 998adc3d "hrtimers: Convert hrtimers to use
timerlist infrastructure".

Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/1321660030-8520-1-git-send-email-johlstei@codeaurora.org


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent d004e024

kernel/hrtimer.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -885,10 +885,13 @@ static void __remove_hrtimer(struct hrtimer *timer,
		struct hrtimer_clock_base *base,
		unsigned long newstate, int reprogram)
		{
		struct timerqueue_node *next_timer;
		if (!(timer->state & HRTIMER_STATE_ENQUEUED))
		goto out;

		if (&timer->node == timerqueue_getnext(&base->active)) {
		next_timer = timerqueue_getnext(&base->active);
		timerqueue_del(&base->active, &timer->node);
		if (&timer->node == next_timer) {
		#ifdef CONFIG_HIGH_RES_TIMERS
		/* Reprogram the clock event device. if enabled */
		if (reprogram && hrtimer_hres_active()) {
		@@ -901,7 +904,6 @@ static void __remove_hrtimer(struct hrtimer *timer,
		}
		#endif
		}
		timerqueue_del(&base->active, &timer->node);
		if (!timerqueue_getnext(&base->active))
		base->cpu_base->active_bases &= ~(1 << base->index);
		out:

Admin message