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 09/11] tracing: Kprobe-tracer supports more than 6 arguments
Date: Thu, 16 Jul 2009 11:57:48 -0400 [thread overview]
Message-ID: <20090716155748.6266.60501.stgit@localhost.localdomain> (raw)
In-Reply-To: <20090716155652.6266.39970.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: 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 | 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 9ad907c..b29a54b 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)
@ADDR : Fetch memory at ADDR (ADDR should be in kernel)
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index ad33073..67c33e1 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. */
@@ -178,11 +178,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);
@@ -255,11 +259,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);
@@ -559,9 +563,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);
@@ -580,8 +585,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-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 ` Masami Hiramatsu [this message]
2009-07-16 15:57 ` [PATCH -tip -v12 10/11] tracing: Generate names for each kprobe event automatically Masami Hiramatsu
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=20090716155748.6266.60501.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).