timers: Invoke timer_start_debug() where it makes sense

KAGA-KOKO · KAGA-KOKO · commit fd45bb77ad68 · 2017-12-29T23:13:10.000+01:00
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: 500462a ("timers: Switch to a non-cascading wheel") Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Sebastian Siewior <bigeasy@linutronix.de> Cc: stable@vger.kernel.org Cc: rt@linutronix.de Cc: Paul McKenney <paulmck@linux.vnet.ibm.com> Cc: Anna-Maria Gleixner <anna-maria@linutronix.de> Link: https://lkml.kernel.org/r/20171222145337.792907137@linutronix.de
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1007,8 +1007,6 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option`
`1007`	`1007`	`if (!ret && (options & MOD_TIMER_PENDING_ONLY))`
`1008`	`1008`	`goto out_unlock;`
`1009`	`1009`
`1010`		`- debug_activate(timer, expires);`
`1011`		`-`
`1012`	`1010`	`new_base = get_target_base(base, timer->flags);`
`1013`	`1011`
`1014`	`1012`	`if (base != new_base) {`
`@@ -1032,6 +1030,8 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option`
`1032`	`1030`	`}`
`1033`	`1031`	`}`
`1034`	`1032`
	`1033`	`+ debug_activate(timer, expires);`
	`1034`	`+`
`1035`	`1035`	`timer->expires = expires;`
`1036`	`1036`	`/*`
`1037`	`1037`	`* If 'idx' was calculated above and the base time did not advance`