tracing: timer: Add deferrable flag to timer_start

PATCH Superseded Badhri Jagan Sridharan 2 participants 3 messages May 6, 2015

Subsystems (3)

Tracing High-resolution timers, timer wheel, clockevents Posix clocks and timers

lore

Share & tools

lore

Badhri Jagan Sridharan

author

2015-05-06 01:05 UTC #0 lore raw

PATCH 1/1 tracing: timer: Add deferrable flag to timer_start

The timer_start event now shows whether the timer is deferrable in case of a low-res timer. The debug_activate function now includes deferrable flag while calling trace_timer_start event.

Signed-off-by Badhri Jagan Sridharan <[email protected]>

---
 include/trace/events/timer.h | 11 +++++++----
 kernel/time/timer.c          |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

include/trace/events/timer.h +7 -4

index 68c2c20..9b15f89 100644
@@ -43,15 +43,17 @@ DEFINE_EVENT(timer_class, timer_init,
  */
 TRACE_EVENT(timer_start,
 
-	TP_PROTO(struct timer_list *timer, unsigned long expires),
+	TP_PROTO(struct timer_list *timer,
+		unsigned long expires, char deferrable),
 
-	TP_ARGS(timer, expires),
+	TP_ARGS(timer, expires, deferrable),
 
 	TP_STRUCT__entry(
 		__field( void *,	timer		)
 		__field( void *,	function	)
 		__field( unsigned long,	expires		)
 		__field( unsigned long,	now		)
+		__field(char,	deferrable)
 	),
 
 	TP_fast_assign(

@@ -59,11 +61,12 @@ TRACE_EVENT(timer_start,
 		__entry->function	= timer->function;
 		__entry->expires	= expires;
 		__entry->now		= jiffies;
+		__entry->deferrable     = deferrable;
 	),
 
-	TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld]",
+	TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld] defer=%c",
 		  __entry->timer, __entry->function, __entry->expires,
-		  (long)__entry->expires - __entry->now)
+		  (long)__entry->expires - __entry->now, __entry->deferrable)
 );
 
 /**

kernel/time/timer.c +2 -1

index 2ece3aa..2b906b5 100644
@@ -648,7 +648,8 @@ static inline void
 debug_activate(struct timer_list *timer, unsigned long expires)
 {
 	debug_timer_activate(timer);
-	trace_timer_start(timer, expires);
+	trace_timer_start(timer, expires,
+		tbase_get_deferrable(timer->base) > 0 ? 'y' : 'n');
 }
 
 static inline void debug_deactivate(struct timer_list *timer)

Signature · 1 line

2.2.0.rc0.207.ga3a616c

Steven Rostedt

maintainer

2015-05-06 01:51 UTC #1 lore raw

Quoted 22 lines · On Tue, 5 May 2015 18:04:53 -0700 Badhri Jagan Sridharan <[email protected]>…

The timer_start event now shows whether the timer is deferrable in case of a low-res timer. The debug_activate function now includes deferrable flag while calling trace_timer_start event.
Signed-off-by Badhri Jagan Sridharan <[email protected]>
---
 include/trace/events/timer.h | 11 +++++++----
 kernel/time/timer.c          |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)
include/trace/events/timer.h +2 -1
index 68c2c20..9b15f89 100644
@@ -43,15 +43,17 @@ DEFINE_EVENT(timer_class, timer_init,
  */
 TRACE_EVENT(timer_start,
 
-	TP_PROTO(struct timer_list *timer, unsigned long expires),
+	TP_PROTO(struct timer_list *timer,
+		unsigned long expires, char deferrable),

include/trace/events/timer.h DEFINE_EVENT(timer_class, timer_init, · line 56

Quoted 10 lines

include/trace/events/timer.h +2 -1

 
-	TP_ARGS(timer, expires),
+	TP_ARGS(timer, expires, deferrable),
 
 	TP_STRUCT__entry(
 		__field( void *,	timer		)
 		__field( void *,	function	)
 		__field( unsigned long,	expires		)
 		__field( unsigned long,	now		)
+		__field(char,	deferrable)

Fix indentation here too.

Quoted 5 lines

include/trace/events/timer.h +0 -0

 	),
 
 	TP_fast_assign(

@@ -59,11 +61,12 @@ TRACE_EVENT(timer_start,
 		__entry->function	= timer->function;

include/trace/events/timer.h TRACE_EVENT(timer_start, · line 69

Quoted 10 lines

include/trace/events/timer.h +3 -2

 		__entry->expires	= expires;
 		__entry->now		= jiffies;
+		__entry->deferrable     = deferrable;
 	),
 
-	TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld]",
+	TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld] defer=%c",
 		  __entry->timer, __entry->function, __entry->expires,
-		  (long)__entry->expires - __entry->now)
+		  (long)__entry->expires - __entry->now, __entry->deferrable)

Should pass in tbase_get_deferrable(), and do the characters here (slight optimization).

	__entry->deferrable > 0 ? 'y' : 'n')

Quoted 8 lines

include/trace/events/timer.h +0 -0
 );
 
 /**
kernel/time/timer.c +0 -0
index 2ece3aa..2b906b5 100644

kernel/time/timer.c static inline void · line 652

Quoted 6 lines

kernel/time/timer.c +2 -1

@@ -648,7 +648,8 @@ static inline void
 debug_activate(struct timer_list *timer, unsigned long expires)
 {
 	debug_timer_activate(timer);
-	trace_timer_start(timer, expires);
+	trace_timer_start(timer, expires,
+		tbase_get_deferrable(timer->base) > 0 ? 'y' : 'n');

Then this should just be;

	trace_timer_start(timer, expires,
		tbase_get_deferrable(timer->base));

-- Steve

Quoted 3 lines

kernel/time/timer.c +0 -0

 }
 
 static inline void debug_deactivate(struct timer_list *timer)

Badhri Jagan Sridharan

author

2015-05-06 02:35 UTC #2 lore raw

Thanks for your comments..
Have made the changes that you mentioned in PATCH v2.

Quoted 86 lines · Steven Rostedt

Quoted 22 lines · On Tue, 5 May 2015 18:04:53 -0700 Badhri Jagan Sridharan <[email protected]>…
The timer_start event now shows whether the timer is deferrable in case of a low-res timer. The debug_activate function now includes deferrable flag while calling trace_timer_start event.
Signed-off-by Badhri Jagan Sridharan <[email protected]>
---
  include/trace/events/timer.h | 11 +++++++----
  kernel/time/timer.c          |  3 ++-
  2 files changed, 9 insertions(+), 5 deletions(-)
include/trace/events/timer.h +2 -1
index 68c2c20..9b15f89 100644
@@ -43,15 +43,17 @@ DEFINE_EVENT(timer_class, timer_init,
   */
  TRACE_EVENT(timer_start,
 
-	TP_PROTO(struct timer_list *timer, unsigned long expires),
+	TP_PROTO(struct timer_list *timer,
+		unsigned long expires, char deferrable),
include/trace/events/timer.h DEFINE_EVENT(timer_class, timer_init, · line 56
Quoted 10 lines
include/trace/events/timer.h +2 -1
 
-	TP_ARGS(timer, expires),
+	TP_ARGS(timer, expires, deferrable),
 
  	TP_STRUCT__entry(
  		__field( void *,	timer		)
  		__field( void *,	function	)
  		__field( unsigned long,	expires		)
  		__field( unsigned long,	now		)
+		__field(char,	deferrable)
Fix indentation here too.
Quoted 5 lines
include/trace/events/timer.h +0 -0
  	),
 
  	TP_fast_assign(
@@ -59,11 +61,12 @@ TRACE_EVENT(timer_start,
  		__entry->function	= timer->function;
include/trace/events/timer.h TRACE_EVENT(timer_start, · line 69
Quoted 10 lines
include/trace/events/timer.h +3 -2
  		__entry->expires	= expires;
  		__entry->now		= jiffies;
+		__entry->deferrable     = deferrable;
  	),
 
-	TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld]",
+	TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld] defer=%c",
  		  __entry->timer, __entry->function, __entry->expires,
-		  (long)__entry->expires - __entry->now)
+		  (long)__entry->expires - __entry->now, __entry->deferrable)
Should pass in tbase_get_deferrable(), and do the characters here (slight optimization).
	__entry->deferrable > 0 ? 'y' : 'n')
Quoted 8 lines
include/trace/events/timer.h +0 -0
  );
 
  /**
kernel/time/timer.c +0 -0
index 2ece3aa..2b906b5 100644
kernel/time/timer.c static inline void · line 652
Quoted 6 lines
kernel/time/timer.c +2 -1
@@ -648,7 +648,8 @@ static inline void
  debug_activate(struct timer_list *timer, unsigned long expires)
  {
  	debug_timer_activate(timer);
-	trace_timer_start(timer, expires);
+	trace_timer_start(timer, expires,
+		tbase_get_deferrable(timer->base) > 0 ? 'y' : 'n');
Then this should just be;
	trace_timer_start(timer, expires,
		tbase_get_deferrable(timer->base));
-- Steve
Quoted 3 lines
kernel/time/timer.c +0 -0
  }
 
  static inline void debug_deactivate(struct timer_list *timer)