2015-05-07 23:21:13

by Badhri Jagan Sridharan

Subject: [PATCH v3] 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]>
---
Changelog since v2:
- changed deferrable flag to unsigned int

Changelog since v1:
- fixed indentation
- moved deferrable flag checking to tracing code

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

diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h
index 68c2c20..d7abef1 100644
--- a/include/trace/events/timer.h
+++ b/include/trace/events/timer.h
@@ -43,15 +43,18 @@ 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,
+ unsigned int 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( unsigned int, deferrable )
),

TP_fast_assign(
@@ -59,11 +62,13 @@ 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 > 0 ? 'y':'n')
);

/**
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 2ece3aa..e5588da 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -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));
}

static inline void debug_deactivate(struct timer_list *timer)
--
2.2.0.rc0.207.ga3a616c

2015-05-13 14:11:59

by Steven Rostedt

Subject: Re: [PATCH v3] tracing: timer: Add deferrable flag to timer_start

On Thu, 7 May 2015 16:20:34 -0700
Badhri Jagan Sridharan <[email protected]> wrote:

> 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]>

Acked-by: Steven Rostedt <[email protected]>

John, Thomas, you want to pick this up?

-- Steve

> ---
> Changelog since v2:
> - changed deferrable flag to unsigned int
>
> Changelog since v1:
> - fixed indentation
> - moved deferrable flag checking to tracing code
>
> include/trace/events/timer.h | 13 +++++++++----
> kernel/time/timer.c | 3 ++-
> 2 files changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h
> index 68c2c20..d7abef1 100644
> --- a/include/trace/events/timer.h
> +++ b/include/trace/events/timer.h
> @@ -43,15 +43,18 @@ 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,
> + unsigned int 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( unsigned int, deferrable )
> ),
>
> TP_fast_assign(
> @@ -59,11 +62,13 @@ 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 > 0 ? 'y':'n')
> );
>
> /**
> diff --git a/kernel/time/timer.c b/kernel/time/timer.c
> index 2ece3aa..e5588da 100644
> --- a/kernel/time/timer.c
> +++ b/kernel/time/timer.c
> @@ -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));
> }
>
> static inline void debug_deactivate(struct timer_list *timer)

2015-05-13 23:39:57

by John Stultz

Subject: Re: [PATCH v3] tracing: timer: Add deferrable flag to timer_start

On Wed, May 13, 2015 at 7:11 AM, Steven Rostedt <[email protected]> wrote:
> On Thu, 7 May 2015 16:20:34 -0700
> Badhri Jagan Sridharan <[email protected]> wrote:
>
>> 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]>
>
> Acked-by: Steven Rostedt <[email protected]>
>
> John, Thomas, you want to pick this up?

Got some time to queue a few items and pulled this into my queue. Will
push to Thomas for 4.2 unless he objects.

thanks
-john