aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorMasami Hiramatsu <mhiramat@redhat.com>2009-11-03 19:12:47 -0500
committerIngo Molnar <mingo@elte.hu>2009-11-04 07:02:48 -0500
commit77b44d1b7c28360910cdbd427fb62d485c08674c (patch)
tree00db4f966b488abb88e5f3884ab2635e06f3f1d6 /kernel/trace
parent91365bbe4f8c39a821f390f785d606304d6dee3c (diff)
tracing/kprobes: Rename Kprobe-tracer to kprobe-event
Rename Kprobes-based event tracer to kprobes-based tracing event (kprobe-event), since it is not a tracer but an extensible tracing event interface. This also changes CONFIG_KPROBE_TRACER to CONFIG_KPROBE_EVENT and sets it y by default. Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com> Acked-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Jim Keniston <jkenisto@us.ibm.com> Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Cc: Christoph Hellwig <hch@infradead.org> Cc: Frank Ch. Eigler <fche@redhat.com> Cc: Jason Baron <jbaron@redhat.com> Cc: K.Prasad <prasad@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com> LKML-Reference: <20091104001247.3454.14131.stgit@harusame> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/Kconfig19
-rw-r--r--kernel/trace/Makefile2
-rw-r--r--kernel/trace/trace_kprobe.c6
3 files changed, 15 insertions, 12 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 15372a9f2399..f05671609a89 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -428,17 +428,22 @@ config BLK_DEV_IO_TRACE
428 428
429 If unsure, say N. 429 If unsure, say N.
430 430
431config KPROBE_TRACER 431config KPROBE_EVENT
432 depends on KPROBES 432 depends on KPROBES
433 depends on X86 433 depends on X86
434 bool "Trace kprobes" 434 bool "Enable kprobes-based dynamic events"
435 select TRACING 435 select TRACING
436 select GENERIC_TRACER 436 default y
437 help 437 help
438 This tracer probes everywhere where kprobes can probe it, and 438 This allows the user to add tracing events (similar to tracepoints) on the fly
439 records various registers and memories specified by user. 439 via the ftrace interface. See Documentation/trace/kprobetrace.txt
440 This also allows you to trace kprobe probe points as a dynamic 440 for more details.
441 defined events. It provides per-probe event filtering interface. 441
442 Those events can be inserted wherever kprobes can probe, and record
443 various register and memory values.
444
445 This option is also required by perf-probe subcommand of perf tools. If
446 you want to use perf tools, this option is strongly recommended.
442 447
443config DYNAMIC_FTRACE 448config DYNAMIC_FTRACE
444 bool "enable/disable ftrace tracepoints dynamically" 449 bool "enable/disable ftrace tracepoints dynamically"
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
index c8cb75d7f280..edc3a3cca1a1 100644
--- a/kernel/trace/Makefile
+++ b/kernel/trace/Makefile
@@ -53,7 +53,7 @@ obj-$(CONFIG_EVENT_TRACING) += trace_export.o
53obj-$(CONFIG_FTRACE_SYSCALLS) += trace_syscalls.o 53obj-$(CONFIG_FTRACE_SYSCALLS) += trace_syscalls.o
54obj-$(CONFIG_EVENT_PROFILE) += trace_event_profile.o 54obj-$(CONFIG_EVENT_PROFILE) += trace_event_profile.o
55obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o 55obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
56obj-$(CONFIG_KPROBE_TRACER) += trace_kprobe.o 56obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
57obj-$(CONFIG_EVENT_TRACING) += power-traces.o 57obj-$(CONFIG_EVENT_TRACING) += power-traces.o
58 58
59libftrace-y := ftrace.o 59libftrace-y := ftrace.o
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index a86c3ac0df21..cf17a6694f32 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * kprobe based kernel tracer 2 * Kprobes-based tracing events
3 * 3 *
4 * Created by Masami Hiramatsu <mhiramat@redhat.com> 4 * Created by Masami Hiramatsu <mhiramat@redhat.com>
5 * 5 *
@@ -57,8 +57,6 @@ const char *reserved_field_names[] = {
57 FIELD_STRING_FUNC, 57 FIELD_STRING_FUNC,
58}; 58};
59 59
60/* currently, trace_kprobe only supports X86. */
61
62struct fetch_func { 60struct fetch_func {
63 unsigned long (*func)(struct pt_regs *, void *); 61 unsigned long (*func)(struct pt_regs *, void *);
64 void *data; 62 void *data;
@@ -191,7 +189,7 @@ static __kprobes void free_indirect_fetch_data(struct indirect_fetch_data *data)
191} 189}
192 190
193/** 191/**
194 * Kprobe tracer core functions 192 * Kprobe event core functions
195 */ 193 */
196 194
197struct probe_arg { 195struct probe_arg {