diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-08-11 13:03:54 -0400 |
---|---|---|
committer | Frederic Weisbecker <fweisbec@gmail.com> | 2009-08-11 14:35:30 -0400 |
commit | dc4ddb4c0b7348f1c9759ae8a9e7d734dc1cda82 (patch) | |
tree | 00c0df5d9b7809a0c0cf89713c55c7e04ce6c248 | |
parent | e8f9f4d79a677f55c8ec3acbe87b33a87e2df0de (diff) |
tracing: Add fields format definition for syscall events
Define the format of the syscall trace fields to parse the binary
values from a raw trace using the syscall events "format" file.
This is defined dynamically using the syscalls metadata.
It prepares the export of syscall event raw records to perf
counters.
Example:
$ cat /debug/tracing/events/syscalls/sys_enter_sched_getparam/format
name: sys_enter_sched_getparam
ID: 39
format:
field:unsigned short common_type; offset:0; size:2;
field:unsigned char common_flags; offset:2; size:1;
field:unsigned char common_preempt_count; offset:3; size:1;
field:int common_pid; offset:4; size:4;
field:int common_tgid; offset:8; size:4;
field:pid_t pid; offset:12; size:8;
field:struct sched_param * param; offset:20; size:8;
print fmt: "pid: 0x%08lx, param: 0x%08lx", ((unsigned long)(REC->pid)), ((unsigned long)(REC->param))
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Jiaying Zhang <jiayingz@google.com>
Cc: Martin Bligh <mbligh@google.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Jason Baron <jbaron@redhat.com>
-rw-r--r-- | include/linux/syscalls.h | 1 | ||||
-rw-r--r-- | include/trace/syscall.h | 2 | ||||
-rw-r--r-- | kernel/trace/trace_syscalls.c | 46 |
3 files changed, 49 insertions, 0 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 5541e75e140a..87d06c173ddc 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
@@ -189,6 +189,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *event_call) \ | |||
189 | .system = "syscalls", \ | 189 | .system = "syscalls", \ |
190 | .event = &event_syscall_enter, \ | 190 | .event = &event_syscall_enter, \ |
191 | .raw_init = init_enter_##sname, \ | 191 | .raw_init = init_enter_##sname, \ |
192 | .show_format = ftrace_format_syscall, \ | ||
192 | .regfunc = reg_event_syscall_enter, \ | 193 | .regfunc = reg_event_syscall_enter, \ |
193 | .unregfunc = unreg_event_syscall_enter, \ | 194 | .unregfunc = unreg_event_syscall_enter, \ |
194 | .data = "sys"#sname, \ | 195 | .data = "sys"#sname, \ |
diff --git a/include/trace/syscall.h b/include/trace/syscall.h index 3ab6dd18fa3a..0cb03625edd9 100644 --- a/include/trace/syscall.h +++ b/include/trace/syscall.h | |||
@@ -55,6 +55,8 @@ extern int reg_event_syscall_enter(void *ptr); | |||
55 | extern void unreg_event_syscall_enter(void *ptr); | 55 | extern void unreg_event_syscall_enter(void *ptr); |
56 | extern int reg_event_syscall_exit(void *ptr); | 56 | extern int reg_event_syscall_exit(void *ptr); |
57 | extern void unreg_event_syscall_exit(void *ptr); | 57 | extern void unreg_event_syscall_exit(void *ptr); |
58 | extern int | ||
59 | ftrace_format_syscall(struct ftrace_event_call *call, struct trace_seq *s); | ||
58 | enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags); | 60 | enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags); |
59 | enum print_line_t print_syscall_exit(struct trace_iterator *iter, int flags); | 61 | enum print_line_t print_syscall_exit(struct trace_iterator *iter, int flags); |
60 | #endif | 62 | #endif |
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index f4eaec3d559a..9ee6386cf842 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c | |||
@@ -105,6 +105,52 @@ print_syscall_exit(struct trace_iterator *iter, int flags) | |||
105 | return TRACE_TYPE_HANDLED; | 105 | return TRACE_TYPE_HANDLED; |
106 | } | 106 | } |
107 | 107 | ||
108 | int ftrace_format_syscall(struct ftrace_event_call *call, struct trace_seq *s) | ||
109 | { | ||
110 | int i; | ||
111 | int nr; | ||
112 | int ret = 0; | ||
113 | struct syscall_metadata *entry; | ||
114 | int offset = sizeof(struct trace_entry); | ||
115 | |||
116 | nr = syscall_name_to_nr((char *)call->data); | ||
117 | entry = syscall_nr_to_meta(nr); | ||
118 | |||
119 | if (!entry) | ||
120 | return ret; | ||
121 | |||
122 | for (i = 0; i < entry->nb_args; i++) { | ||
123 | ret = trace_seq_printf(s, "\tfield:%s %s;", entry->types[i], | ||
124 | entry->args[i]); | ||
125 | if (!ret) | ||
126 | return 0; | ||
127 | ret = trace_seq_printf(s, "\toffset:%d;\tsize:%lu;\n", offset, | ||
128 | sizeof(unsigned long)); | ||
129 | if (!ret) | ||
130 | return 0; | ||
131 | offset += sizeof(unsigned long); | ||
132 | } | ||
133 | |||
134 | trace_seq_printf(s, "\nprint fmt: \""); | ||
135 | for (i = 0; i < entry->nb_args; i++) { | ||
136 | ret = trace_seq_printf(s, "%s: 0x%%0%lulx%s", entry->args[i], | ||
137 | sizeof(unsigned long), | ||
138 | i == entry->nb_args - 1 ? "\", " : ", "); | ||
139 | if (!ret) | ||
140 | return 0; | ||
141 | } | ||
142 | |||
143 | for (i = 0; i < entry->nb_args; i++) { | ||
144 | ret = trace_seq_printf(s, "((unsigned long)(REC->%s))%s", | ||
145 | entry->args[i], | ||
146 | i == entry->nb_args - 1 ? "\n" : ", "); | ||
147 | if (!ret) | ||
148 | return 0; | ||
149 | } | ||
150 | |||
151 | return ret; | ||
152 | } | ||
153 | |||
108 | void ftrace_syscall_enter(struct pt_regs *regs, long id) | 154 | void ftrace_syscall_enter(struct pt_regs *regs, long id) |
109 | { | 155 | { |
110 | struct syscall_trace_enter *entry; | 156 | struct syscall_trace_enter *entry; |