From: tip-bot for Masami Hiramatsu <mhiramat@redhat.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, mingo@redhat.com, fweisbec@gmail.com,
dle-develop@lists.sourceforge.net, rostedt@goodmis.org,
oleg@redhat.com, tglx@linutronix.de, mhiramat@redhat.com,
systemtap@sources.redhat.com, hpa@zytor.com,
linux-kernel@vger.kernel.org, mahesh@linux.vnet.ibm.com,
roland@redhat.com, benh@kernel.crashing.org,
mikey@neuling.org, mingo@elte.hu
Subject: [tip:perf/core] tracing/kprobe: Drop function argument access syntax
Date: Wed, 13 Jan 2010 10:35:00 -0000 [thread overview]
Message-ID: <tip-14640106f243a3b29944d7198569090fa6546f2d@git.kernel.org> (raw)
In-Reply-To: <20100105224648.19431.52309.stgit@dhcp-100-2-132.bos.redhat.com>
Commit-ID: 14640106f243a3b29944d7198569090fa6546f2d
Gitweb: http://git.kernel.org/tip/14640106f243a3b29944d7198569090fa6546f2d
Author: Masami Hiramatsu <mhiramat@redhat.com>
AuthorDate: Tue, 5 Jan 2010 17:46:48 -0500
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 13 Jan 2010 10:09:12 +0100
tracing/kprobe: Drop function argument access syntax
Drop function argument access syntax, because the function
arguments depend on not only architecture but also
compile-options and function API. And now, we have perf-probe
for finding register/memory assigned to each argument.
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: systemtap <systemtap@sources.redhat.com>
Cc: DLE <dle-develop@lists.sourceforge.net>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Roland McGrath <roland@redhat.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Michael Neuling <mikey@neuling.org>
Cc: linuxppc-dev@ozlabs.org
LKML-Reference: <20100105224648.19431.52309.stgit@dhcp-100-2-132.bos.redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
Documentation/trace/kprobetrace.txt | 21 ++++++++++-----------
kernel/trace/trace_kprobe.c | 18 +-----------------
2 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/Documentation/trace/kprobetrace.txt b/Documentation/trace/kprobetrace.txt
index c3eff6f..f30978e 100644
--- a/Documentation/trace/kprobetrace.txt
+++ b/Documentation/trace/kprobetrace.txt
@@ -37,15 +37,12 @@ Synopsis of kprobe_events
@SYM[+|-offs] : Fetch memory at SYM +|- offs (SYM should be a data symbol)
$stackN : Fetch Nth entry of stack (N >= 0)
$stack : Fetch stack address.
- $argN : Fetch function argument. (N >= 0)(*)
- $retval : Fetch return value.(**)
- +|-offs(FETCHARG) : Fetch memory at FETCHARG +|- offs address.(***)
+ $retval : Fetch return value.(*)
+ +|-offs(FETCHARG) : Fetch memory at FETCHARG +|- offs address.(**)
NAME=FETCHARG: Set NAME as the argument name of FETCHARG.
- (*) aN may not correct on asmlinkaged functions and at the middle of
- function body.
- (**) only for return probe.
- (***) this is useful for fetching a field of data structures.
+ (*) only for return probe.
+ (**) this is useful for fetching a field of data structures.
Per-Probe Event Filtering
@@ -82,11 +79,14 @@ Usage examples
To add a probe as a new event, write a new definition to kprobe_events
as below.
- echo p:myprobe do_sys_open dfd=$arg0 filename=$arg1 flags=$arg2 mode=$arg3 > /sys/kernel/debug/tracing/kprobe_events
+ echo p:myprobe do_sys_open dfd=%ax filename=%dx flags=%cx mode=+4($stack) > /sys/kernel/debug/tracing/kprobe_events
This sets a kprobe on the top of do_sys_open() function with recording
-1st to 4th arguments as "myprobe" event. As this example shows, users can
-choose more familiar names for each arguments.
+1st to 4th arguments as "myprobe" event. Note, which register/stack entry is
+assigned to each function argument depends on arch-specific ABI. If you unsure
+the ABI, please try to use probe subcommand of perf-tools (you can find it
+under tools/perf/).
+As this example shows, users can choose more familiar names for each arguments.
echo r:myretprobe do_sys_open $retval >> /sys/kernel/debug/tracing/kprobe_events
@@ -147,4 +147,3 @@ events, you need to enable it.
returns from SYMBOL(e.g. "sys_open+0x1b/0x1d <- do_sys_open" means kernel
returns from do_sys_open to sys_open+0x1b).
-
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 47f54ab..7ac728d 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -91,11 +91,6 @@ static __kprobes unsigned long fetch_memory(struct pt_regs *regs, void *addr)
return retval;
}
-static __kprobes unsigned long fetch_argument(struct pt_regs *regs, void *num)
-{
- return regs_get_argument_nth(regs, (unsigned int)((unsigned long)num));
-}
-
static __kprobes unsigned long fetch_retvalue(struct pt_regs *regs,
void *dummy)
{
@@ -231,9 +226,7 @@ static int probe_arg_string(char *buf, size_t n, struct fetch_func *ff)
{
int ret = -EINVAL;
- if (ff->func == fetch_argument)
- ret = snprintf(buf, n, "$arg%lu", (unsigned long)ff->data);
- else if (ff->func == fetch_register) {
+ if (ff->func == fetch_register) {
const char *name;
name = regs_query_register_name((unsigned int)((long)ff->data));
ret = snprintf(buf, n, "%%%s", name);
@@ -489,14 +482,6 @@ static int parse_probe_vars(char *arg, struct fetch_func *ff, int is_return)
}
} else
ret = -EINVAL;
- } else if (strncmp(arg, "arg", 3) == 0 && isdigit(arg[3])) {
- ret = strict_strtoul(arg + 3, 10, ¶m);
- if (ret || param > PARAM_MAX_ARGS)
- ret = -EINVAL;
- else {
- ff->func = fetch_argument;
- ff->data = (void *)param;
- }
} else
ret = -EINVAL;
return ret;
@@ -611,7 +596,6 @@ static int create_trace_probe(int argc, char **argv)
* - Add kprobe: p[:[GRP/]EVENT] KSYM[+OFFS]|KADDR [FETCHARGS]
* - Add kretprobe: r[:[GRP/]EVENT] KSYM[+0] [FETCHARGS]
* Fetch args:
- * $argN : fetch Nth of function argument. (N:0-)
* $retval : fetch return value
* $stack : fetch stack address
* $stackN : fetch Nth of stack (N:0-)
next prev parent reply other threads:[~2010-01-13 10:35 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-05 22:40 [PATCH -tip 0/8] perf-probe updates Masami Hiramatsu
2010-01-05 22:40 ` [PATCH -tip 5/8] perf probe: Show probe list in pager Masami Hiramatsu
2010-01-13 10:35 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2010-01-05 22:40 ` [PATCH -tip 1/8] tracing/kprobe: Update example output in documentation Masami Hiramatsu
2010-01-06 18:40 ` Steven Rostedt
2010-01-13 10:35 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2010-01-05 22:40 ` [PATCH -tip 3/8] x86/ptrace: Remove unused regs_get_argument_nth API Masami Hiramatsu
2010-01-13 10:36 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2010-01-05 22:40 ` [PATCH -tip 2/8] tracing/kprobe: Drop function argument access syntax Masami Hiramatsu
2010-01-13 10:35 ` tip-bot for Masami Hiramatsu [this message]
2010-01-05 22:41 ` [PATCH -tip 4/8] [CLEANUP] perf probe: Remove newline from die() Masami Hiramatsu
2010-01-13 10:36 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2010-01-05 22:41 ` [PATCH -tip 7/8] perf tools: Enhance glob string matching Masami Hiramatsu
2010-01-13 10:36 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2010-01-05 22:41 ` [PATCH -tip 8/8] perf probe: Support --line option to show probable source-code lines Masami Hiramatsu
2010-01-06 14:31 ` Masami Hiramatsu
2010-01-06 14:39 ` [PATCH -tip] " Masami Hiramatsu
2010-01-13 10:37 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2010-01-05 23:23 ` [PATCH -tip 6/8] perf tools: Support tracepoint glob matching Masami Hiramatsu
2010-01-13 10:36 ` [tip:perf/core] " tip-bot for 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=tip-14640106f243a3b29944d7198569090fa6546f2d@git.kernel.org \
--to=mhiramat@redhat.com \
--cc=acme@redhat.com \
--cc=benh@kernel.crashing.org \
--cc=dle-develop@lists.sourceforge.net \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mahesh@linux.vnet.ibm.com \
--cc=mikey@neuling.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=oleg@redhat.com \
--cc=roland@redhat.com \
--cc=rostedt@goodmis.org \
--cc=systemtap@sources.redhat.com \
--cc=tglx@linutronix.de \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).