From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@elte.hu>,
Andrew Morton <akpm@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Li Zefan <lizf@cn.fujitsu.com>,
Lai Jiangshan <laijs@cn.fujitsu.com>
Subject: [PATCH 06/10] tracing/syscalls: Init print_fmt for syscall events
Date: Tue, 29 Dec 2009 11:22:37 -0500 [thread overview]
Message-ID: <20091229162638.342663108@goodmis.org> (raw)
In-Reply-To: <20091229162231.441352392@goodmis.org>
[-- Attachment #1: 0006-tracing-syscalls-Init-print_fmt-for-syscall-events.patch --]
[-- Type: text/plain, Size: 2823 bytes --]
From: Lai Jiangshan <laijs@cn.fujitsu.com>
This is part of a patch set that removes the show_format method
in the ftrace event macros.
Add the print_fmt initialization to the syscall events.
The print_fmt is still not used, but will be in the follow up
patches.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
LKML-Reference: <4B273D41.609@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/trace_syscalls.c | 68 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 1 deletions(-)
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 75289f3..1352b0a 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -191,6 +191,67 @@ int syscall_enter_format(struct ftrace_event_call *call, struct trace_seq *s)
return trace_seq_putc(s, '\n');
}
+static
+int __set_enter_print_fmt(struct syscall_metadata *entry, char *buf, int len)
+{
+ int i;
+ int pos = 0;
+
+ /* When len=0, we just calculate the needed length */
+#define LEN_OR_ZERO (len ? len - pos : 0)
+
+ pos += snprintf(buf + pos, LEN_OR_ZERO, "\"");
+ for (i = 0; i < entry->nb_args; i++) {
+ pos += snprintf(buf + pos, LEN_OR_ZERO, "%s: 0x%%0%zulx%s",
+ entry->args[i], sizeof(unsigned long),
+ i == entry->nb_args - 1 ? "" : ", ");
+ }
+ pos += snprintf(buf + pos, LEN_OR_ZERO, "\"");
+
+ for (i = 0; i < entry->nb_args; i++) {
+ pos += snprintf(buf + pos, LEN_OR_ZERO,
+ ", ((unsigned long)(REC->%s))", entry->args[i]);
+ }
+
+#undef LEN_OR_ZERO
+
+ /* return the length of print_fmt */
+ return pos;
+}
+
+static int set_syscall_print_fmt(struct ftrace_event_call *call)
+{
+ char *print_fmt;
+ int len;
+ struct syscall_metadata *entry = call->data;
+
+ if (entry->enter_event != call) {
+ call->print_fmt = "\"0x%lx\", REC->ret";
+ return 0;
+ }
+
+ /* First: called with 0 length to calculate the needed length */
+ len = __set_enter_print_fmt(entry, NULL, 0);
+
+ print_fmt = kmalloc(len + 1, GFP_KERNEL);
+ if (!print_fmt)
+ return -ENOMEM;
+
+ /* Second: actually write the @print_fmt */
+ __set_enter_print_fmt(entry, print_fmt, len + 1);
+ call->print_fmt = print_fmt;
+
+ return 0;
+}
+
+static void free_syscall_print_fmt(struct ftrace_event_call *call)
+{
+ struct syscall_metadata *entry = call->data;
+
+ if (entry->enter_event == call)
+ kfree(call->print_fmt);
+}
+
int syscall_exit_format(struct ftrace_event_call *call, struct trace_seq *s)
{
int ret;
@@ -386,9 +447,14 @@ int init_syscall_trace(struct ftrace_event_call *call)
{
int id;
+ if (set_syscall_print_fmt(call) < 0)
+ return -ENOMEM;
+
id = register_ftrace_event(call->event);
- if (!id)
+ if (!id) {
+ free_syscall_print_fmt(call);
return -ENODEV;
+ }
call->id = id;
INIT_LIST_HEAD(&call->fields);
return 0;
--
1.6.5
next prev parent reply other threads:[~2009-12-29 16:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-29 16:22 [PATCH 0/10][GIT PULL][v2.6.33] tracing: consolidate print fmt Steven Rostedt
2009-12-29 16:22 ` [PATCH 01/10] tracing/kprobe: Show sign of fields in trace_kprobe format files Steven Rostedt
2009-12-29 16:22 ` [PATCH 02/10] tracing/syscalls: Fix typo in SYSCALL_DEFINE0 Steven Rostedt
2009-12-29 16:22 ` [PATCH 03/10] tracing: Have __dynamic_array() define a field Steven Rostedt
2009-12-29 16:22 ` [PATCH 04/10] tracing: Fix sign fields in ftrace_define_fields_##call() Steven Rostedt
2009-12-29 16:22 ` [PATCH 05/10] tracing: Add print_fmt field Steven Rostedt
2009-12-29 16:22 ` Steven Rostedt [this message]
2009-12-29 16:22 ` [PATCH 07/10] tracing/kprobes: Init print_fmt for kprobe events Steven Rostedt
2009-12-29 16:22 ` [PATCH 08/10] tracing: Have syscall tracing call its own init function Steven Rostedt
2009-12-29 16:22 ` [PATCH 09/10] tracing: Use defined fields and print_fmt to print formats Steven Rostedt
2009-12-29 16:22 ` [PATCH 10/10] tracing: Remove show_format and related macros from TRACE_EVENT Steven Rostedt
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=20091229162638.342663108@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=fweisbec@gmail.com \
--cc=laijs@cn.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
/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
all inboxes | Powered by JetHome®