Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e9a49ef authored by Jiri Olsa's avatar Jiri Olsa Committed by Steven Rostedt
Browse files

tracing/latency: Fix header output for latency tracers 

In case the the graph tracer (CONFIG_FUNCTION_GRAPH_TRACER) or even the
function tracer (CONFIG_FUNCTION_TRACER) are not set, the latency tracers
do not display proper latency header.

The involved/fixed latency tracers are:
        wakeup_rt
        wakeup
        preemptirqsoff
        preemptoff
        irqsoff

The patch adds proper handling of tracer configuration options for latency
tracers, and displaying correct header info accordingly.

* The current output (for wakeup tracer) with both graph and function
  tracers disabled is:

  # tracer: wakeup
  #
    <idle>-0       0d.h5    1us+:      0:120:R   + [000]     7:  0:R watchdog/0
    <idle>-0       0d.h5    3us+: ttwu_do_activate.clone.1 <-try_to_wake_up
    ...

* The fixed output is:

  # tracer: wakeup
  #
  # wakeup latency trace v1.1.5 on 3.1.0-tip+
  # --------------------------------------------------------------------
  # latency: 55 us, #4/4, CPU#0 | (M:preempt VP:0, KP:0, SP:0 HP:0 #P:2)
  #    -----------------
  #    | task: migration/0-6 (uid:0 nice:0 policy:1 rt_prio:99)
  #    -----------------
  #
  #                  _------=> CPU#
  #                 / _-----=> irqs-off
  #                | / _----=> need-resched
  #                || / _---=> hardirq/softirq
  #                ||| / _--=> preempt-depth
  #                |||| /     delay
  #  cmd     pid   ||||| time  |   caller
  #     \   /      |||||  \    |   /
       cat-1129    0d..4    1us :   1129:120:R   + [000]     6:  0:R migration/0
       cat-1129    0d..4    2us+: ttwu_do_activate.clone.1 <-try_to_wake_up

* The current output (for wakeup tracer) with only function
  tracer enabled is:

  # tracer: wakeup
  #
       cat-1140    0d..4    1us+:   1140:120:R   + [000]     6:  0:R migration/0
       cat-1140    0d..4    2us : ttwu_do_activate.clone.1 <-try_to_wake_up

* The fixed output is:
  # tracer: wakeup
  #
  # wakeup latency trace v1.1.5 on 3.1.0-tip+
  # --------------------------------------------------------------------
  # latency: 207 us, #109/109, CPU#1 | (M:preempt VP:0, KP:0, SP:0 HP:0 #P:2)
  #    -----------------
  #    | task: watchdog/1-12 (uid:0 nice:0 policy:1 rt_prio:99)
  #    -----------------
  #
  #                  _------=> CPU#
  #                 / _-----=> irqs-off
  #                | / _----=> need-resched
  #                || / _---=> hardirq/softirq
  #                ||| / _--=> preempt-depth
  #                |||| /     delay
  #  cmd     pid   ||||| time  |   caller
  #     \   /      |||||  \    |   /
    <idle>-0       1d.h5    1us+:      0:120:R   + [001]    12:  0:R watchdog/1
    <idle>-0       1d.h5    3us : ttwu_do_activate.clone.1 <-try_to_wake_up

Link: http://lkml.kernel.org/r/20111107150849.GE1807@m.brq.redhat.com



Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent d4d34b98

kernel/trace/trace.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -2140,6 +2140,21 @@ enum print_line_t print_trace_line(struct trace_iterator *iter) 
	return print_trace_fmt(iter);

	return print_trace_fmt(iter);

}

}





void trace_latency_header(struct seq_file *m)

{

	struct trace_iterator *iter = m->private;



	/* print nothing if the buffers are empty */

	if (trace_empty(iter))

		return;



	if (iter->iter_flags & TRACE_FILE_LAT_FMT)

		print_trace_header(m, iter);



	if (!(trace_flags & TRACE_ITER_VERBOSE))

		print_lat_help_header(m);

}



void trace_default_header(struct seq_file *m)

void trace_default_header(struct seq_file *m)

{

{

	struct trace_iterator *iter = m->private;

	struct trace_iterator *iter = m->private;

kernel/trace/trace.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -370,6 +370,7 @@ void trace_graph_function(struct trace_array *tr, 
		    unsigned long ip,

		    unsigned long ip,

		    unsigned long parent_ip,

		    unsigned long parent_ip,

		    unsigned long flags, int pc);

		    unsigned long flags, int pc);

void trace_latency_header(struct seq_file *m);

void trace_default_header(struct seq_file *m);

void trace_default_header(struct seq_file *m);

void print_trace_header(struct seq_file *m, struct trace_iterator *iter);

void print_trace_header(struct seq_file *m, struct trace_iterator *iter);

int trace_empty(struct trace_iterator *iter);

int trace_empty(struct trace_iterator *iter);

kernel/trace/trace_irqsoff.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -280,9 +280,20 @@ static enum print_line_t irqsoff_print_line(struct trace_iterator *iter) 
}

}





static void irqsoff_graph_return(struct ftrace_graph_ret *trace) { }

static void irqsoff_graph_return(struct ftrace_graph_ret *trace) { }

static void irqsoff_print_header(struct seq_file *s) { }

static void irqsoff_trace_open(struct trace_iterator *iter) { }

static void irqsoff_trace_open(struct trace_iterator *iter) { }

static void irqsoff_trace_close(struct trace_iterator *iter) { }

static void irqsoff_trace_close(struct trace_iterator *iter) { }



#ifdef CONFIG_FUNCTION_TRACER

static void irqsoff_print_header(struct seq_file *s)

{

	trace_default_header(s);

}

#else

static void irqsoff_print_header(struct seq_file *s)

{

	trace_latency_header(s);

}

#endif /* CONFIG_FUNCTION_TRACER */

#endif /* CONFIG_FUNCTION_GRAPH_TRACER */

#endif /* CONFIG_FUNCTION_GRAPH_TRACER */





/*

/*

kernel/trace/trace_sched_wakeup.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -280,9 +280,20 @@ static enum print_line_t wakeup_print_line(struct trace_iterator *iter) 
}

}





static void wakeup_graph_return(struct ftrace_graph_ret *trace) { }

static void wakeup_graph_return(struct ftrace_graph_ret *trace) { }

static void wakeup_print_header(struct seq_file *s) { }

static void wakeup_trace_open(struct trace_iterator *iter) { }

static void wakeup_trace_open(struct trace_iterator *iter) { }

static void wakeup_trace_close(struct trace_iterator *iter) { }

static void wakeup_trace_close(struct trace_iterator *iter) { }



#ifdef CONFIG_FUNCTION_TRACER

static void wakeup_print_header(struct seq_file *s)

{

	trace_default_header(s);

}

#else

static void wakeup_print_header(struct seq_file *s)

{

	trace_latency_header(s);

}

#endif /* CONFIG_FUNCTION_TRACER */

#endif /* CONFIG_FUNCTION_GRAPH_TRACER */

#endif /* CONFIG_FUNCTION_GRAPH_TRACER */





/*

/*