timer: Move trace point to get proper index (dc1e7dc5) · Commits · 戴 / test

When placing the timer_start trace point before the timer wheel bucket index is calculated, the index information in the trace point is useless. It is not possible to simply move the debug_activate() call after the index calculation, because debug_object_activate() needs to be called before touching the object. Therefore split debug_activate() and move the trace point into enqueue_timer() after the new index has been calculated. The debug_object_activate() call remains at the original place. Signed-off-by:

Anna-Maria Gleixner <anna-maria@linutronix.de> Signed-off-by:

Thomas Gleixner <tglx@linutronix.de> Cc: fweisbec@gmail.com Cc: peterz@infradead.org Cc: Steven Rostedt <rostedt@goodmis.org> Link: https://lkml.kernel.org/r/20190321120921.16463-3-anna-maria@linutronix.de

kernel/time/timer.c

+4 −9

Original line number	Diff line number	Diff line
		@@ -536,6 +536,8 @@ static void enqueue_timer(struct timer_base base, struct timer_list timer,
		hlist_add_head(&timer->entry, base->vectors + idx);
		__set_bit(idx, base->pending_map);
		timer_set_idx(timer, idx);

		trace_timer_start(timer, timer->expires, timer->flags);
		}

		static void
		@@ -757,13 +759,6 @@ static inline void debug_init(struct timer_list *timer)
		trace_timer_init(timer);
		}

		static inline void
		debug_activate(struct timer_list *timer, unsigned long expires)
		{
		debug_timer_activate(timer);
		trace_timer_start(timer, expires, timer->flags);
		}

		static inline void debug_deactivate(struct timer_list *timer)
		{
		debug_timer_deactivate(timer);
		@@ -1037,7 +1032,7 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option
		}
		}

		debug_activate(timer, expires);
		debug_timer_activate(timer);

		timer->expires = expires;
		/*
		@@ -1171,7 +1166,7 @@ void add_timer_on(struct timer_list *timer, int cpu)
		}
		forward_timer_base(base);

		debug_activate(timer, timer->expires);
		debug_timer_activate(timer);
		internal_add_timer(base, timer);
		raw_spin_unlock_irqrestore(&base->lock, flags);
		}

Admin message