timer: Kick dynticks targets on mod_timer*() calls (9f6d9baa) · Commits · 戴 / test

When a timer is enqueued or modified on a dynticks target, that CPU must re-evaluate the next tick to service that timer. The tick re-evaluation is performed by an IPI kick on the target. Now while we correctly call wake_up_nohz_cpu() from add_timer_on(), the mod_timer*() API family doesn't support so well dynticks targets. The reason for this is likely that __mod_timer() isn't supposed to select an idle target for a timer, unless that target is the current CPU, in which case a dynticks idle kick isn't actually needed. But there is a small race window lurking behind that assumption: the elected target has all the time to turn dynticks idle between the call to get_nohz_timer_target() and the locking of its base. Hence a risk that we enqueue a timer on a dynticks idle destination without kicking it. As a result, the timer might be serviced too late in the future. Also a target elected by __mod_timer() can be in full dynticks mode and thus require to be kicked as well. And unlike idle dynticks, this concern both local and remote targets. To fix this whole issue, lets centralize the dynticks kick to internal_add_timer() so that it is well handled for all sort of timer enqueue. Even timer migration is concerned so that a full dynticks target is correctly kicked as needed when timers are migrating to it. Signed-off-by:

Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by:

Frederic Weisbecker <fweisbec@gmail.com> Link: http://lkml.kernel.org/r/1403393357-2070-3-git-send-email-fweisbec@gmail.com Signed-off-by:

Thomas Gleixner <tglx@linutronix.de>

kernel/time/timer.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -410,6 +410,22 @@ static void internal_add_timer(struct tvec_base base, struct timer_list timer)
		base->next_timer = timer->expires;
		}
		base->all_timers++;

		/*
		* Check whether the other CPU is in dynticks mode and needs
		* to be triggered to reevaluate the timer wheel.
		* We are protected against the other CPU fiddling
		* with the timer by holding the timer base lock. This also
		* makes sure that a CPU on the way to stop its tick can not
		* evaluate the timer wheel.
		*
		* Spare the IPI for deferrable timers on idle targets though.
		* The next busy ticks will take care of it. Except full dynticks
		* require special care against races with idle_cpu(), lets deal
		* with that later.
		*/
		if (!tbase_get_deferrable(base) \|\| tick_nohz_full_cpu(base->cpu))
		wake_up_nohz_cpu(base->cpu);
		}

		#ifdef CONFIG_TIMER_STATS
		@@ -949,22 +965,6 @@ void add_timer_on(struct timer_list *timer, int cpu)
		timer_set_base(timer, base);
		debug_activate(timer, timer->expires);
		internal_add_timer(base, timer);
		/*
		* Check whether the other CPU is in dynticks mode and needs
		* to be triggered to reevaluate the timer wheel.
		* We are protected against the other CPU fiddling
		* with the timer by holding the timer base lock. This also
		* makes sure that a CPU on the way to stop its tick can not
		* evaluate the timer wheel.
		*
		* Spare the IPI for deferrable timers on idle targets though.
		* The next busy ticks will take care of it. Except full dynticks
		* require special care against races with idle_cpu(), lets deal
		* with that later.
		*/
		if (!tbase_get_deferrable(timer->base) \|\| tick_nohz_full_cpu(cpu))
		wake_up_nohz_cpu(cpu);

		spin_unlock_irqrestore(&base->lock, flags);
		}
		EXPORT_SYMBOL_GPL(add_timer_on);

Admin message