Commit 7e0c5086 authored Jul 09, 2009 by Thomas Gleixner

hrtimer: migration: do not check expiry time on current CPU

The timer migration code needs to check whether the expiry time of the
timer is before the programmed clock event expiry time when the timer
is enqueued on another CPU because we can not reprogram the timer
device on the other CPU. The current logic checks the expiry time even
if we enqueue on the current CPU when nohz_get_load_balancer() returns
current CPU. This might lead to an endless loop in the expiry check
code when the expiry time of the timer is before the current
programmed next event.

Check whether nohz_get_load_balancer() returns current CPU and skip
the expiry check if this is the case.

The bug was triggered from the networking code. The patch fixes the
regression http://bugzilla.kernel.org/show_bug.cgi?id=13738


(Soft-Lockup/Race in networking in 2.6.31-rc1+195)

Cc: Arun Bharadwaj <arun@linux.vnet.ibm.com
Tested-by: Joao Correia <joaomiguelcorreia@gmail.com>
Tested-by: Andres Freund <andres@anarazel.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 507e1231

kernel/hrtimer.c

+13 −2

Original line number	Original line	Diff line number	Diff line
	@@ -206,8 +206,19 @@ switch_hrtimer_base(struct hrtimer timer, struct hrtimer_clock_base base,
	#if defined(CONFIG_NO_HZ) && defined(CONFIG_SMP)		#if defined(CONFIG_NO_HZ) && defined(CONFIG_SMP)
	if (!pinned && get_sysctl_timer_migration() && idle_cpu(cpu)) {		if (!pinned && get_sysctl_timer_migration() && idle_cpu(cpu)) {
	preferred_cpu = get_nohz_load_balancer();		preferred_cpu = get_nohz_load_balancer();
	if (preferred_cpu >= 0)		if (preferred_cpu >= 0) {
			/*
			* We must not check the expiry value when
			* preferred_cpu is the current cpu. If base
			* != new_base we would loop forever when the
			* timer expires before the current programmed
			* next timer event.
			*/
			if (preferred_cpu != cpu)
	cpu = preferred_cpu;		cpu = preferred_cpu;
			else
			preferred_cpu = -1;
			}
	}		}
	#endif		#endif

Admin message