AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

tracing: Make syscall events suitable for multiple buffers

Browse Source 
Currently the syscall events record into the global buffer. But if
multiple buffers are in place, then we need to have syscall events
record in the proper buffers.

By adding descriptors to pass to the syscall event functions, the
syscall events can now record into the buffers that have been assigned
to them (one event may be applied to mulitple buffers).

This will allow tracing high volume syscalls along with seldom occurring
syscalls without losing the seldom syscall events.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt 2012-08-08 14:48:20 -04:00 committed by Steven Rostedt
parent a7603ff4b5
commit 12ab74ee00
2 changed files with 57 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/trace/trace.h
View File

@ -13,6 +13,11 @@
#include <linux/trace_seq.h> #include <linux/trace_seq.h>
#include <linux/ftrace_event.h> #include <linux/ftrace_event.h>
#ifdef CONFIG_FTRACE_SYSCALLS
#include <asm/unistd.h> /* For NR_SYSCALLS */
#include <asm/syscall.h> /* some archs define it here */
#endif
enum trace_type { enum trace_type {
__TRACE_FIRST_TYPE = 0, __TRACE_FIRST_TYPE = 0,
@ -173,6 +178,12 @@ struct trace_array {
int cpu; int cpu;
int buffer_disabled; int buffer_disabled;
struct trace_cpu trace_cpu; /* place holder */ struct trace_cpu trace_cpu; /* place holder */
#ifdef CONFIG_FTRACE_SYSCALLS
int sys_refcount_enter;
int sys_refcount_exit;
DECLARE_BITMAP(enabled_enter_syscalls, NR_syscalls);
DECLARE_BITMAP(enabled_exit_syscalls, NR_syscalls);
#endif
int stop_count; int stop_count;
int clock_id; int clock_id;
struct tracer *current_trace; struct tracer *current_trace;

80
kernel/trace/trace_syscalls.c
View File

@ -12,10 +12,6 @@
#include "trace.h" #include "trace.h"
static DEFINE_MUTEX(syscall_trace_lock); static DEFINE_MUTEX(syscall_trace_lock);
static int sys_refcount_enter;
static int sys_refcount_exit;
static DECLARE_BITMAP(enabled_enter_syscalls, NR_syscalls);
static DECLARE_BITMAP(enabled_exit_syscalls, NR_syscalls);
static int syscall_enter_register(struct ftrace_event_call *event, static int syscall_enter_register(struct ftrace_event_call *event,
enum trace_reg type, void *data); enum trace_reg type, void *data);
@ -303,8 +299,9 @@ static int syscall_exit_define_fields(struct ftrace_event_call *call)
return ret; return ret;
} }
static void ftrace_syscall_enter(void *ignore, struct pt_regs *regs, long id) static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id)
{ {
struct trace_array *tr = data;
struct syscall_trace_enter *entry; struct syscall_trace_enter *entry;
struct syscall_metadata *sys_data; struct syscall_metadata *sys_data;
struct ring_buffer_event *event; struct ring_buffer_event *event;
@ -315,7 +312,7 @@ static void ftrace_syscall_enter(void *ignore, struct pt_regs *regs, long id)
syscall_nr = trace_get_syscall_nr(current, regs); syscall_nr = trace_get_syscall_nr(current, regs);
if (syscall_nr < 0) if (syscall_nr < 0)
return; return;
if (!test_bit(syscall_nr, enabled_enter_syscalls)) if (!test_bit(syscall_nr, tr->enabled_enter_syscalls))
return; return;
sys_data = syscall_nr_to_meta(syscall_nr); sys_data = syscall_nr_to_meta(syscall_nr);
@ -324,7 +321,8 @@ static void ftrace_syscall_enter(void *ignore, struct pt_regs *regs, long id)
size = sizeof(*entry) + sizeof(unsigned long) * sys_data->nb_args; size = sizeof(*entry) + sizeof(unsigned long) * sys_data->nb_args;
event = trace_current_buffer_lock_reserve(&buffer, buffer = tr->buffer;
event = trace_buffer_lock_reserve(buffer,
sys_data->enter_event->event.type, size, 0, 0); sys_data->enter_event->event.type, size, 0, 0);
if (!event) if (!event)
return; return;
@ -338,8 +336,9 @@ static void ftrace_syscall_enter(void *ignore, struct pt_regs *regs, long id)
trace_current_buffer_unlock_commit(buffer, event, 0, 0); trace_current_buffer_unlock_commit(buffer, event, 0, 0);
} }
static void ftrace_syscall_exit(void *ignore, struct pt_regs *regs, long ret) static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret)
{ {
struct trace_array *tr = data;
struct syscall_trace_exit *entry; struct syscall_trace_exit *entry;
struct syscall_metadata *sys_data; struct syscall_metadata *sys_data;
struct ring_buffer_event *event; struct ring_buffer_event *event;
@ -349,14 +348,15 @@ static void ftrace_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
syscall_nr = trace_get_syscall_nr(current, regs); syscall_nr = trace_get_syscall_nr(current, regs);
if (syscall_nr < 0) if (syscall_nr < 0)
return; return;
if (!test_bit(syscall_nr, enabled_exit_syscalls)) if (!test_bit(syscall_nr, tr->enabled_exit_syscalls))
return; return;
sys_data = syscall_nr_to_meta(syscall_nr); sys_data = syscall_nr_to_meta(syscall_nr);
if (!sys_data) if (!sys_data)
return; return;
event = trace_current_buffer_lock_reserve(&buffer, buffer = tr->buffer;
event = trace_buffer_lock_reserve(buffer,
sys_data->exit_event->event.type, sizeof(*entry), 0, 0); sys_data->exit_event->event.type, sizeof(*entry), 0, 0);
if (!event) if (!event)
return; return;
@ -370,8 +370,10 @@ static void ftrace_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
trace_current_buffer_unlock_commit(buffer, event, 0, 0); trace_current_buffer_unlock_commit(buffer, event, 0, 0);
} }
static int reg_event_syscall_enter(struct ftrace_event_call *call) static int reg_event_syscall_enter(struct ftrace_event_file *file,
struct ftrace_event_call *call)
{ {
struct trace_array *tr = file->tr;
int ret = 0; int ret = 0;
int num; int num;
@ -379,33 +381,37 @@ static int reg_event_syscall_enter(struct ftrace_event_call *call)
if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls)) if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
return -ENOSYS; return -ENOSYS;
mutex_lock(&syscall_trace_lock); mutex_lock(&syscall_trace_lock);
if (!sys_refcount_enter) if (!tr->sys_refcount_enter)
ret = register_trace_sys_enter(ftrace_syscall_enter, NULL); ret = register_trace_sys_enter(ftrace_syscall_enter, tr);
if (!ret) { if (!ret) {
set_bit(num, enabled_enter_syscalls); set_bit(num, tr->enabled_enter_syscalls);
sys_refcount_enter++; tr->sys_refcount_enter++;
} }
mutex_unlock(&syscall_trace_lock); mutex_unlock(&syscall_trace_lock);
return ret; return ret;
} }
static void unreg_event_syscall_enter(struct ftrace_event_call *call) static void unreg_event_syscall_enter(struct ftrace_event_file *file,
struct ftrace_event_call *call)
{ {
struct trace_array *tr = file->tr;
int num; int num;
num = ((struct syscall_metadata *)call->data)->syscall_nr; num = ((struct syscall_metadata *)call->data)->syscall_nr;
if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls)) if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
return; return;
mutex_lock(&syscall_trace_lock); mutex_lock(&syscall_trace_lock);
sys_refcount_enter--; tr->sys_refcount_enter--;
clear_bit(num, enabled_enter_syscalls); clear_bit(num, tr->enabled_enter_syscalls);
if (!sys_refcount_enter) if (!tr->sys_refcount_enter)
unregister_trace_sys_enter(ftrace_syscall_enter, NULL); unregister_trace_sys_enter(ftrace_syscall_enter, tr);
mutex_unlock(&syscall_trace_lock); mutex_unlock(&syscall_trace_lock);
} }
static int reg_event_syscall_exit(struct ftrace_event_call *call) static int reg_event_syscall_exit(struct ftrace_event_file *file,
struct ftrace_event_call *call)
{ {
struct trace_array *tr = file->tr;
int ret = 0; int ret = 0;
int num; int num;
@ -413,28 +419,30 @@ static int reg_event_syscall_exit(struct ftrace_event_call *call)
if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls)) if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
return -ENOSYS; return -ENOSYS;
mutex_lock(&syscall_trace_lock); mutex_lock(&syscall_trace_lock);
if (!sys_refcount_exit) if (!tr->sys_refcount_exit)
ret = register_trace_sys_exit(ftrace_syscall_exit, NULL); ret = register_trace_sys_exit(ftrace_syscall_exit, tr);
if (!ret) { if (!ret) {
set_bit(num, enabled_exit_syscalls); set_bit(num, tr->enabled_exit_syscalls);
sys_refcount_exit++; tr->sys_refcount_exit++;
} }
mutex_unlock(&syscall_trace_lock); mutex_unlock(&syscall_trace_lock);
return ret; return ret;
} }
static void unreg_event_syscall_exit(struct ftrace_event_call *call) static void unreg_event_syscall_exit(struct ftrace_event_file *file,
struct ftrace_event_call *call)
{ {
struct trace_array *tr = file->tr;
int num; int num;
num = ((struct syscall_metadata *)call->data)->syscall_nr; num = ((struct syscall_metadata *)call->data)->syscall_nr;
if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls)) if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
return; return;
mutex_lock(&syscall_trace_lock); mutex_lock(&syscall_trace_lock);
sys_refcount_exit--; tr->sys_refcount_exit--;
clear_bit(num, enabled_exit_syscalls); clear_bit(num, tr->enabled_exit_syscalls);
if (!sys_refcount_exit) if (!tr->sys_refcount_exit)
unregister_trace_sys_exit(ftrace_syscall_exit, NULL); unregister_trace_sys_exit(ftrace_syscall_exit, tr);
mutex_unlock(&syscall_trace_lock); mutex_unlock(&syscall_trace_lock);
} }
@ -685,11 +693,13 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
static int syscall_enter_register(struct ftrace_event_call *event, static int syscall_enter_register(struct ftrace_event_call *event,
enum trace_reg type, void *data) enum trace_reg type, void *data)
{ {
struct ftrace_event_file *file = data;
switch (type) { switch (type) {
case TRACE_REG_REGISTER: case TRACE_REG_REGISTER:
return reg_event_syscall_enter(event); return reg_event_syscall_enter(file, event);
case TRACE_REG_UNREGISTER: case TRACE_REG_UNREGISTER:
unreg_event_syscall_enter(event); unreg_event_syscall_enter(file, event);
return 0; return 0;
#ifdef CONFIG_PERF_EVENTS #ifdef CONFIG_PERF_EVENTS
@ -711,11 +721,13 @@ static int syscall_enter_register(struct ftrace_event_call *event,
static int syscall_exit_register(struct ftrace_event_call *event, static int syscall_exit_register(struct ftrace_event_call *event,
enum trace_reg type, void *data) enum trace_reg type, void *data)
{ {
struct ftrace_event_file *file = data;
switch (type) { switch (type) {
case TRACE_REG_REGISTER: case TRACE_REG_REGISTER:
return reg_event_syscall_exit(event); return reg_event_syscall_exit(file, event);
case TRACE_REG_UNREGISTER: case TRACE_REG_UNREGISTER:
unreg_event_syscall_exit(event); unreg_event_syscall_exit(file, event);
return 0; return 0;
#ifdef CONFIG_PERF_EVENTS #ifdef CONFIG_PERF_EVENTS