Skip to content

Commit

Permalink
tracing: Do not trace in irq when funcgraph-irq option is zero
Browse files Browse the repository at this point in the history
When the function graph tracer funcgraph-irq option is zero, disable
tracing in IRQs. This makes the option have two effects.

1) When reading the trace file, do not display the functions that
   happen in interrupt context (when detected)

2) [*new*] When recording a trace, skip those that are detected
   to be in interrupt by the 'in_irq()' function

Note, in_irq() is updated at irq_enter() and irq_exit(). There are
still functions that are recorded by the function graph tracer that
is in interrupt context but outside the irq_enter/exit() routines.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
  • Loading branch information
Steven Rostedt authored and Steven Rostedt committed Sep 15, 2010
1 parent 2bd1621 commit b304d04
Showing 1 changed file with 22 additions and 1 deletion.
23 changes: 22 additions & 1 deletion kernel/trace/trace_functions_graph.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#include "trace.h"
#include "trace_output.h"

/* When set, irq functions will be ignored */
static int ftrace_graph_skip_irqs;

struct fgraph_cpu_data {
pid_t last_pid;
int depth;
Expand Down Expand Up @@ -208,6 +211,14 @@ int __trace_graph_entry(struct trace_array *tr,
return 1;
}

static inline int ftrace_graph_ignore_irqs(void)
{
if (!ftrace_graph_skip_irqs)
return 0;

return in_irq();
}

int trace_graph_entry(struct ftrace_graph_ent *trace)
{
struct trace_array *tr = graph_array;
Expand All @@ -222,7 +233,8 @@ int trace_graph_entry(struct ftrace_graph_ent *trace)
return 0;

/* trace it when it is-nested-in or is a function enabled. */
if (!(trace->depth || ftrace_graph_addr(trace->func)))
if (!(trace->depth || ftrace_graph_addr(trace->func)) ||
ftrace_graph_ignore_irqs())
return 0;

local_irq_save(flags);
Expand Down Expand Up @@ -1334,6 +1346,14 @@ void graph_trace_close(struct trace_iterator *iter)
}
}

static int func_graph_set_flag(u32 old_flags, u32 bit, int set)
{
if (bit == TRACE_GRAPH_PRINT_IRQS)
ftrace_graph_skip_irqs = !set;

return 0;
}

static struct trace_event_functions graph_functions = {
.trace = print_graph_function_event,
};
Expand All @@ -1360,6 +1380,7 @@ static struct tracer graph_trace __read_mostly = {
.print_line = print_graph_function,
.print_header = print_graph_headers,
.flags = &tracer_flags,
.set_flag = func_graph_set_flag,
#ifdef CONFIG_FTRACE_SELFTEST
.selftest = trace_selftest_startup_function_graph,
#endif
Expand Down

0 comments on commit b304d04

Please sign in to comment.