Skip to contentSkip to conversation

ftrace: add tracepoint for hrtimer

PATCH In review Xiao Guangrong 2 participants 3 messages May 22, 2009 – May 27, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/3 ftrace: add tracepoint for hrtimer

This patch can trace hrtimer init/start/expire/cancle event

Example ftrace output:

	   <...>-3628  [001] 64228.304772: hrtimer_init: timer=e0b404cc clockid=CLOCK_REALTIME mode=HRTIMER_MODE_ABS
           <...>-3628  [001] 64228.304793: hrtimer_start: timer=e0b404cc func=test_hrtime expires=1242920654000000000 ns softexpires=1242920654000000000 ns
     ksoftirqd/1-7     [001] 64228.304858: hrtimer_expire: timer=e0b404cc func=test_hrtime
     ksoftirqd/1-7     [001] 64228.304860: hrtimer_cancel: timer=e0b404cc func=test_hrtime
---
 include/trace/events/timer.h |   89 ++++++++++++++++++++++++++++++++++++++++++
 kernel/hrtimer.c             |    5 ++
 2 files changed, 94 insertions(+), 0 deletions(-)
include/trace/events/timer.h +89 -0
index f2f60d8..e5dc9d5 100644
@@ -86,6 +86,95 @@ TRACE_EVENT(timer_cancel,
 	TP_printk("timer=%p func=%pf", __entry->timer, __entry->function)
 );
 
+TRACE_EVENT(hrtimer_init,
+
+	TP_PROTO(struct hrtimer *timer, clockid_t clockid, enum hrtimer_mode mode),
+
+	TP_ARGS(timer, clockid, mode),
+
+	TP_STRUCT__entry(
+		__field( void *,		timer		)
+		__field( clockid_t,		clockid		)
+		__field( enum hrtimer_mode,	mode		)
+	),
+
+	TP_fast_assign(
+		__entry->timer	   = timer;
+		__entry->clockid   = clockid;
+		__entry->mode	   = mode;
+	),
+
+	TP_printk("timer=%p clockid=%s mode=%s", __entry->timer,
+		  __entry->clockid == CLOCK_REALTIME ?
+			"CLOCK_REALTIME" : "CLOCK_MONOTONIC",
+		  __entry->mode == HRTIMER_MODE_ABS ?
+			"HRTIMER_MODE_ABS" : "HRTIMER_MODE_REL")
+);
+
+TRACE_EVENT(hrtimer_start,
+
+	TP_PROTO(struct hrtimer *timer),
+
+	TP_ARGS(timer),
+
+	TP_STRUCT__entry(
+		__field( void *,	timer		)
+		__field( void *,	function	)
+		__field( s64,		expires		)
+		__field( s64,		softexpires	)
+	),
+
+	TP_fast_assign(
+		__entry->timer		= timer;
+		__entry->function	= timer->function;
+		__entry->expires	= ktime_to_ns(hrtimer_get_expires(timer));
+		__entry->softexpires	= ktime_to_ns(hrtimer_get_softexpires(timer));
+	),
+
+	TP_printk("timer=%p func=%pf expires=%llu ns softexpires=%llu ns",
+		  __entry->timer, __entry->function,
+		 (unsigned long long)__entry->expires,
+		 (unsigned long long)__entry->softexpires)
+);
+
+TRACE_EVENT(hrtimer_expire,
+
+	TP_PROTO(struct hrtimer *timer),
+
+	TP_ARGS(timer),
+
+	TP_STRUCT__entry(
+		__field( void *,	timer		)
+		__field( void *,        function        )
+	),
+
+	TP_fast_assign(
+		__entry->timer		= timer;
+		__entry->function	= timer->function;
+	),
+
+	TP_printk("timer=%p func=%pf", __entry->timer, __entry->function)
+);
+
+TRACE_EVENT(hrtimer_cancel,
+
+	TP_PROTO(struct hrtimer *timer),
+
+	TP_ARGS(timer),
+
+	TP_STRUCT__entry(
+		__field( void *,	timer		)
+		__field( void *,        function        )
+	),
+
+	TP_fast_assign(
+		__entry->timer		= timer;
+		__entry->function       = timer->function;
+	),
+
+	TP_printk("timer=%p func=%pf", __entry->timer, __entry->function)
+);
+
 #endif /*  _TRACE_TIMER_H */
 
 /* This part must be outside protection */
kernel/hrtimer.c +5 -0
index cb8a15c..d3cecdc 100644
@@ -43,6 +43,7 @@
 #include <linux/seq_file.h>
 #include <linux/err.h>
 #include <linux/debugobjects.h>
+#include <trace/events/timer.h>
 
 #include <asm/uaccess.h>
 
@@ -832,6 +833,7 @@ static int enqueue_hrtimer(struct hrtimer *timer,
 	 * state of a possibly running callback.
 	 */
 	timer->state |= HRTIMER_STATE_ENQUEUED;
+	trace_hrtimer_start(timer);
 
 	return leftmost;
 }
@@ -864,6 +866,7 @@ static void __remove_hrtimer(struct hrtimer *timer,
 		rb_erase(&timer->node, &base->active);
 	}
 	timer->state = newstate;
+	trace_hrtimer_cancel(timer);
 }
 
 /*
@@ -1119,6 +1122,7 @@ void hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
 {
 	debug_hrtimer_init(timer);
 	__hrtimer_init(timer, clock_id, mode);
+	trace_hrtimer_init(timer, clock_id, mode);
 }
 EXPORT_SYMBOL_GPL(hrtimer_init);
 
@@ -1151,6 +1155,7 @@ static void __run_hrtimer(struct hrtimer *timer)
 	WARN_ON(!irqs_disabled());
 
 	debug_hrtimer_deactivate(timer);
+	trace_hrtimer_expire(timer);
 	__remove_hrtimer(timer, base, HRTIMER_STATE_CALLBACK, 0);
 	timer_stats_account_hrtimer(timer);
 	fn = timer->function;
Signature · 1 line
1.6.1.2
#1 lore raw
Quoted 9 lines · Xiao Guangrong
include/trace/events/timer.h +9 -0
+TRACE_EVENT(hrtimer_start,
+
+	TP_PROTO(struct hrtimer *timer),
+
+	TP_ARGS(timer),
+
+	TP_STRUCT__entry(
+		__field( void *,	timer		)
+		__field( void *,	function	)

include/trace/events/timer.h TRACE_EVENT(timer_cancel, · line 132

Quoted 10 lines
include/trace/events/timer.h +10 -0
+		__field( s64,		expires		)
+		__field( s64,		softexpires	)
+	),
+
+	TP_fast_assign(
+		__entry->timer		= timer;
+		__entry->function	= timer->function;
+		__entry->expires	= ktime_to_ns(hrtimer_get_expires(timer));
+		__entry->softexpires	= ktime_to_ns(hrtimer_get_softexpires(timer));
+	),

Yuck, we really do not want expensive conversions in the fast path. This can be done by printk or user space tools.

kernel/hrtimer.c void hrtimer_init(struct hrtimer *timer, clockid_t clock_id, · line 1125

Quoted 5 lines
kernel/hrtimer.c +1 -0
@@ -1119,6 +1122,7 @@ void hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
 {
 	debug_hrtimer_init(timer);
 	__hrtimer_init(timer, clock_id, mode);
+	trace_hrtimer_init(timer, clock_id, mode);

The comments I made about the timer.c tracepoints vs. debugobjects apply here as well.

Thanks,

tglx

#2 lore raw
Quoted 15 lines · Thomas Gleixner
Quoted 14 lines · Xiao Guangrong
include/trace/events/timer.h +14 -0
+TRACE_EVENT(hrtimer_start,
+
+	TP_PROTO(struct hrtimer *timer),
+
+	TP_ARGS(timer),
+
+	TP_STRUCT__entry(
+		__field( void *,	timer		)
+		__field( void *,	function	)
+		__field( s64,		expires		)
+		__field( s64,		softexpires	)
+	),
+
+	TP_fast_assign(
Quoted 9 lines

include/trace/events/timer.h TRACE_EVENT(timer_cancel, · line 132

Quoted 5 lines
include/trace/events/timer.h +5 -0
+		__entry->timer		= timer;
+		__entry->function	= timer->function;
+		__entry->expires	= ktime_to_ns(hrtimer_get_expires(timer));
+		__entry->softexpires	= ktime_to_ns(hrtimer_get_softexpires(timer));
+	),

Yuck, we really do not want expensive conversions in the fast path. This can be done by printk or user space tools.

Yes, you are right. I'will correct it.

Quoted 14 lines

kernel/hrtimer.c void hrtimer_init(struct hrtimer *timer, clockid_t clock_id, · line 1125

Quoted 5 lines
kernel/hrtimer.c +1 -0
@@ -1119,6 +1122,7 @@ void hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
 {
 	debug_hrtimer_init(timer);
 	__hrtimer_init(timer, clock_id, mode);
+	trace_hrtimer_init(timer, clock_id, mode);

The comments I made about the timer.c tracepoints vs. debugobjects apply here as well.

Thanks,

tglx