Skip to content

Commit 5a0d905

Browse files
Masami Hiramatsufweisbec
authored andcommitted
tracing/kprobes: Disable kprobe events by default after creation
Disable newly created kprobe events by default, not to disturb another user using ftrace. "Disturb" means when someone is using ftrace and another user tries to use perf-tools, (in near future) if he defines new kprobe event via perf-tools, then new events will mess up the frace buffer. Fix this to allow proper and transparent kprobes events concurrent usage between ftrace users and perf users. Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com> Acked-by: Steven Rostedt <rostedt@goodmis.org> Cc: Jim Keniston <jkenisto@us.ibm.com> Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Christoph Hellwig <hch@infradead.org> Cc: Frank Ch. Eigler <fche@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Jason Baron <jbaron@redhat.com> Cc: K.Prasad <prasad@linux.vnet.ibm.com> Cc: Lai Jiangshan <laijs@cn.fujitsu.com> Cc: Li Zefan <lizf@cn.fujitsu.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Cc: Tom Zanussi <tzanussi@gmail.com> LKML-Reference: <20090914204937.18779.59422.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
1 parent 74ebb63 commit 5a0d905

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

Documentation/trace/kprobetrace.txt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,15 @@ print fmt: "(%lx) dfd=%lx filename=%lx flags=%lx mode=%lx", REC->ip, REC->dfd, R
122122

123123
echo > /sys/kernel/debug/tracing/kprobe_events
124124

125-
This clears all probe points. and you can see the traced information via
126-
/sys/kernel/debug/tracing/trace.
125+
This clears all probe points.
126+
127+
Right after definition, each event is disabled by default. For tracing these
128+
events, you need to enable it.
129+
130+
echo 1 > /sys/kernel/debug/tracing/events/kprobes/myprobe/enable
131+
echo 1 > /sys/kernel/debug/tracing/events/kprobes/myretprobe/enable
132+
133+
And you can see the traced information via /sys/kernel/debug/tracing/trace.
127134

128135
cat /sys/kernel/debug/tracing/trace
129136
# tracer: nop

kernel/trace/trace_kprobe.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ static int register_trace_probe(struct trace_probe *tp)
383383
goto end;
384384
}
385385

386-
tp->flags = TP_FLAG_TRACE;
386+
tp->rp.kp.flags |= KPROBE_FLAG_DISABLED;
387387
if (probe_is_return(tp))
388388
ret = register_kretprobe(&tp->rp);
389389
else
@@ -1298,7 +1298,7 @@ static int register_probe_event(struct trace_probe *tp)
12981298
call->id = register_ftrace_event(&tp->event);
12991299
if (!call->id)
13001300
return -ENODEV;
1301-
call->enabled = 1;
1301+
call->enabled = 0;
13021302
call->regfunc = probe_event_enable;
13031303
call->unregfunc = probe_event_disable;
13041304

0 commit comments

Comments
 (0)