diff options
Diffstat (limited to 'kernel/trace')
-rw-r--r-- | kernel/trace/trace_events.c | 5 | ||||
-rw-r--r-- | kernel/trace/trace_syscalls.c | 51 |
2 files changed, 50 insertions, 6 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 9c7ecfb3416f..79d352027a61 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c | |||
@@ -27,8 +27,8 @@ DEFINE_MUTEX(event_mutex); | |||
27 | 27 | ||
28 | LIST_HEAD(ftrace_events); | 28 | LIST_HEAD(ftrace_events); |
29 | 29 | ||
30 | int trace_define_field(struct ftrace_event_call *call, char *type, | 30 | int trace_define_field(struct ftrace_event_call *call, const char *type, |
31 | char *name, int offset, int size, int is_signed) | 31 | const char *name, int offset, int size, int is_signed) |
32 | { | 32 | { |
33 | struct ftrace_event_field *field; | 33 | struct ftrace_event_field *field; |
34 | 34 | ||
@@ -83,6 +83,7 @@ int trace_define_common_fields(struct ftrace_event_call *call) | |||
83 | 83 | ||
84 | return ret; | 84 | return ret; |
85 | } | 85 | } |
86 | EXPORT_SYMBOL_GPL(trace_define_common_fields); | ||
86 | 87 | ||
87 | #ifdef CONFIG_MODULES | 88 | #ifdef CONFIG_MODULES |
88 | 89 | ||
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index 7336b6c265d7..28e4dae4af21 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c | |||
@@ -165,6 +165,49 @@ int syscall_exit_format(struct ftrace_event_call *call, struct trace_seq *s) | |||
165 | return trace_seq_printf(s, "\nprint fmt: \"0x%%lx\", REC->ret\n"); | 165 | return trace_seq_printf(s, "\nprint fmt: \"0x%%lx\", REC->ret\n"); |
166 | } | 166 | } |
167 | 167 | ||
168 | int syscall_enter_define_fields(struct ftrace_event_call *call) | ||
169 | { | ||
170 | struct syscall_trace_enter trace; | ||
171 | struct syscall_metadata *meta; | ||
172 | int ret; | ||
173 | int nr; | ||
174 | int i; | ||
175 | int offset = offsetof(typeof(trace), args); | ||
176 | |||
177 | nr = syscall_name_to_nr(call->data); | ||
178 | meta = syscall_nr_to_meta(nr); | ||
179 | |||
180 | if (!meta) | ||
181 | return 0; | ||
182 | |||
183 | ret = trace_define_common_fields(call); | ||
184 | if (ret) | ||
185 | return ret; | ||
186 | |||
187 | for (i = 0; i < meta->nb_args; i++) { | ||
188 | ret = trace_define_field(call, meta->types[i], | ||
189 | meta->args[i], offset, | ||
190 | sizeof(unsigned long), 0); | ||
191 | offset += sizeof(unsigned long); | ||
192 | } | ||
193 | |||
194 | return ret; | ||
195 | } | ||
196 | |||
197 | int syscall_exit_define_fields(struct ftrace_event_call *call) | ||
198 | { | ||
199 | struct syscall_trace_exit trace; | ||
200 | int ret; | ||
201 | |||
202 | ret = trace_define_common_fields(call); | ||
203 | if (ret) | ||
204 | return ret; | ||
205 | |||
206 | ret = trace_define_field(call, SYSCALL_FIELD(unsigned long, ret), 0); | ||
207 | |||
208 | return ret; | ||
209 | } | ||
210 | |||
168 | void ftrace_syscall_enter(struct pt_regs *regs, long id) | 211 | void ftrace_syscall_enter(struct pt_regs *regs, long id) |
169 | { | 212 | { |
170 | struct syscall_trace_enter *entry; | 213 | struct syscall_trace_enter *entry; |
@@ -192,8 +235,8 @@ void ftrace_syscall_enter(struct pt_regs *regs, long id) | |||
192 | entry->nr = syscall_nr; | 235 | entry->nr = syscall_nr; |
193 | syscall_get_arguments(current, regs, 0, sys_data->nb_args, entry->args); | 236 | syscall_get_arguments(current, regs, 0, sys_data->nb_args, entry->args); |
194 | 237 | ||
195 | trace_current_buffer_unlock_commit(event, 0, 0); | 238 | if (!filter_current_check_discard(sys_data->enter_event, entry, event)) |
196 | trace_wake_up(); | 239 | trace_current_buffer_unlock_commit(event, 0, 0); |
197 | } | 240 | } |
198 | 241 | ||
199 | void ftrace_syscall_exit(struct pt_regs *regs, long ret) | 242 | void ftrace_syscall_exit(struct pt_regs *regs, long ret) |
@@ -220,8 +263,8 @@ void ftrace_syscall_exit(struct pt_regs *regs, long ret) | |||
220 | entry->nr = syscall_nr; | 263 | entry->nr = syscall_nr; |
221 | entry->ret = syscall_get_return_value(current, regs); | 264 | entry->ret = syscall_get_return_value(current, regs); |
222 | 265 | ||
223 | trace_current_buffer_unlock_commit(event, 0, 0); | 266 | if (!filter_current_check_discard(sys_data->exit_event, entry, event)) |
224 | trace_wake_up(); | 267 | trace_current_buffer_unlock_commit(event, 0, 0); |
225 | } | 268 | } |
226 | 269 | ||
227 | int reg_event_syscall_enter(void *ptr) | 270 | int reg_event_syscall_enter(void *ptr) |