ftrace: let function tracing and function return run together
Impact: feature This patch enables function tracing and function return to run together. I've tested this by enabling the stack tracer and return tracer, where both the function entry and function return are used together with dynamic ftrace. Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
5a45cfe1c6
commit
e53a6319cc
|
@ -53,9 +53,6 @@ static int ftrace_pid_trace = -1;
|
||||||
/* Quick disabling of function tracer. */
|
/* Quick disabling of function tracer. */
|
||||||
int function_trace_stop;
|
int function_trace_stop;
|
||||||
|
|
||||||
/* By default, current tracing type is normal tracing. */
|
|
||||||
enum ftrace_tracing_type_t ftrace_tracing_type = FTRACE_TYPE_ENTER;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ftrace_disabled is set when an anomaly is discovered.
|
* ftrace_disabled is set when an anomaly is discovered.
|
||||||
* ftrace_disabled is much stronger than ftrace_enabled.
|
* ftrace_disabled is much stronger than ftrace_enabled.
|
||||||
|
@ -1576,15 +1573,9 @@ int register_ftrace_function(struct ftrace_ops *ops)
|
||||||
|
|
||||||
mutex_lock(&ftrace_sysctl_lock);
|
mutex_lock(&ftrace_sysctl_lock);
|
||||||
|
|
||||||
if (ftrace_tracing_type == FTRACE_TYPE_RETURN) {
|
|
||||||
ret = -EBUSY;
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = __register_ftrace_function(ops);
|
ret = __register_ftrace_function(ops);
|
||||||
ftrace_startup(0);
|
ftrace_startup(0);
|
||||||
|
|
||||||
out:
|
|
||||||
mutex_unlock(&ftrace_sysctl_lock);
|
mutex_unlock(&ftrace_sysctl_lock);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -1731,23 +1722,16 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
|
||||||
|
|
||||||
mutex_lock(&ftrace_sysctl_lock);
|
mutex_lock(&ftrace_sysctl_lock);
|
||||||
|
|
||||||
/*
|
|
||||||
* Don't launch return tracing if normal function
|
|
||||||
* tracing is already running.
|
|
||||||
*/
|
|
||||||
if (ftrace_trace_function != ftrace_stub) {
|
|
||||||
ret = -EBUSY;
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
atomic_inc(&ftrace_graph_active);
|
atomic_inc(&ftrace_graph_active);
|
||||||
ret = start_graph_tracing();
|
ret = start_graph_tracing();
|
||||||
if (ret) {
|
if (ret) {
|
||||||
atomic_dec(&ftrace_graph_active);
|
atomic_dec(&ftrace_graph_active);
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
ftrace_tracing_type = FTRACE_TYPE_RETURN;
|
|
||||||
ftrace_graph_return = retfunc;
|
ftrace_graph_return = retfunc;
|
||||||
ftrace_graph_entry = entryfunc;
|
ftrace_graph_entry = entryfunc;
|
||||||
|
|
||||||
ftrace_startup(FTRACE_START_FUNC_RET);
|
ftrace_startup(FTRACE_START_FUNC_RET);
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
@ -1763,8 +1747,6 @@ void unregister_ftrace_graph(void)
|
||||||
ftrace_graph_return = (trace_func_graph_ret_t)ftrace_stub;
|
ftrace_graph_return = (trace_func_graph_ret_t)ftrace_stub;
|
||||||
ftrace_graph_entry = (trace_func_graph_ent_t)ftrace_stub;
|
ftrace_graph_entry = (trace_func_graph_ent_t)ftrace_stub;
|
||||||
ftrace_shutdown(FTRACE_STOP_FUNC_RET);
|
ftrace_shutdown(FTRACE_STOP_FUNC_RET);
|
||||||
/* Restore normal tracing type */
|
|
||||||
ftrace_tracing_type = FTRACE_TYPE_ENTER;
|
|
||||||
|
|
||||||
mutex_unlock(&ftrace_sysctl_lock);
|
mutex_unlock(&ftrace_sysctl_lock);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue