GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-24 07:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tracing/ftrace: Allow for the traceonoff probe be unique to instances

Browse source 
Have the traceon/off function probe triggers affect only the instance they
are set in. This required making the trace_on/off accessible for other files
in the tracing directory.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt (VMware) 2017-04-20 11:46:03 -04:00
parent cab5037950
commit 2290f2c589
3 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
kernel/trace/trace_functions.c
View file

@ -268,7 +268,8 @@ static struct tracer function_trace __tracer_data =
#ifdef CONFIG_DYNAMIC_FTRACE
static void update_traceon_count(struct ftrace_probe_ops *ops,
unsigned long ip, bool on,
unsigned long ip,
struct trace_array *tr, bool on,
void *data)
{
struct ftrace_func_mapper *mapper = data;
@ -313,13 +314,13 @@ static void update_traceon_count(struct ftrace_probe_ops *ops,
/* Make sure we see count before checking tracing state */
smp_rmb();
if (on == !!tracing_is_on())
if (on == !!tracer_tracing_is_on(tr))
return;
if (on)
tracing_on();
tracer_tracing_on(tr);
else
tracing_off();
tracer_tracing_off(tr);
/* Make sure tracing state is visible before updating count */
smp_wmb();
@ -332,7 +333,7 @@ ftrace_traceon_count(unsigned long ip, unsigned long parent_ip,
struct trace_array *tr, struct ftrace_probe_ops *ops,
void *data)
{
update_traceon_count(ops, ip, 1, data);
update_traceon_count(ops, ip, tr, 1, data);
}
static void
@ -340,7 +341,7 @@ ftrace_traceoff_count(unsigned long ip, unsigned long parent_ip,
struct trace_array *tr, struct ftrace_probe_ops *ops,
void *data)
{
update_traceon_count(ops, ip, 0, data);
update_traceon_count(ops, ip, tr, 0, data);
}
static void
@ -348,10 +349,10 @@ ftrace_traceon(unsigned long ip, unsigned long parent_ip,
struct trace_array *tr, struct ftrace_probe_ops *ops,
void *data)
{
if (tracing_is_on())
if (tracer_tracing_is_on(tr))
return;
tracing_on();
tracer_tracing_on(tr);
}
static void
@ -359,10 +360,10 @@ ftrace_traceoff(unsigned long ip, unsigned long parent_ip,
struct trace_array *tr, struct ftrace_probe_ops *ops,
void *data)
{
if (!tracing_is_on())
if (!tracer_tracing_is_on(tr))
return;
tracing_off();
tracer_tracing_off(tr);
}
/*