From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751220AbdL2Wua (ORCPT ); Fri, 29 Dec 2017 17:50:30 -0500 Received: from terminus.zytor.com ([65.50.211.136]:48685 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750800AbdL2Wu1 (ORCPT ); Fri, 29 Dec 2017 17:50:27 -0500 Date: Fri, 29 Dec 2017 14:47:05 -0800 From: tip-bot for Thomas Gleixner Message-ID: Cc: peterz@infradead.org, anna-maria@linutronix.de, fweisbec@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, paulmck@linux.vnet.ibm.com, bigeasy@linutronix.de, tglx@linutronix.de Reply-To: hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, paulmck@linux.vnet.ibm.com, tglx@linutronix.de, bigeasy@linutronix.de, peterz@infradead.org, anna-maria@linutronix.de, fweisbec@gmail.com In-Reply-To: <20171222145337.792907137@linutronix.de> References: <20171222145337.792907137@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/urgent] timers: Invoke timer_start_debug() where it makes sense Git-Commit-ID: fd45bb77ad682be728d1002431d77b8c73342836 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: fd45bb77ad682be728d1002431d77b8c73342836 Gitweb: https://git.kernel.org/tip/fd45bb77ad682be728d1002431d77b8c73342836 Author: Thomas Gleixner AuthorDate: Fri, 22 Dec 2017 15:51:14 +0100 Committer: Thomas Gleixner CommitDate: Fri, 29 Dec 2017 23:13:10 +0100 timers: Invoke timer_start_debug() where it makes sense The timer start debug function is called before the proper timer base is set. As a consequence the trace data contains the stale CPU and flags values. Call the debug function after setting the new base and flags. Fixes: 500462a9de65 ("timers: Switch to a non-cascading wheel") Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Frederic Weisbecker Cc: Sebastian Siewior Cc: stable@vger.kernel.org Cc: rt@linutronix.de Cc: Paul McKenney Cc: Anna-Maria Gleixner Link: https://lkml.kernel.org/r/20171222145337.792907137@linutronix.de --- kernel/time/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 6be576e..89a9e1b 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1007,8 +1007,6 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option if (!ret && (options & MOD_TIMER_PENDING_ONLY)) goto out_unlock; - debug_activate(timer, expires); - new_base = get_target_base(base, timer->flags); if (base != new_base) { @@ -1032,6 +1030,8 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option } } + debug_activate(timer, expires); + timer->expires = expires; /* * If 'idx' was calculated above and the base time did not advance