2009-11-25 08:33:15

by Lai Jiangshan

Subject: [PATCH 2/3] trace_kprobes: always show group name

Sometimes the group name is not "kprobes",
It'll be better if we can read it from tracing/kprobe_events.

# echo 'r:laijs/vfs_read vfs_read %ax' > kprobe_events
# cat kprobe_events
r:laijs/vfs_read vfs_read %ax=%ax

Signed-off-by: Lai Jiangshan <[email protected]>
---
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 79ce6a2..9e42f2a 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -758,7 +758,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');
- seq_printf(m, ":%s", tp->call.name);
+ seq_printf(m, ":%s/%s", tp->call.system, tp->call.name);

if (tp->symbol)
seq_printf(m, " %s+%u", probe_symbol(tp), tp->rp.kp.offset);

2009-11-25 12:41:21

by Masami Hiramatsu

Subject: Re: [PATCH 2/3] trace_kprobes: always show group name

Lai Jiangshan wrote:
>
> Sometimes the group name is not "kprobes",
> It'll be better if we can read it from tracing/kprobe_events.
>
> # echo 'r:laijs/vfs_read vfs_read %ax' > kprobe_events
> # cat kprobe_events
> r:laijs/vfs_read vfs_read %ax=%ax


Yep, that looks very nice :-)

Acked-by: Masami Hiramatsu <[email protected]>

>
> Signed-off-by: Lai Jiangshan <[email protected]>
> ---
> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
> index 79ce6a2..9e42f2a 100644
> --- a/kernel/trace/trace_kprobe.c
> +++ b/kernel/trace/trace_kprobe.c
> @@ -758,7 +758,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');
> - seq_printf(m, ":%s", tp->call.name);
> + seq_printf(m, ":%s/%s", tp->call.system, tp->call.name);
>
> if (tp->symbol)
> seq_printf(m, " %s+%u", probe_symbol(tp), tp->rp.kp.offset);
>
>

--
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division

e-mail: [email protected]

2009-11-27 05:50:50

by Lai Jiangshan

Subject: [tip:perf/core] trace_kprobes: Always show group name

Commit-ID: 3d9b2e1ddf42dd3df38af7794fa5e39cce760f3b
Gitweb: http://git.kernel.org/tip/3d9b2e1ddf42dd3df38af7794fa5e39cce760f3b
Author: Lai Jiangshan <[email protected]>
AuthorDate: Wed, 25 Nov 2009 16:32:47 +0800
Committer: Ingo Molnar <[email protected]>
CommitDate: Fri, 27 Nov 2009 06:43:04 +0100

trace_kprobes: Always show group name

Sometimes the group name is not "kprobes",
It'll be better if we can read it from tracing/kprobe_events.

# echo 'r:laijs/vfs_read vfs_read %ax' > kprobe_events
# cat kprobe_events
r:laijs/vfs_read vfs_read %ax=%ax

Signed-off-by: Lai Jiangshan <[email protected]>
Acked-by: Masami Hiramatsu <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
kernel/trace/trace_kprobe.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 82e8583..96e1944 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -760,7 +760,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');
- seq_printf(m, ":%s", tp->call.name);
+ seq_printf(m, ":%s/%s", tp->call.system, tp->call.name);

if (tp->symbol)
seq_printf(m, " %s+%u", probe_symbol(tp), tp->rp.kp.offset);