summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_events.c
diff options
context:
space:
mode:
authorSteven Rostedt (VMware) <rostedt@goodmis.org>2017-04-11 04:30:05 +0200
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2017-04-21 04:06:45 +0200
commitb5f081b563a6cdcb85a543df8c851951a8978275 (patch)
treeb9ab66a67e30d9f63fef8cb33da1d0e8893b1b15 /kernel/trace/trace_events.c
parenttracing: Have the trace_array hold the list of registered func probes (diff)
downloadlinux-b5f081b563a6cdcb85a543df8c851951a8978275.tar.xz
linux-b5f081b563a6cdcb85a543df8c851951a8978275.zip
tracing: Pass the trace_array into ftrace_probe_ops functions
Pass the trace_array associated to a ftrace_probe_ops into the probe_ops func(), init() and free() functions. The trace_array is the descriptor that describes a tracing instance. This will help create the infrastructure that will allow having function probes unique to tracing instances. Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace_events.c')
-rw-r--r--kernel/trace/trace_events.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index f0d6e5aef53e..713bec614312 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -2470,7 +2470,8 @@ static void update_event_probe(struct event_probe_data *data)
static void
event_enable_probe(unsigned long ip, unsigned long parent_ip,
- struct ftrace_probe_ops *ops, void **_data)
+ struct trace_array *tr, struct ftrace_probe_ops *ops,
+ void **_data)
{
struct ftrace_func_mapper *mapper = ops->private_data;
struct event_probe_data *data;
@@ -2486,7 +2487,8 @@ event_enable_probe(unsigned long ip, unsigned long parent_ip,
static void
event_enable_count_probe(unsigned long ip, unsigned long parent_ip,
- struct ftrace_probe_ops *ops, void **_data)
+ struct trace_array *tr, struct ftrace_probe_ops *ops,
+ void **_data)
{
struct ftrace_func_mapper *mapper = ops->private_data;
struct event_probe_data *data;
@@ -2513,7 +2515,7 @@ event_enable_count_probe(unsigned long ip, unsigned long parent_ip,
static int
event_enable_print(struct seq_file *m, unsigned long ip,
- struct ftrace_probe_ops *ops, void *_data)
+ struct ftrace_probe_ops *ops, void *_data)
{
struct ftrace_func_mapper *mapper = ops->private_data;
struct event_probe_data *data;
@@ -2542,8 +2544,8 @@ event_enable_print(struct seq_file *m, unsigned long ip,
}
static int
-event_enable_init(struct ftrace_probe_ops *ops, unsigned long ip,
- void *_data)
+event_enable_init(struct ftrace_probe_ops *ops, struct trace_array *tr,
+ unsigned long ip, void *_data)
{
struct ftrace_func_mapper *mapper = ops->private_data;
struct event_probe_data *data = _data;
@@ -2559,8 +2561,8 @@ event_enable_init(struct ftrace_probe_ops *ops, unsigned long ip,
}
static void
-event_enable_free(struct ftrace_probe_ops *ops, unsigned long ip,
- void **_data)
+event_enable_free(struct ftrace_probe_ops *ops, struct trace_array *tr,
+ unsigned long ip, void **_data)
{
struct ftrace_func_mapper *mapper = ops->private_data;
struct event_probe_data *data;