From: Masami Hiramatsu <mhiramat@redhat.com>
To: Ingo Molnar <mingo@elte.hu>, Steven Rostedt <rostedt@goodmis.org>,
lkml <linux-kernel@vger.kernel.org>
Cc: systemtap <systemtap@sources.redhat.com>,
kvm <kvm@vger.kernel.org>,
DLE <dle-develop@lists.sourceforge.net>,
Masami Hiramatsu <mhiramat@redhat.com>,
Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
Christoph Hellwig <hch@infradead.org>,
Steven Rostedt <rostedt@goodmis.org>, Ingo Molnar <mingo@elte.hu>,
Frederic Weisbecker <fweisbec@gmail.com>,
Tom Zanussi <tzanussi@gmail.com>
Subject: [PATCH -tip -v12 10/11] tracing: Generate names for each kprobe event automatically
Date: Thu, 16 Jul 2009 11:57:53 -0400 [thread overview]
Message-ID: <20090716155753.6266.19656.stgit@localhost.localdomain> (raw)
In-Reply-To: <20090716155652.6266.39970.stgit@localhost.localdomain>
Generate names for each kprobe event based on the probe point,
and remove generic k*probe event types because there is no user
of those types.
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
---
Documentation/trace/kprobetrace.txt | 3 +-
kernel/trace/trace_event_types.h | 18 ----------
kernel/trace/trace_kprobe.c | 64 ++++++++++++++++++-----------------
3 files changed, 35 insertions(+), 50 deletions(-)
diff --git a/Documentation/trace/kprobetrace.txt b/Documentation/trace/kprobetrace.txt
index b29a54b..437ad49 100644
--- a/Documentation/trace/kprobetrace.txt
+++ b/Documentation/trace/kprobetrace.txt
@@ -28,7 +28,8 @@ Synopsis of kprobe_events
p[:EVENT] SYMBOL[+offs|-offs]|MEMADDR [FETCHARGS] : Set a probe
r[:EVENT] SYMBOL[+0] [FETCHARGS] : Set a return probe
- EVENT : Event name.
+ EVENT : Event name. If omitted, the event name is generated
+ based on SYMBOL+offs or MEMADDR.
SYMBOL[+offs|-offs] : Symbol+offset where the probe is inserted.
MEMADDR : Address where the probe is inserted.
diff --git a/kernel/trace/trace_event_types.h b/kernel/trace/trace_event_types.h
index 186b598..e74f090 100644
--- a/kernel/trace/trace_event_types.h
+++ b/kernel/trace/trace_event_types.h
@@ -175,22 +175,4 @@ TRACE_EVENT_FORMAT(kmem_free, TRACE_KMEM_FREE, kmemtrace_free_entry, ignore,
TP_RAW_FMT("type:%u call_site:%lx ptr:%p")
);
-TRACE_EVENT_FORMAT(kprobe, TRACE_KPROBE, kprobe_trace_entry, ignore,
- TRACE_STRUCT(
- TRACE_FIELD(unsigned long, ip, ip)
- TRACE_FIELD(int, nargs, nargs)
- TRACE_FIELD_ZERO(unsigned long, args)
- ),
- TP_RAW_FMT("%08lx: args:0x%lx ...")
-);
-
-TRACE_EVENT_FORMAT(kretprobe, TRACE_KRETPROBE, kretprobe_trace_entry, ignore,
- TRACE_STRUCT(
- TRACE_FIELD(unsigned long, func, func)
- TRACE_FIELD(unsigned long, ret_ip, ret_ip)
- TRACE_FIELD(int, nargs, nargs)
- TRACE_FIELD_ZERO(unsigned long, args)
- ),
- TP_RAW_FMT("%08lx <- %08lx: args:0x%lx ...")
-);
#undef TRACE_SYSTEM
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 67c33e1..3444d1d 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -34,6 +34,7 @@
#define MAX_TRACE_ARGS 128
#define MAX_ARGSTR_LEN 63
+#define MAX_EVENT_NAME_LEN 64
/* currently, trace_kprobe only supports X86. */
@@ -272,11 +273,11 @@ static struct trace_probe *alloc_trace_probe(const char *symbol,
if (!tp->symbol)
goto error;
}
- if (event) {
- tp->call.name = kstrdup(event, GFP_KERNEL);
- if (!tp->call.name)
- goto error;
- }
+ if (!event)
+ goto error;
+ tp->call.name = kstrdup(event, GFP_KERNEL);
+ if (!tp->call.name)
+ goto error;
INIT_LIST_HEAD(&tp->list);
return tp;
@@ -306,7 +307,7 @@ static struct trace_probe *find_probe_event(const char *event)
struct trace_probe *tp;
list_for_each_entry(tp, &probe_list, list)
- if (tp->call.name && !strcmp(tp->call.name, event))
+ if (!strcmp(tp->call.name, event))
return tp;
return NULL;
}
@@ -322,8 +323,7 @@ static void __unregister_trace_probe(struct trace_probe *tp)
/* Unregister a trace_probe and probe_event: call with locking probe_lock */
static void unregister_trace_probe(struct trace_probe *tp)
{
- if (tp->call.name)
- unregister_probe_event(tp);
+ unregister_probe_event(tp);
__unregister_trace_probe(tp);
list_del(&tp->list);
}
@@ -352,18 +352,16 @@ static int register_trace_probe(struct trace_probe *tp)
goto end;
}
/* register as an event */
- if (tp->call.name) {
- old_tp = find_probe_event(tp->call.name);
- if (old_tp) {
- /* delete old event */
- unregister_trace_probe(old_tp);
- free_trace_probe(old_tp);
- }
- ret = register_probe_event(tp);
- if (ret) {
- pr_warning("Faild to register probe event(%d)\n", ret);
- __unregister_trace_probe(tp);
- }
+ old_tp = find_probe_event(tp->call.name);
+ if (old_tp) {
+ /* delete old event */
+ unregister_trace_probe(old_tp);
+ free_trace_probe(old_tp);
+ }
+ ret = register_probe_event(tp);
+ if (ret) {
+ pr_warning("Faild to register probe event(%d)\n", ret);
+ __unregister_trace_probe(tp);
}
list_add_tail(&tp->list, &probe_list);
end:
@@ -566,7 +564,18 @@ static int create_trace_probe(int argc, char **argv)
argc -= 2; argv += 2;
/* setup a probe */
- tp = alloc_trace_probe(symbol, event, argc);
+ if (!event) {
+ /* Make a new event name */
+ char buf[MAX_EVENT_NAME_LEN];
+ if (symbol)
+ snprintf(buf, MAX_EVENT_NAME_LEN, "%c@%s%+ld",
+ is_return ? 'r' : 'p', symbol, offset);
+ else
+ snprintf(buf, MAX_EVENT_NAME_LEN, "%c@0x%p",
+ is_return ? 'r' : 'p', addr);
+ tp = alloc_trace_probe(symbol, buf, argc);
+ } else
+ tp = alloc_trace_probe(symbol, event, argc);
if (IS_ERR(tp))
return PTR_ERR(tp);
@@ -647,8 +656,7 @@ static int probes_seq_show(struct seq_file *m, void *v)
char buf[MAX_ARGSTR_LEN + 1];
seq_printf(m, "%c", probe_is_return(tp) ? 'r' : 'p');
- if (tp->call.name)
- seq_printf(m, ":%s", tp->call.name);
+ seq_printf(m, ":%s", tp->call.name);
if (tp->symbol)
seq_printf(m, " %s%+ld", probe_symbol(tp), probe_offset(tp));
@@ -766,10 +774,7 @@ static __kprobes int kprobe_trace_func(struct kprobe *kp, struct pt_regs *regs)
struct ring_buffer_event *event;
int size, i, pc;
unsigned long irq_flags;
- struct ftrace_event_call *call = &event_kprobe;
-
- if (&tp->call.name)
- call = &tp->call;
+ struct ftrace_event_call *call = &tp->call;
local_save_flags(irq_flags);
pc = preempt_count();
@@ -801,10 +806,7 @@ static __kprobes int kretprobe_trace_func(struct kretprobe_instance *ri,
struct ring_buffer_event *event;
int size, i, pc;
unsigned long irq_flags;
- struct ftrace_event_call *call = &event_kretprobe;
-
- if (&tp->call.name)
- call = &tp->call;
+ struct ftrace_event_call *call = &tp->call;
local_save_flags(irq_flags);
pc = preempt_count();
--
Masami Hiramatsu
Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division
e-mail: mhiramat@redhat.com
next prev parent reply other threads:[~2009-07-16 15:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-16 15:56 [PATCH -tip -v12 00/11] tracing: kprobe-based event tracer and x86 instruction decoder Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 01/11] x86: instruction decoder API Masami Hiramatsu
2009-07-16 16:19 ` H. Peter Anvin
2009-07-16 16:52 ` Masami Hiramatsu
2009-07-16 16:37 ` Sam Ravnborg
2009-07-16 17:28 ` Masami Hiramatsu
2009-07-16 20:00 ` Sam Ravnborg
2009-07-16 20:48 ` Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 02/11] x86: x86 instruction decoder build-time selftest Masami Hiramatsu
2009-07-16 16:29 ` Sam Ravnborg
2009-07-16 17:37 ` Masami Hiramatsu
2009-07-16 19:40 ` Masami Hiramatsu
2009-07-16 19:55 ` Sam Ravnborg
2009-07-16 20:16 ` Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 03/11] kprobes: checks probe address is instruction boudary on x86 Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 04/11] kprobes: cleanup fix_riprel() using insn decoder " Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 05/11] x86: add pt_regs register and stack access APIs Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 06/11] tracing: ftrace dynamic ftrace_event_call support Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 07/11] tracing: Introduce TRACE_FIELD_ZERO() macro Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 08/11] tracing: add kprobe-based event tracer Masami Hiramatsu
2009-07-16 15:57 ` [PATCH -tip -v12 09/11] tracing: Kprobe-tracer supports more than 6 arguments Masami Hiramatsu
2009-07-16 15:57 ` Masami Hiramatsu [this message]
2009-07-16 15:57 ` [PATCH -tip -v12 11/11] tracing: Add kprobes event profiling interface Masami Hiramatsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090716155753.6266.19656.stgit@localhost.localdomain \
--to=mhiramat@redhat.com \
--cc=ananth@in.ibm.com \
--cc=dle-develop@lists.sourceforge.net \
--cc=fweisbec@gmail.com \
--cc=hch@infradead.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
--cc=systemtap@sources.redhat.com \
--cc=tzanussi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).