diff options
| author | Alexei Starovoitov <ast@plumgrid.com> | 2015-03-25 15:49:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-04-02 07:25:49 -0400 |
| commit | 72cbbc8994242b5b43753738c01bf07bf29cb70d (patch) | |
| tree | 67e6fd9dccb5167a77386692b8903f6b53fa95cb | |
| parent | 4e537f7fbdce5e8ae7c33ebaa8a1956c7727d5a7 (diff) | |
tracing: Add kprobe flag
add TRACE_EVENT_FL_KPROBE flag to differentiate kprobe type of
tracepoints, since bpf programs can only be attached to kprobe
type of PERF_TYPE_TRACEPOINT perf events.
Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1427312966-8434-3-git-send-email-ast@plumgrid.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | include/linux/ftrace_event.h | 3 | ||||
| -rw-r--r-- | kernel/trace/trace_kprobe.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h index c674ee8f7fca..77325e1a1816 100644 --- a/include/linux/ftrace_event.h +++ b/include/linux/ftrace_event.h | |||
| @@ -252,6 +252,7 @@ enum { | |||
| 252 | TRACE_EVENT_FL_WAS_ENABLED_BIT, | 252 | TRACE_EVENT_FL_WAS_ENABLED_BIT, |
| 253 | TRACE_EVENT_FL_USE_CALL_FILTER_BIT, | 253 | TRACE_EVENT_FL_USE_CALL_FILTER_BIT, |
| 254 | TRACE_EVENT_FL_TRACEPOINT_BIT, | 254 | TRACE_EVENT_FL_TRACEPOINT_BIT, |
| 255 | TRACE_EVENT_FL_KPROBE_BIT, | ||
| 255 | }; | 256 | }; |
| 256 | 257 | ||
| 257 | /* | 258 | /* |
| @@ -265,6 +266,7 @@ enum { | |||
| 265 | * it is best to clear the buffers that used it). | 266 | * it is best to clear the buffers that used it). |
| 266 | * USE_CALL_FILTER - For ftrace internal events, don't use file filter | 267 | * USE_CALL_FILTER - For ftrace internal events, don't use file filter |
| 267 | * TRACEPOINT - Event is a tracepoint | 268 | * TRACEPOINT - Event is a tracepoint |
| 269 | * KPROBE - Event is a kprobe | ||
| 268 | */ | 270 | */ |
| 269 | enum { | 271 | enum { |
| 270 | TRACE_EVENT_FL_FILTERED = (1 << TRACE_EVENT_FL_FILTERED_BIT), | 272 | TRACE_EVENT_FL_FILTERED = (1 << TRACE_EVENT_FL_FILTERED_BIT), |
| @@ -274,6 +276,7 @@ enum { | |||
| 274 | TRACE_EVENT_FL_WAS_ENABLED = (1 << TRACE_EVENT_FL_WAS_ENABLED_BIT), | 276 | TRACE_EVENT_FL_WAS_ENABLED = (1 << TRACE_EVENT_FL_WAS_ENABLED_BIT), |
| 275 | TRACE_EVENT_FL_USE_CALL_FILTER = (1 << TRACE_EVENT_FL_USE_CALL_FILTER_BIT), | 277 | TRACE_EVENT_FL_USE_CALL_FILTER = (1 << TRACE_EVENT_FL_USE_CALL_FILTER_BIT), |
| 276 | TRACE_EVENT_FL_TRACEPOINT = (1 << TRACE_EVENT_FL_TRACEPOINT_BIT), | 278 | TRACE_EVENT_FL_TRACEPOINT = (1 << TRACE_EVENT_FL_TRACEPOINT_BIT), |
| 279 | TRACE_EVENT_FL_KPROBE = (1 << TRACE_EVENT_FL_KPROBE_BIT), | ||
| 277 | }; | 280 | }; |
| 278 | 281 | ||
| 279 | struct ftrace_event_call { | 282 | struct ftrace_event_call { |
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index d73f565b4e06..8fa549f6f528 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c | |||
| @@ -1286,7 +1286,7 @@ static int register_kprobe_event(struct trace_kprobe *tk) | |||
| 1286 | kfree(call->print_fmt); | 1286 | kfree(call->print_fmt); |
| 1287 | return -ENODEV; | 1287 | return -ENODEV; |
| 1288 | } | 1288 | } |
| 1289 | call->flags = 0; | 1289 | call->flags = TRACE_EVENT_FL_KPROBE; |
| 1290 | call->class->reg = kprobe_register; | 1290 | call->class->reg = kprobe_register; |
| 1291 | call->data = tk; | 1291 | call->data = tk; |
| 1292 | ret = trace_add_event_call(call); | 1292 | ret = trace_add_event_call(call); |
