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>,
"Avi Kivity" <avi@redhat.com>, "Andi Kleen" <ak@linux.intel.com>,
"Christoph Hellwig" <hch@infradead.org>,
"Frank Ch. Eigler" <fche@redhat.com>,
"Frederic Weisbecker" <fweisbec@gmail.com>,
"H. Peter Anvin" <hpa@zytor.com>, "Ingo Molnar" <mingo@elte.hu>,
"Jason Baron" <jbaron@redhat.com>,
"Jim Keniston" <jkenisto@us.ibm.com>,
"K.Prasad" <prasad@linux.vnet.ibm.com>,
"Lai Jiangshan" <laijs@cn.fujitsu.com>,
"Li Zefan" <lizf@cn.fujitsu.com>,
PrzemysławPawełczyk <przemyslaw@pawelczyk.it>,
"Roland McGrath" <roland@redhat.com>,
"Sam Ravnborg" <sam@ravnborg.org>,
"Srikar Dronamraju" <srikar@linux.vnet.ibm.com>,
"Steven Rostedt" <rostedt@goodmis.org>,
"Tom Zanussi" <tzanussi@gmail.com>,
"Vegard Nossum" <vegard.nossum@gmail.com>
Subject: [PATCH -tip v14 09/12] tracing: Kprobe-tracer supports more than 6 arguments
Date: Thu, 13 Aug 2009 20:32:00 -0000 [thread overview]
Message-ID: <20090813203518.31965.96979.stgit@localhost.localdomain> (raw)
In-Reply-To: <20090813203403.31965.20973.stgit@localhost.localdomain>
Support up to 128 arguments for each kprobes event.
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Avi Kivity <avi@redhat.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: Jim Keniston <jkenisto@us.ibm.com>
Cc: K.Prasad <prasad@linux.vnet.ibm.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: PrzemysÅaw PaweÅczyk <przemyslaw@pawelczyk.it>
Cc: Roland McGrath <roland@redhat.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Tom Zanussi <tzanussi@gmail.com>
Cc: Vegard Nossum <vegard.nossum@gmail.com>
---
Documentation/trace/kprobetrace.txt | 2 +-
kernel/trace/trace_kprobe.c | 21 +++++++++++++--------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/Documentation/trace/kprobetrace.txt b/Documentation/trace/kprobetrace.txt
index efff6eb..c9c09b4 100644
--- a/Documentation/trace/kprobetrace.txt
+++ b/Documentation/trace/kprobetrace.txt
@@ -32,7 +32,7 @@ Synopsis of kprobe_events
SYMBOL[+offs|-offs] : Symbol+offset where the probe is inserted.
MEMADDR : Address where the probe is inserted.
- FETCHARGS : Arguments.
+ FETCHARGS : Arguments. Each probe can have up to 128 args.
%REG : Fetch register REG
sN : Fetch Nth entry of stack (N >= 0)
sa : Fetch stack address.
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index d92877a..4704e40 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -32,7 +32,7 @@
#include "trace.h"
#include "trace_output.h"
-#define TRACE_KPROBE_ARGS 6
+#define MAX_TRACE_ARGS 128
#define MAX_ARGSTR_LEN 63
/* currently, trace_kprobe only supports X86. */
@@ -184,11 +184,15 @@ struct trace_probe {
struct kretprobe rp;
};
const char *symbol; /* symbol name */
- unsigned int nr_args;
- struct fetch_func args[TRACE_KPROBE_ARGS];
struct ftrace_event_call call;
+ unsigned int nr_args;
+ struct fetch_func args[];
};
+#define SIZEOF_TRACE_PROBE(n) \
+ (offsetof(struct trace_probe, args) + \
+ (sizeof(struct fetch_func) * (n)))
+
static int kprobe_trace_func(struct kprobe *kp, struct pt_regs *regs);
static int kretprobe_trace_func(struct kretprobe_instance *ri,
struct pt_regs *regs);
@@ -263,11 +267,11 @@ static DEFINE_MUTEX(probe_lock);
static LIST_HEAD(probe_list);
static struct trace_probe *alloc_trace_probe(const char *symbol,
- const char *event)
+ const char *event, int nargs)
{
struct trace_probe *tp;
- tp = kzalloc(sizeof(struct trace_probe), GFP_KERNEL);
+ tp = kzalloc(SIZEOF_TRACE_PROBE(nargs), GFP_KERNEL);
if (!tp)
return ERR_PTR(-ENOMEM);
@@ -573,9 +577,10 @@ static int create_trace_probe(int argc, char **argv)
if (offset && is_return)
return -EINVAL;
}
+ argc -= 2; argv += 2;
/* setup a probe */
- tp = alloc_trace_probe(symbol, event);
+ tp = alloc_trace_probe(symbol, event, argc);
if (IS_ERR(tp))
return PTR_ERR(tp);
@@ -594,8 +599,8 @@ static int create_trace_probe(int argc, char **argv)
kp->addr = addr;
/* parse arguments */
- argc -= 2; argv += 2; ret = 0;
- for (i = 0; i < argc && i < TRACE_KPROBE_ARGS; i++) {
+ ret = 0;
+ for (i = 0; i < argc && i < MAX_TRACE_ARGS; i++) {
if (strlen(argv[i]) > MAX_ARGSTR_LEN) {
pr_info("Argument%d(%s) is too long.\n", i, argv[i]);
ret = -ENOSPC;
--
Masami Hiramatsu
Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division
e-mail: mhiramat@redhat.com
next prev parent reply other threads:[~2009-08-13 20:32 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-13 20:31 [PATCH -tip v14 00/12] tracing: kprobe-based event tracer and x86 instruction decoder Masami Hiramatsu
2009-08-13 20:31 ` [PATCH -tip v14 02/12] x86: x86 instruction decoder build-time selftest Masami Hiramatsu
2009-08-13 20:31 ` [PATCH -tip v14 04/12] kprobes: cleanup fix_riprel() using insn decoder on x86 Masami Hiramatsu
2009-08-13 20:31 ` [PATCH -tip v14 05/12] x86: add pt_regs register and stack access APIs Masami Hiramatsu
2009-08-13 20:31 ` [PATCH -tip v14 01/12] x86: instruction decoder API Masami Hiramatsu
[not found] ` <20090819234227.GJ4972@nowhere>
2009-08-20 14:38 ` Masami Hiramatsu
[not found] ` <20090820002113.GK4972@nowhere>
2009-08-20 15:00 ` Masami Hiramatsu
[not found] ` <20090820152549.GD6389@nowhere>
2009-08-20 16:12 ` Masami Hiramatsu
[not found] ` <20090820180737.GA6229@nowhere>
2009-08-20 18:58 ` Masami Hiramatsu
2009-08-13 20:31 ` [PATCH -tip v14 03/12] kprobes: checks probe address is instruction boudary on x86 Masami Hiramatsu
[not found] ` <20090818230340.GF5231@nowhere>
2009-08-18 23:16 ` Masami Hiramatsu
[not found] ` <20090818234341.GG5231@nowhere>
2009-08-19 0:18 ` Masami Hiramatsu
2009-08-13 20:32 ` Masami Hiramatsu [this message]
2009-08-13 20:32 ` [PATCH -tip v14 10/12] tracing: Generate names for each kprobe event automatically Masami Hiramatsu
2009-08-13 20:32 ` [PATCH -tip v14 08/12] tracing: add kprobe-based event tracer Masami Hiramatsu
2009-08-13 20:33 ` [PATCH -tip v14 11/12] tracing: Kprobe tracer assigns new event ids for each event Masami Hiramatsu
2009-08-13 20:33 ` [PATCH -tip v14 12/12] tracing: Add kprobes event profiling interface Masami Hiramatsu
2009-08-13 20:47 ` [PATCH -tip v14 07/12] tracing: Introduce TRACE_FIELD_ZERO() macro Masami Hiramatsu
[not found] ` <20090819010903.GI5231@nowhere>
2009-08-19 2:18 ` Masami Hiramatsu
2009-08-13 20:47 ` [PATCH -tip v14 06/12] tracing: ftrace dynamic ftrace_event_call support Masami Hiramatsu
2009-08-13 20:54 ` [TOOL] kprobestest : Kprobe stress test tool Masami Hiramatsu
[not found] ` <20090820184331.GA6078@nowhere>
2009-08-20 19:42 ` Masami Hiramatsu
[not found] ` <20090821000108.GC6078@nowhere>
2009-08-21 0:56 ` Masami Hiramatsu
2009-08-21 19:40 ` [PATCH tracing/kprobes 2/4] x86: Check awk features before generating inat-tables.c Masami Hiramatsu
2009-08-21 19:40 ` [PATCH tracing/kprobes 1/4] x86: Fix x86 instruction decoder selftest to check only .text Masami Hiramatsu
2009-08-21 19:40 ` [PATCH tracing/kprobes 3/4] tracing/kprobes: Fix format typo in trace_kprobes Masami Hiramatsu
2009-08-21 19:41 ` [PATCH tracing/kprobes 4/4] tracing/kprobes: Change trace_arg to probe_arg Masami Hiramatsu
2009-08-13 20:56 ` [TOOL] c2kpe: C expression to kprobe event format converter Masami Hiramatsu
[not found] ` <20090830195041.GA6189@nowhere>
2009-08-31 4:12 ` 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=20090813203518.31965.96979.stgit@localhost.localdomain \
--to=mhiramat@redhat.com \
--cc=ak@linux.intel.com \
--cc=ananth@in.ibm.com \
--cc=avi@redhat.com \
--cc=dle-develop@lists.sourceforge.net \
--cc=fche@redhat.com \
--cc=fweisbec@gmail.com \
--cc=hch@infradead.org \
--cc=hpa@zytor.com \
--cc=jbaron@redhat.com \
--cc=jkenisto@us.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=laijs@cn.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--cc=mingo@elte.hu \
--cc=prasad@linux.vnet.ibm.com \
--cc=przemyslaw@pawelczyk.it \
--cc=roland@redhat.com \
--cc=rostedt@goodmis.org \
--cc=sam@ravnborg.org \
--cc=srikar@linux.vnet.ibm.com \
--cc=systemtap@sources.redhat.com \
--cc=tzanussi@gmail.com \
--cc=vegard.nossum@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 read-only IMAP folder(s) and NNTP newsgroup(s).