Commit 0662b713 authored May 20, 2006 by Zachary Amsden Committed by Linus Torvalds May 21, 2006

[PATCH] Fix a NO_IDLE_HZ timer bug



Under certain timing conditions, a race during boot occurs where timer
ticks are being processed on remote CPUs.  The remote timer ticks can
increment jiffies, and if this happens during a window when a timeout is
very close to expiring but a local tick has not yet been delivered, you can
end up with

1) No softirq pending
2) A local timer wheel which is not synced to jiffies
3) No high resolution timer active
4) A local timer which is supposed to fire before the current jiffies value.

In this circumstance, the comparison in next_timer_interrupt overflows,
because the base of the comparison for high resolution timers is jiffies,
but for the softirq timer wheel, it is relative the the current base of the
wheel (jiffies_base).

Signed-off-by: Zachary Amsden <zach@vmware.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 8b1ea24c

kernel/timer.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -541,6 +541,22 @@ found:
		}
		spin_unlock(&base->lock);

		/*
		* It can happen that other CPUs service timer IRQs and increment
		* jiffies, but we have not yet got a local timer tick to process
		* the timer wheels. In that case, the expiry time can be before
		* jiffies, but since the high-resolution timer here is relative to
		* jiffies, the default expression when high-resolution timers are
		* not active,
		*
		* time_before(MAX_JIFFY_OFFSET + jiffies, expires)
		*
		* would falsely evaluate to true. If that is the case, just
		* return jiffies so that we can immediately fire the local timer
		*/
		if (time_before(expires, jiffies))
		return jiffies;

		if (time_before(hr_expires, expires))
		return hr_expires;

Admin message