From: "zhangwei(Jovi)" <jovi.zhang...@huawei.com>
Other tracepoints already switched to use event_trace_ops as
backend store mechanism, syscall tracing can use same backend.
This change would also expose syscall tracing to external modules
with same interface like other tracepoints.
Signed-off-by: zhangwei(Jovi) <jovi.zhang...@huawei.com>
---
kernel/trace/trace_syscalls.c | 49 ++++++++++++++---------------------------
1 file changed, 16 insertions(+), 33 deletions(-)
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 322e164..72675b1 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -302,12 +302,10 @@ static int __init syscall_exit_define_fields(struct
ftrace_event_call *call)
static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id)
{
struct trace_array *tr = data;
+ struct ftrace_event_file event_file;
+ struct trace_descriptor_t desc;
struct syscall_trace_enter *entry;
struct syscall_metadata *sys_data;
- struct ring_buffer_event *event;
- struct ring_buffer *buffer;
- unsigned long irq_flags;
- int pc;
int syscall_nr;
int size;
@@ -323,34 +321,26 @@ static void ftrace_syscall_enter(void *data, struct
pt_regs *regs, long id)
size = sizeof(*entry) + sizeof(unsigned long) * sys_data->nb_args;
- local_save_flags(irq_flags);
- pc = preempt_count();
-
- buffer = tr->trace_buffer.buffer;
- event = trace_buffer_lock_reserve(buffer,
- sys_data->enter_event->event.type, size, irq_flags, pc);
- if (!event)
+ event_file.tr = tr;
+ event_file.event_call = sys_data->enter_event;
+ event_file.flags = FTRACE_EVENT_FL_ENABLED;
+ entry = tr->ops->pre_trace(&event_file, size, &desc);
+ if (!entry)
return;
- entry = ring_buffer_event_data(event);
entry->nr = syscall_nr;
syscall_get_arguments(current, regs, 0, sys_data->nb_args, entry->args);
- if (!filter_current_check_discard(buffer, sys_data->enter_event,
- entry, event))
- trace_current_buffer_unlock_commit(buffer, event,
- irq_flags, pc);
+ tr->ops->do_trace(&event_file, entry, size, &desc);
}
static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret)
{
struct trace_array *tr = data;
+ struct ftrace_event_file event_file;
+ struct trace_descriptor_t desc;
struct syscall_trace_exit *entry;
struct syscall_metadata *sys_data;
- struct ring_buffer_event *event;
- struct ring_buffer *buffer;
- unsigned long irq_flags;
- int pc;
int syscall_nr;
syscall_nr = trace_get_syscall_nr(current, regs);
@@ -363,24 +353,17 @@ static void ftrace_syscall_exit(void *data, struct
pt_regs *regs, long ret)
if (!sys_data)
return;
- local_save_flags(irq_flags);
- pc = preempt_count();
-
- buffer = tr->trace_buffer.buffer;
- event = trace_buffer_lock_reserve(buffer,
- sys_data->exit_event->event.type, sizeof(*entry),
- irq_flags, pc);
- if (!event)
+ event_file.tr = tr;
+ event_file.event_call = sys_data->exit_event;
+ event_file.flags = FTRACE_EVENT_FL_ENABLED;
+ entry = tr->ops->pre_trace(&event_file, sizeof(*entry), &desc);
+ if (!entry)
return;
- entry = ring_buffer_event_data(event);
entry->nr = syscall_nr;
entry->ret = syscall_get_return_value(current, regs);
- if (!filter_current_check_discard(buffer, sys_data->exit_event,
- entry, event))
- trace_current_buffer_unlock_commit(buffer, event,
- irq_flags, pc);
+ tr->ops->do_trace(&event_file, entry, sizeof(*entry), &desc);
}
static int reg_event_syscall_enter(struct ftrace_event_file *file,
--
1.7.9.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
