1 files changed, 41 insertions, 22 deletions

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index ca98445782ac..92382af7a213 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -83,13 +83,18 @@ static struct tracer_opt trace_opts[] = {
         { TRACER_OPT(funcgraph-irqs, TRACE_GRAPH_PRINT_IRQS) },
         /* Display function name after trailing } */
         { TRACER_OPT(funcgraph-tail, TRACE_GRAPH_PRINT_TAIL) },
+        /* Include sleep time (scheduled out) between entry and return */
+        { TRACER_OPT(sleep-time, TRACE_GRAPH_SLEEP_TIME) },
+        /* Include time within nested functions */
+        { TRACER_OPT(graph-time, TRACE_GRAPH_GRAPH_TIME) },
         { } /* Empty entry */
 };
 
 static struct tracer_flags tracer_flags = {
         /* Don't display overruns, proc, or tail by default */
         .val = TRACE_GRAPH_PRINT_CPU | TRACE_GRAPH_PRINT_OVERHEAD |
-               TRACE_GRAPH_PRINT_DURATION | TRACE_GRAPH_PRINT_IRQS,
+               TRACE_GRAPH_PRINT_DURATION | TRACE_GRAPH_PRINT_IRQS |
+               TRACE_GRAPH_SLEEP_TIME | TRACE_GRAPH_GRAPH_TIME,
         .opts = trace_opts
 };
 
@@ -107,8 +112,8 @@ enum {
 };
 
 static void
-print_graph_duration(unsigned long long duration, struct trace_seq *s,
-                     u32 flags);
+print_graph_duration(struct trace_array *tr, unsigned long long duration,
+                     struct trace_seq *s, u32 flags);
 
 /* Add a function return address to the trace stack on thread info.*/
 int
@@ -653,6 +658,7 @@ static void
 print_graph_irq(struct trace_iterator *iter, unsigned long addr,
                 enum trace_type type, int cpu, pid_t pid, u32 flags)
 {
+        struct trace_array *tr = iter->tr;
         struct trace_seq *s = &iter->seq;
         struct trace_entry *ent = iter->ent;
 
@@ -660,7 +666,7 @@ print_graph_irq(struct trace_iterator *iter, unsigned long addr,
                 addr >= (unsigned long)__irqentry_text_end)
                 return;
 
-        if (trace_flags & TRACE_ITER_CONTEXT_INFO) {
+        if (tr->trace_flags & TRACE_ITER_CONTEXT_INFO) {
                 /* Absolute time */
                 if (flags & TRACE_GRAPH_PRINT_ABS_TIME)
                         print_graph_abs_time(iter->ts, s);
@@ -676,19 +682,19 @@ print_graph_irq(struct trace_iterator *iter, unsigned long addr,
                 }
 
                 /* Latency format */
-                if (trace_flags & TRACE_ITER_LATENCY_FMT)
+                if (tr->trace_flags & TRACE_ITER_LATENCY_FMT)
                         print_graph_lat_fmt(s, ent);
         }
 
         /* No overhead */
-        print_graph_duration(0, s, flags | FLAGS_FILL_START);
+        print_graph_duration(tr, 0, s, flags | FLAGS_FILL_START);
 
         if (type == TRACE_GRAPH_ENT)
                 trace_seq_puts(s, "==========>");
         else
                 trace_seq_puts(s, "<==========");
 
-        print_graph_duration(0, s, flags | FLAGS_FILL_END);
+        print_graph_duration(tr, 0, s, flags | FLAGS_FILL_END);
         trace_seq_putc(s, '\n');
 }
 
@@ -726,11 +732,11 @@ trace_print_graph_duration(unsigned long long duration, struct trace_seq *s)
 }
 
 static void
-print_graph_duration(unsigned long long duration, struct trace_seq *s,
-                     u32 flags)
+print_graph_duration(struct trace_array *tr, unsigned long long duration,
+                     struct trace_seq *s, u32 flags)
 {
         if (!(flags & TRACE_GRAPH_PRINT_DURATION) ||
-            !(trace_flags & TRACE_ITER_CONTEXT_INFO))
+            !(tr->trace_flags & TRACE_ITER_CONTEXT_INFO))
                 return;
 
         /* No real adata, just filling the column with spaces */
@@ -764,6 +770,7 @@ print_graph_entry_leaf(struct trace_iterator *iter,
                 struct trace_seq *s, u32 flags)
 {
         struct fgraph_data *data = iter->private;
+        struct trace_array *tr = iter->tr;
         struct ftrace_graph_ret *graph_ret;
         struct ftrace_graph_ent *call;
         unsigned long long duration;
@@ -792,7 +799,7 @@ print_graph_entry_leaf(struct trace_iterator *iter,
         }
 
         /* Overhead and duration */
-        print_graph_duration(duration, s, flags);
+        print_graph_duration(tr, duration, s, flags);
 
         /* Function */
         for (i = 0; i < call->depth * TRACE_GRAPH_INDENT; i++)
@@ -810,6 +817,7 @@ print_graph_entry_nested(struct trace_iterator *iter,
 {
         struct ftrace_graph_ent *call = &entry->graph_ent;
         struct fgraph_data *data = iter->private;
+        struct trace_array *tr = iter->tr;
         int i;
 
         if (data) {
@@ -825,7 +833,7 @@ print_graph_entry_nested(struct trace_iterator *iter,
         }
 
         /* No time */
-        print_graph_duration(0, s, flags | FLAGS_FILL_FULL);
+        print_graph_duration(tr, 0, s, flags | FLAGS_FILL_FULL);
 
         /* Function */
         for (i = 0; i < call->depth * TRACE_GRAPH_INDENT; i++)
@@ -849,6 +857,7 @@ print_graph_prologue(struct trace_iterator *iter, struct trace_seq *s,
 {
         struct fgraph_data *data = iter->private;
         struct trace_entry *ent = iter->ent;
+        struct trace_array *tr = iter->tr;
         int cpu = iter->cpu;
 
         /* Pid */
@@ -858,7 +867,7 @@ print_graph_prologue(struct trace_iterator *iter, struct trace_seq *s,
                 /* Interrupt */
                 print_graph_irq(iter, addr, type, cpu, ent->pid, flags);
 
-        if (!(trace_flags & TRACE_ITER_CONTEXT_INFO))
+        if (!(tr->trace_flags & TRACE_ITER_CONTEXT_INFO))
                 return;
 
         /* Absolute time */
@@ -876,7 +885,7 @@ print_graph_prologue(struct trace_iterator *iter, struct trace_seq *s,
         }
 
         /* Latency format */
-        if (trace_flags & TRACE_ITER_LATENCY_FMT)
+        if (tr->trace_flags & TRACE_ITER_LATENCY_FMT)
                 print_graph_lat_fmt(s, ent);
 
         return;
@@ -1027,6 +1036,7 @@ print_graph_return(struct ftrace_graph_ret *trace, struct trace_seq *s,
 {
         unsigned long long duration = trace->rettime - trace->calltime;
         struct fgraph_data *data = iter->private;
+        struct trace_array *tr = iter->tr;
         pid_t pid = ent->pid;
         int cpu = iter->cpu;
         int func_match = 1;
@@ -1058,7 +1068,7 @@ print_graph_return(struct ftrace_graph_ret *trace, struct trace_seq *s,
         print_graph_prologue(iter, s, 0, 0, flags);
 
         /* Overhead and duration */
-        print_graph_duration(duration, s, flags);
+        print_graph_duration(tr, duration, s, flags);
 
         /* Closing brace */
         for (i = 0; i < trace->depth * TRACE_GRAPH_INDENT; i++)
@@ -1091,7 +1101,8 @@ static enum print_line_t
 print_graph_comment(struct trace_seq *s, struct trace_entry *ent,
                     struct trace_iterator *iter, u32 flags)
 {
-        unsigned long sym_flags = (trace_flags & TRACE_ITER_SYM_MASK);
+        struct trace_array *tr = iter->tr;
+        unsigned long sym_flags = (tr->trace_flags & TRACE_ITER_SYM_MASK);
         struct fgraph_data *data = iter->private;
         struct trace_event *event;
         int depth = 0;
@@ -1104,7 +1115,7 @@ print_graph_comment(struct trace_seq *s, struct trace_entry *ent,
         print_graph_prologue(iter, s, 0, 0, flags);
 
         /* No time */
-        print_graph_duration(0, s, flags | FLAGS_FILL_FULL);
+        print_graph_duration(tr, 0, s, flags | FLAGS_FILL_FULL);
 
         /* Indentation */
         if (depth > 0)
@@ -1245,9 +1256,10 @@ static void print_lat_header(struct seq_file *s, u32 flags)
         seq_printf(s, "#%.*s||| /                      \n", size, spaces);
 }
 
-static void __print_graph_headers_flags(struct seq_file *s, u32 flags)
+static void __print_graph_headers_flags(struct trace_array *tr,
+                                        struct seq_file *s, u32 flags)
 {
-        int lat = trace_flags & TRACE_ITER_LATENCY_FMT;
+        int lat = tr->trace_flags & TRACE_ITER_LATENCY_FMT;
 
         if (lat)
                 print_lat_header(s, flags);
@@ -1289,11 +1301,12 @@ static void print_graph_headers(struct seq_file *s)
 void print_graph_headers_flags(struct seq_file *s, u32 flags)
 {
         struct trace_iterator *iter = s->private;
+        struct trace_array *tr = iter->tr;
 
-        if (!(trace_flags & TRACE_ITER_CONTEXT_INFO))
+        if (!(tr->trace_flags & TRACE_ITER_CONTEXT_INFO))
                 return;
 
-        if (trace_flags & TRACE_ITER_LATENCY_FMT) {
+        if (tr->trace_flags & TRACE_ITER_LATENCY_FMT) {
                 /* print nothing if the buffers are empty */
                 if (trace_empty(iter))
                         return;
@@ -1301,7 +1314,7 @@ void print_graph_headers_flags(struct seq_file *s, u32 flags)
                 print_trace_header(s, iter);
         }
 
-        __print_graph_headers_flags(s, flags);
+        __print_graph_headers_flags(tr, s, flags);
 }
 
 void graph_trace_open(struct trace_iterator *iter)
@@ -1362,6 +1375,12 @@ func_graph_set_flag(struct trace_array *tr, u32 old_flags, u32 bit, int set)
         if (bit == TRACE_GRAPH_PRINT_IRQS)
                 ftrace_graph_skip_irqs = !set;
 
+        if (bit == TRACE_GRAPH_SLEEP_TIME)
+                ftrace_graph_sleep_time_control(set);
+
+        if (bit == TRACE_GRAPH_GRAPH_TIME)
+                ftrace_graph_graph_time_control(set);
+
         return 0;
 }