X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-syscalls.c;h=b8a1813c7c5f3506d1dd8fdd12b334863d7134de;hb=f8695253467b480087663426f4b97c02c443f08c;hp=52c94f150e73cd0fea617c3d2cfce7f4b8a5de7a;hpb=91a951f3eff49196d889935778fab43306ab31a8;p=lttng-modules.git diff --git a/lttng-syscalls.c b/lttng-syscalls.c index 52c94f15..b8a1813c 100644 --- a/lttng-syscalls.c +++ b/lttng-syscalls.c @@ -14,7 +14,7 @@ #include #include -#include "ltt-events.h" +#include "lttng-events.h" #ifndef CONFIG_COMPAT static inline int is_compat_task(void) @@ -23,6 +23,7 @@ static inline int is_compat_task(void) } #endif +static void syscall_entry_probe(void *__data, struct pt_regs *regs, long id); /* @@ -40,18 +41,74 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id); #define TP_MODULE_OVERRIDE #define TRACE_INCLUDE_PATH ../instrumentation/syscalls/headers +#define PARAMS(args...) args + /* Hijack probe callback for system calls */ +#undef TP_PROBE_CB #define TP_PROBE_CB(_template) &syscall_entry_probe +#define SC_TRACE_EVENT(_name, _proto, _args, _struct, _assign, _printk) \ + TRACE_EVENT(_name, PARAMS(_proto), PARAMS(_args),\ + PARAMS(_struct), PARAMS(_assign), PARAMS(_printk)) +#define SC_DECLARE_EVENT_CLASS_NOARGS(_name, _struct, _assign, _printk) \ + DECLARE_EVENT_CLASS_NOARGS(_name, PARAMS(_struct), PARAMS(_assign),\ + PARAMS(_printk)) +#define SC_DEFINE_EVENT_NOARGS(_template, _name) \ + DEFINE_EVENT_NOARGS(_template, _name) +#undef TRACE_SYSTEM +#define TRACE_SYSTEM syscalls_integers #include "instrumentation/syscalls/headers/syscalls_integers.h" +#undef TRACE_SYSTEM +#define TRACE_SYSTEM syscalls_pointers #include "instrumentation/syscalls/headers/syscalls_pointers.h" -#undef TP_PROBE_CB +#undef TRACE_SYSTEM +#undef SC_TRACE_EVENT +#undef SC_DECLARE_EVENT_CLASS_NOARGS +#undef SC_DEFINE_EVENT_NOARGS +#define TRACE_SYSTEM syscalls_unknown #include "instrumentation/syscalls/headers/syscalls_unknown.h" +#undef TRACE_SYSTEM + +/* For compat syscalls */ +#undef _TRACE_SYSCALLS_integers_H +#undef _TRACE_SYSCALLS_pointers_H + +/* Hijack probe callback for system calls */ +#undef TP_PROBE_CB +#define TP_PROBE_CB(_template) &syscall_entry_probe +#define SC_TRACE_EVENT(_name, _proto, _args, _struct, _assign, _printk) \ + TRACE_EVENT(compat_##_name, PARAMS(_proto), PARAMS(_args), \ + PARAMS(_struct), PARAMS(_assign), \ + PARAMS(_printk)) +#define SC_DECLARE_EVENT_CLASS_NOARGS(_name, _struct, _assign, _printk) \ + DECLARE_EVENT_CLASS_NOARGS(compat_##_name, PARAMS(_struct), \ + PARAMS(_assign), PARAMS(_printk)) +#define SC_DEFINE_EVENT_NOARGS(_template, _name) \ + DEFINE_EVENT_NOARGS(compat_##_template, compat_##_name) +#define TRACE_SYSTEM compat_syscalls_integers +#include "instrumentation/syscalls/headers/compat_syscalls_integers.h" +#undef TRACE_SYSTEM +#define TRACE_SYSTEM compat_syscalls_pointers +#include "instrumentation/syscalls/headers/compat_syscalls_pointers.h" +#undef TRACE_SYSTEM +#undef SC_TRACE_EVENT +#undef SC_DECLARE_EVENT_CLASS_NOARGS +#undef SC_DEFINE_EVENT_NOARGS +#undef TP_PROBE_CB #undef TP_MODULE_OVERRIDE #undef LTTNG_PACKAGE_BUILD #undef CREATE_TRACE_POINTS +struct trace_syscall_entry { + void *func; + const struct lttng_event_desc *desc; + const struct lttng_event_field *fields; + unsigned int nrargs; +}; + +#define CREATE_SYSCALL_TABLE + #undef TRACE_SYSCALL_TABLE #define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \ [ _nr ] = { \ @@ -61,40 +118,50 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id); .desc = &__event_desc___##_name, \ }, -#define CREATE_SYSCALL_TABLE - static const struct trace_syscall_entry sc_table[] = { #include "instrumentation/syscalls/headers/syscalls_integers.h" #include "instrumentation/syscalls/headers/syscalls_pointers.h" }; -#undef CREATE_SYSCALL_TABLE +#undef TRACE_SYSCALL_TABLE +#define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \ + [ _nr ] = { \ + .func = __event_probe__##compat_##_template, \ + .nrargs = (_nrargs), \ + .fields = __event_fields___##compat_##_template,\ + .desc = &__event_desc___##compat_##_name, \ + }, -//extern const struct trace_syscall_entry compat_sc_table[]; -//extern const size_t compat_sc_table_len; -//temp disable -static const struct trace_syscall_entry compat_sc_table[] = { }; -static const size_t compat_sc_table_len; +/* Create compatibility syscall table */ +const struct trace_syscall_entry compat_sc_table[] = { +#include "instrumentation/syscalls/headers/compat_syscalls_integers.h" +#include "instrumentation/syscalls/headers/compat_syscalls_pointers.h" +}; -static void syscall_entry_unknown(struct ltt_event *event, +#undef CREATE_SYSCALL_TABLE + +static void syscall_entry_unknown(struct lttng_event *event, struct pt_regs *regs, unsigned int id) { unsigned long args[UNKNOWN_SYSCALL_NRARGS]; syscall_get_arguments(current, regs, 0, UNKNOWN_SYSCALL_NRARGS, args); - __event_probe__sys_unknown(event, id, args); + if (unlikely(is_compat_task())) + __event_probe__compat_sys_unknown(event, id, args); + else + __event_probe__sys_unknown(event, id, args); } void syscall_entry_probe(void *__data, struct pt_regs *regs, long id) { - struct ltt_channel *chan = __data; - struct ltt_event *event, *unknown_event; + struct lttng_channel *chan = __data; + struct lttng_event *event, *unknown_event; const struct trace_syscall_entry *table, *entry; size_t table_len; if (unlikely(is_compat_task())) { table = compat_sc_table; - table_len = compat_sc_table_len; + table_len = ARRAY_SIZE(compat_sc_table); unknown_event = chan->sc_compat_unknown; } else { table = sc_table; @@ -204,16 +271,18 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id) } } +/* noinline to diminish caller stack size */ static int fill_table(const struct trace_syscall_entry *table, size_t table_len, - struct ltt_event **chan_table, struct ltt_channel *chan, void *filter) + struct lttng_event **chan_table, struct lttng_channel *chan, void *filter) { + const struct lttng_event_desc *desc; unsigned int i; /* Allocate events for each syscall, insert into table */ for (i = 0; i < table_len; i++) { struct lttng_kernel_event ev; - const struct lttng_event_desc *desc = table[i].desc; + desc = table[i].desc; if (!desc) { /* Unknown syscall */ @@ -226,10 +295,10 @@ int fill_table(const struct trace_syscall_entry *table, size_t table_len, if (chan_table[i]) continue; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_SYM_NAME_LEN); - ev.name[LTTNG_SYM_NAME_LEN - 1] = '\0'; + strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); + ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; ev.instrumentation = LTTNG_KERNEL_NOOP; - chan_table[i] = ltt_event_create(chan, &ev, filter, + chan_table[i] = lttng_event_create(chan, &ev, filter, desc); if (!chan_table[i]) { /* @@ -244,15 +313,16 @@ int fill_table(const struct trace_syscall_entry *table, size_t table_len, return 0; } -int lttng_syscalls_register(struct ltt_channel *chan, void *filter) +int lttng_syscalls_register(struct lttng_channel *chan, void *filter) { + struct lttng_kernel_event ev; int ret; wrapper_vmalloc_sync_all(); if (!chan->sc_table) { /* create syscall table mapping syscall to events */ - chan->sc_table = kzalloc(sizeof(struct ltt_event *) + chan->sc_table = kzalloc(sizeof(struct lttng_event *) * ARRAY_SIZE(sc_table), GFP_KERNEL); if (!chan->sc_table) return -ENOMEM; @@ -261,22 +331,21 @@ int lttng_syscalls_register(struct ltt_channel *chan, void *filter) #ifdef CONFIG_COMPAT if (!chan->compat_sc_table) { /* create syscall table mapping compat syscall to events */ - chan->compat_sc_table = kzalloc(sizeof(struct ltt_event *) - * compat_sc_table_len, GFP_KERNEL); + chan->compat_sc_table = kzalloc(sizeof(struct lttng_event *) + * ARRAY_SIZE(compat_sc_table), GFP_KERNEL); if (!chan->compat_sc_table) return -ENOMEM; } #endif if (!chan->sc_unknown) { - struct lttng_kernel_event ev; const struct lttng_event_desc *desc = &__event_desc___sys_unknown; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_SYM_NAME_LEN); - ev.name[LTTNG_SYM_NAME_LEN - 1] = '\0'; + strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); + ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; ev.instrumentation = LTTNG_KERNEL_NOOP; - chan->sc_unknown = ltt_event_create(chan, &ev, filter, + chan->sc_unknown = lttng_event_create(chan, &ev, filter, desc); if (!chan->sc_unknown) { return -EINVAL; @@ -284,15 +353,14 @@ int lttng_syscalls_register(struct ltt_channel *chan, void *filter) } if (!chan->sc_compat_unknown) { - struct lttng_kernel_event ev; const struct lttng_event_desc *desc = &__event_desc___compat_sys_unknown; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_SYM_NAME_LEN); - ev.name[LTTNG_SYM_NAME_LEN - 1] = '\0'; + strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); + ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; ev.instrumentation = LTTNG_KERNEL_NOOP; - chan->sc_compat_unknown = ltt_event_create(chan, &ev, filter, + chan->sc_compat_unknown = lttng_event_create(chan, &ev, filter, desc); if (!chan->sc_compat_unknown) { return -EINVAL; @@ -300,15 +368,14 @@ int lttng_syscalls_register(struct ltt_channel *chan, void *filter) } if (!chan->sc_exit) { - struct lttng_kernel_event ev; const struct lttng_event_desc *desc = &__event_desc___exit_syscall; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_SYM_NAME_LEN); - ev.name[LTTNG_SYM_NAME_LEN - 1] = '\0'; + strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); + ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; ev.instrumentation = LTTNG_KERNEL_NOOP; - chan->sc_exit = ltt_event_create(chan, &ev, filter, + chan->sc_exit = lttng_event_create(chan, &ev, filter, desc); if (!chan->sc_exit) { return -EINVAL; @@ -320,7 +387,7 @@ int lttng_syscalls_register(struct ltt_channel *chan, void *filter) if (ret) return ret; #ifdef CONFIG_COMPAT - ret = fill_table(compat_sc_table, compat_sc_table_len, + ret = fill_table(compat_sc_table, ARRAY_SIZE(compat_sc_table), chan->compat_sc_table, chan, filter); if (ret) return ret; @@ -346,7 +413,7 @@ int lttng_syscalls_register(struct ltt_channel *chan, void *filter) /* * Only called at session destruction. */ -int lttng_syscalls_unregister(struct ltt_channel *chan) +int lttng_syscalls_unregister(struct lttng_channel *chan) { int ret; @@ -361,7 +428,7 @@ int lttng_syscalls_unregister(struct ltt_channel *chan) (void *) syscall_entry_probe, chan); if (ret) return ret; - /* ltt_event destroy will be performed by ltt_session_destroy() */ + /* lttng_event destroy will be performed by lttng_session_destroy() */ kfree(chan->sc_table); #ifdef CONFIG_COMPAT kfree(chan->compat_sc_table);