diff options
| author | Tony Lindgren <tony@atomide.com> | 2019-09-23 10:38:20 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-09-23 10:38:20 -0700 |
| commit | c01f5120ca7cf2994336c42b8a9cae697121ffb3 (patch) | |
| tree | d0ac4ed8e3bc4c11203f31b984d300b0f4127978 /kernel/trace/trace_functions_graph.c | |
| parent | a4c8723a162e6244fb01944fbf446750575dba59 (diff) | |
| parent | f1f028ff89cb0d37db299d48e7b2ce19be040d52 (diff) | |
Merge branch 'fixes-merge-window-pt2' into fixes
Diffstat (limited to 'kernel/trace/trace_functions_graph.c')
| -rw-r--r-- | kernel/trace/trace_functions_graph.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index 69ebf3c2f1b5..78af97163147 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -137,6 +137,13 @@ int trace_graph_entry(struct ftrace_graph_ent *trace) if (trace_recursion_test(TRACE_GRAPH_NOTRACE_BIT)) return 0; + /* + * Do not trace a function if it's filtered by set_graph_notrace. + * Make the index of ret stack negative to indicate that it should + * ignore further functions. But it needs its own ret stack entry + * to recover the original index in order to continue tracing after + * returning from the function. + */ if (ftrace_graph_notrace_addr(trace->func)) { trace_recursion_set(TRACE_GRAPH_NOTRACE_BIT); /* @@ -156,16 +163,6 @@ int trace_graph_entry(struct ftrace_graph_ent *trace) return 0; /* - * Do not trace a function if it's filtered by set_graph_notrace. - * Make the index of ret stack negative to indicate that it should - * ignore further functions. But it needs its own ret stack entry - * to recover the original index in order to continue tracing after - * returning from the function. - */ - if (ftrace_graph_notrace_addr(trace->func)) - return 1; - - /* * Stop here if tracing_threshold is set. We only write function return * events to the ring buffer. */ |