Commit-ID: 81e747d2ccfa9faa2b10507dca9d4b42796c561e Gitweb: http://git.kernel.org/tip/81e747d2ccfa9faa2b10507dca9d4b42796c561e Author: Frederic Weisbecker <fweisbec@xxxxxxxxx> AuthorDate: Tue, 28 May 2013 15:29:03 +0200 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Fri, 31 May 2013 11:33:36 +0200 nohz: Prevent broadcast source from stealing full dynticks timekeeping duty The timekeeping duty is currently assigned to the CPU that handles the tick broadcast clock device by the time it is set in one shot mode. The reason for this is not entirely clear as outlined by Jiri Bohac: https://patchwork.kernel.org/patch/2302951/ One could speculate though that it makes sure only one CPU is woken up to fixup the timekeeping max deferment. But the timekeeper can change anytime after the broadcast CPU becomes idle. So probably we can remove this as in Jiri's patch, but not late in the -rc's. The issue we need to deal with now is that the timekeeping duty must stay handled by the boot CPU in full dynticks mode for now. Otherwise it prevents secondary CPUs from offlining and this breaks suspend/shutdown/reboot/... Long term plan is to make the timekeeper dynamic in full dynticks as well but for now lets prevent that to happen to avoid breakages. Reported-by: Steven Rostedt <rostedt@xxxxxxxxxxx> Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx> Cc: Jiri Bohac <jbohac@xxxxxxx> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> Cc: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Borislav Petkov <bp@xxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- kernel/time/tick-broadcast.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index 0c73942..f249fe1 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c @@ -698,9 +698,14 @@ void tick_broadcast_setup_oneshot(struct clock_event_device *bc) bc->event_handler = tick_handle_oneshot_broadcast; - /* Take the do_timer update */ - if (!tick_nohz_full_cpu(cpu)) - tick_do_timer_cpu = cpu; + /* + * Take the timekeeping duty unless we run in full + * dynticks mode that require the boot CPU to stay + * the timekeeper for now. + */ +#ifndef CONFIG_NO_HZ_FULL + tick_do_timer_cpu = cpu; +#endif /* * We must be careful here. There might be other CPUs -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|