From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754544AbcA0LtR (ORCPT ); Wed, 27 Jan 2016 06:49:17 -0500 Received: from terminus.zytor.com ([198.137.202.10]:34375 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754314AbcA0LtP (ORCPT ); Wed, 27 Jan 2016 06:49:15 -0500 Date: Wed, 27 Jan 2016 03:48:33 -0800 From: tip-bot for Wanpeng Li Message-ID: Cc: fweisbec@gmail.com, tglx@linutronix.de, wanpeng.li@hotmail.com, kernellwp@gmail.com, peterz@infradead.org, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: fweisbec@gmail.com, peterz@infradead.org, kernellwp@gmail.com, wanpeng.li@hotmail.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org In-Reply-To: <1453893967-3458-1-git-send-email-wanpeng.li@hotmail.com> References: <1453893967-3458-1-git-send-email-wanpeng.li@hotmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/urgent] tick/nohz: Set the correct expiry when switching to nohz/lowres mode Git-Commit-ID: 1ca8ec532fc2d986f1f4a319857bb18e0c9739b4 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 1ca8ec532fc2d986f1f4a319857bb18e0c9739b4 Gitweb: http://git.kernel.org/tip/1ca8ec532fc2d986f1f4a319857bb18e0c9739b4 Author: Wanpeng Li AuthorDate: Wed, 27 Jan 2016 19:26:07 +0800 Committer: Thomas Gleixner CommitDate: Wed, 27 Jan 2016 12:45:57 +0100 tick/nohz: Set the correct expiry when switching to nohz/lowres mode commit 0ff53d096422 sets the next tick interrupt to the last jiffies update, i.e. in the past, because the forward operation is invoked before the set operation. There is no resulting damage (yet), but we get an extra pointless tick interrupt. Revert the order so we get the next tick interrupt in the future. Fixes: commit 0ff53d096422 "tick: sched: Force tick interrupt and get rid of softirq magic" Signed-off-by: Wanpeng Li Cc: Peter Zijlstra Cc: Frederic Weisbecker Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/1453893967-3458-1-git-send-email-wanpeng.li@hotmail.com Signed-off-by: Thomas Gleixner --- kernel/time/tick-sched.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index cbe5d8d..de2d9fe 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -995,9 +995,9 @@ static void tick_nohz_switch_to_nohz(void) /* Get the next period */ next = tick_init_jiffy_update(); - hrtimer_forward_now(&ts->sched_timer, tick_period); hrtimer_set_expires(&ts->sched_timer, next); - tick_program_event(next, 1); + hrtimer_forward_now(&ts->sched_timer, tick_period); + tick_program_event(hrtimer_get_expires(&ts->sched_timer), 1); tick_nohz_activate(ts, NOHZ_MODE_LOWRES); }