X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-syscalls.c;h=7b6078ea010f715a72819e8f5bc138573501f927;hb=refs%2Fheads%2Fstable-2.6;hp=4eae6747f692c1149adbb5d52fef45a5b8e19ea0;hpb=f4855b46cb97a7ad649e97232719c50ab8688119;p=lttng-modules.git diff --git a/lttng-syscalls.c b/lttng-syscalls.c index 4eae6747..7b6078ea 100644 --- a/lttng-syscalls.c +++ b/lttng-syscalls.c @@ -28,11 +28,15 @@ #include #include #include +#include +#include +#include #include #include #include "lib/bitfield.h" #include "wrapper/tracepoint.h" +#include "wrapper/file.h" #include "lttng-events.h" #ifndef CONFIG_COMPAT @@ -48,10 +52,15 @@ enum sc_type { SC_TYPE_COMPAT_EXIT, }; -#define SYSCALL_ENTRY_STR "syscall_entry_" -#define COMPAT_SYSCALL_ENTRY_STR "compat_syscall_entry_" -#define SYSCALL_EXIT_STR "syscall_exit_" -#define COMPAT_SYSCALL_EXIT_STR "compat_syscall_exit_" +#define SYSCALL_ENTRY_TOK syscall_entry_ +#define COMPAT_SYSCALL_ENTRY_TOK compat_syscall_entry_ +#define SYSCALL_EXIT_TOK syscall_exit_ +#define COMPAT_SYSCALL_EXIT_TOK compat_syscall_exit_ + +#define SYSCALL_ENTRY_STR __stringify(SYSCALL_ENTRY_TOK) +#define COMPAT_SYSCALL_ENTRY_STR __stringify(COMPAT_SYSCALL_ENTRY_TOK) +#define SYSCALL_EXIT_STR __stringify(SYSCALL_EXIT_TOK) +#define COMPAT_SYSCALL_EXIT_STR __stringify(COMPAT_SYSCALL_EXIT_TOK) static void syscall_entry_probe(void *__data, struct pt_regs *regs, long id); @@ -67,6 +76,7 @@ struct oldold_utsname; struct old_utsname; struct sel_arg_struct; struct mmap_arg_struct; +struct file_handle; #ifdef IA32_NR_syscalls #define NR_compat_syscalls IA32_NR_syscalls @@ -85,6 +95,7 @@ struct mmap_arg_struct; #define PARAMS(args...) args /* Handle unknown syscalls */ +#undef TRACE_SYSTEM #define TRACE_SYSTEM syscalls_unknown #include "instrumentation/syscalls/headers/syscalls_unknown.h" #undef TRACE_SYSTEM @@ -104,24 +115,24 @@ struct mmap_arg_struct; #undef TP_PROBE_CB #define TP_PROBE_CB(_template) &syscall_entry_probe #define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _struct, _assign, _printk) \ - LTTNG_TRACEPOINT_EVENT(syscall_enter_##_name, PARAMS(_proto), PARAMS(_args), \ + LTTNG_TRACEPOINT_EVENT(syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \ PARAMS(_struct), PARAMS(_assign), PARAMS(_printk)) #define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code, _struct, _assign, _printk) \ - LTTNG_TRACEPOINT_EVENT_CODE(syscall_enter_##_name, PARAMS(_proto), PARAMS(_args), \ + LTTNG_TRACEPOINT_EVENT_CODE(syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \ PARAMS(_locvar), PARAMS(_code), \ PARAMS(_struct), PARAMS(_assign), PARAMS(_printk)) #define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _struct, _assign, _printk) \ - LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscall_enter_##_name, PARAMS(_struct), PARAMS(_assign), \ + LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscall_entry_##_name, PARAMS(_struct), PARAMS(_assign), \ PARAMS(_printk)) #define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name) \ - LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscall_enter_##_template, syscall_enter_##_name) + LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscall_entry_##_template, syscall_entry_##_name) #undef TRACE_SYSTEM -#define TRACE_SYSTEM syscall_enter_integers +#define TRACE_SYSTEM syscall_entry_integers #define TRACE_INCLUDE_FILE syscalls_integers #include "instrumentation/syscalls/headers/syscalls_integers.h" #undef TRACE_INCLUDE_FILE #undef TRACE_SYSTEM -#define TRACE_SYSTEM syscall_enter_pointers +#define TRACE_SYSTEM syscall_entry_pointers #define TRACE_INCLUDE_FILE syscalls_pointers #include "instrumentation/syscalls/headers/syscalls_pointers.h" #undef TRACE_INCLUDE_FILE @@ -137,25 +148,25 @@ struct mmap_arg_struct; /* Hijack probe callback for compat system call enter */ #define TP_PROBE_CB(_template) &syscall_entry_probe #define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _struct, _assign, _printk) \ - LTTNG_TRACEPOINT_EVENT(compat_syscall_enter_##_name, PARAMS(_proto), PARAMS(_args), \ + LTTNG_TRACEPOINT_EVENT(compat_syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \ PARAMS(_struct), PARAMS(_assign), \ PARAMS(_printk)) #define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code, _struct, _assign, _printk) \ - LTTNG_TRACEPOINT_EVENT_CODE(compat_syscall_enter_##_name, PARAMS(_proto), PARAMS(_args), \ + LTTNG_TRACEPOINT_EVENT_CODE(compat_syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \ PARAMS(_locvar), PARAMS(_code), \ PARAMS(_struct), PARAMS(_assign), PARAMS(_printk)) #define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _struct, _assign, _printk) \ - LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(compat_syscall_enter_##_name, PARAMS(_struct), \ + LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(compat_syscall_entry_##_name, PARAMS(_struct), \ PARAMS(_assign), PARAMS(_printk)) #define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name) \ - LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(compat_syscall_enter_##_template, \ - compat_syscall_enter_##_name) -#define TRACE_SYSTEM compat_syscall_enter_integers + LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(compat_syscall_entry_##_template, \ + compat_syscall_entry_##_name) +#define TRACE_SYSTEM compat_syscall_entry_integers #define TRACE_INCLUDE_FILE compat_syscalls_integers #include "instrumentation/syscalls/headers/compat_syscalls_integers.h" #undef TRACE_INCLUDE_FILE #undef TRACE_SYSTEM -#define TRACE_SYSTEM compat_syscall_enter_pointers +#define TRACE_SYSTEM compat_syscall_entry_pointers #define TRACE_INCLUDE_FILE compat_syscalls_pointers #include "instrumentation/syscalls/headers/compat_syscalls_pointers.h" #undef TRACE_INCLUDE_FILE @@ -271,10 +282,10 @@ struct trace_syscall_entry { #undef TRACE_SYSCALL_TABLE #define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \ [ _nr ] = { \ - .func = __event_probe__syscall_enter_##_template, \ + .func = __event_probe__syscall_entry_##_template, \ .nrargs = (_nrargs), \ - .fields = __event_fields___syscall_enter_##_template, \ - .desc = &__event_desc___syscall_enter_##_name, \ + .fields = __event_fields___syscall_entry_##_template, \ + .desc = &__event_desc___syscall_entry_##_name, \ }, /* Syscall enter tracing table */ @@ -286,10 +297,10 @@ static const struct trace_syscall_entry sc_table[] = { #undef TRACE_SYSCALL_TABLE #define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \ [ _nr ] = { \ - .func = __event_probe__compat_syscall_enter_##_template, \ + .func = __event_probe__compat_syscall_entry_##_template, \ .nrargs = (_nrargs), \ - .fields = __event_fields___compat_syscall_enter_##_template, \ - .desc = &__event_desc___compat_syscall_enter_##_name, \ + .fields = __event_fields___compat_syscall_entry_##_template, \ + .desc = &__event_desc___compat_syscall_entry_##_name, \ }, /* Compat syscall enter table */ @@ -351,9 +362,9 @@ static void syscall_entry_unknown(struct lttng_event *event, syscall_get_arguments(current, regs, 0, UNKNOWN_SYSCALL_NRARGS, args); if (unlikely(is_compat_task())) - __event_probe__compat_syscall_enter_unknown(event, id, args); + __event_probe__compat_syscall_entry_unknown(event, id, args); else - __event_probe__syscall_enter_unknown(event, id, args); + __event_probe__syscall_entry_unknown(event, id, args); } void syscall_entry_probe(void *__data, struct pt_regs *regs, long id) @@ -368,7 +379,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id) filter = rcu_dereference(chan->sc_filter); if (filter) { - if (id >= NR_compat_syscalls + if (id < 0 || id >= NR_compat_syscalls || !test_bit(id, filter->sc_compat)) { /* System call filtered out. */ return; @@ -382,7 +393,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id) filter = rcu_dereference(chan->sc_filter); if (filter) { - if (id >= NR_syscalls + if (id < 0 || id >= NR_syscalls || !test_bit(id, filter->sc)) { /* System call filtered out. */ return; @@ -392,7 +403,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id) table_len = ARRAY_SIZE(sc_table); unknown_event = chan->sc_unknown; } - if (unlikely(id >= table_len)) { + if (unlikely(id < 0 || id >= table_len)) { syscall_entry_unknown(unknown_event, regs, id); return; } @@ -496,7 +507,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id) } static void syscall_exit_unknown(struct lttng_event *event, - struct pt_regs *regs, unsigned int id, long ret) + struct pt_regs *regs, int id, long ret) { unsigned long args[UNKNOWN_SYSCALL_NRARGS]; @@ -522,7 +533,7 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret) filter = rcu_dereference(chan->sc_filter); if (filter) { - if (id >= NR_compat_syscalls + if (id < 0 || id >= NR_compat_syscalls || !test_bit(id, filter->sc_compat)) { /* System call filtered out. */ return; @@ -536,7 +547,7 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret) filter = rcu_dereference(chan->sc_filter); if (filter) { - if (id >= NR_syscalls + if (id < 0 || id >= NR_syscalls || !test_bit(id, filter->sc)) { /* System call filtered out. */ return; @@ -546,7 +557,7 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret) table_len = ARRAY_SIZE(sc_exit_table); unknown_event = chan->sc_exit_unknown; } - if (unlikely(id >= table_len)) { + if (unlikely(id < 0 || id >= table_len)) { syscall_exit_unknown(unknown_event, regs, id, ret); return; } @@ -764,7 +775,7 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter) #endif if (!chan->sc_unknown) { const struct lttng_event_desc *desc = - &__event_desc___syscall_enter_unknown; + &__event_desc___syscall_entry_unknown; memset(&ev, 0, sizeof(ev)); strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); @@ -780,7 +791,7 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter) if (!chan->sc_compat_unknown) { const struct lttng_event_desc *desc = - &__event_desc___compat_syscall_enter_unknown; + &__event_desc___compat_syscall_entry_unknown; memset(&ev, 0, sizeof(ev)); strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); @@ -1030,6 +1041,8 @@ int lttng_syscall_filter_disable(struct lttng_channel *chan, WARN_ON_ONCE(!chan->sc_table); if (!chan->sc_filter) { + if (!chan->syscall_all) + return -EEXIST; filter = kzalloc(sizeof(struct lttng_syscall_filter), GFP_KERNEL); if (!filter) @@ -1042,6 +1055,14 @@ int lttng_syscall_filter_disable(struct lttng_channel *chan, } if (!name) { + /* Fail if all syscalls are already disabled. */ + if (bitmap_empty(filter->sc, NR_syscalls) + && bitmap_empty(filter->sc_compat, + NR_compat_syscalls)) { + ret = -EEXIST; + goto error; + } + /* Disable all system calls */ bitmap_clear(filter->sc, 0, NR_syscalls); bitmap_clear(filter->sc_compat, 0, NR_compat_syscalls); @@ -1054,18 +1075,18 @@ int lttng_syscall_filter_disable(struct lttng_channel *chan, goto error; } if (syscall_nr >= 0) { - if (!test_bit(syscall_nr, chan->sc_filter->sc)) { + if (!test_bit(syscall_nr, filter->sc)) { ret = -EEXIST; goto error; } - bitmap_clear(chan->sc_filter->sc, syscall_nr, 1); + bitmap_clear(filter->sc, syscall_nr, 1); } if (compat_syscall_nr >= 0) { - if (!test_bit(compat_syscall_nr, chan->sc_filter->sc_compat)) { + if (!test_bit(compat_syscall_nr, filter->sc_compat)) { ret = -EEXIST; goto error; } - bitmap_clear(chan->sc_filter->sc_compat, compat_syscall_nr, 1); + bitmap_clear(filter->sc_compat, compat_syscall_nr, 1); } apply_filter: if (!chan->sc_filter) @@ -1147,18 +1168,24 @@ int syscall_list_show(struct seq_file *m, void *p) { const struct trace_syscall_entry *table, *entry = p; unsigned int bitness; + unsigned long index; int ret; + const char *name; ret = get_sc_table(entry, &table, &bitness); if (ret) return ret; if (!entry->desc) return 0; + if (table == sc_table) { + index = entry - table; + name = &entry->desc->name[strlen(SYSCALL_ENTRY_STR)]; + } else { + index = (entry - table) + ARRAY_SIZE(sc_table); + name = &entry->desc->name[strlen(COMPAT_SYSCALL_ENTRY_STR)]; + } seq_printf(m, "syscall { index = %lu; name = %s; bitness = %u; };\n", - table == sc_table ? entry - table : - (entry - table) + ARRAY_SIZE(sc_table), - entry->desc->name, - bitness); + index, name, bitness); return 0; } @@ -1207,16 +1234,70 @@ long lttng_channel_syscall_mask(struct lttng_channel *channel, filter = channel->sc_filter; for (bit = 0; bit < ARRAY_SIZE(sc_table); bit++) { - bt_bitfield_write_be(tmp_mask, char, bit, 1, - test_bit(bit, filter->sc)); + bool state; + + if (channel->sc_table) { + if (filter) + state = test_bit(bit, filter->sc); + else + state = 1; + } else { + state = 0; + } + bt_bitfield_write_be(tmp_mask, char, bit, 1, state); } for (; bit < sc_tables_len; bit++) { - bt_bitfield_write_be(tmp_mask, char, bit, 1, - test_bit(bit - ARRAY_SIZE(sc_table), - filter->sc_compat)); + bool state; + + if (channel->compat_sc_table) { + if (filter) + state = test_bit(bit - ARRAY_SIZE(sc_table), + filter->sc_compat); + else + state = 1; + } else { + state = 0; + } + bt_bitfield_write_be(tmp_mask, char, bit, 1, state); } if (copy_to_user(usyscall_mask->mask, tmp_mask, bitmask_len)) ret = -EFAULT; kfree(tmp_mask); return ret; } + +int lttng_abi_syscall_list(void) +{ + struct file *syscall_list_file; + int file_fd, ret; + + file_fd = lttng_get_unused_fd(); + if (file_fd < 0) { + ret = file_fd; + goto fd_error; + } + + syscall_list_file = anon_inode_getfile("[lttng_syscall_list]", + <tng_syscall_list_fops, + NULL, O_RDWR); + if (IS_ERR(syscall_list_file)) { + ret = PTR_ERR(syscall_list_file); + goto file_error; + } + ret = lttng_syscall_list_fops.open(NULL, syscall_list_file); + if (ret < 0) + goto open_error; + fd_install(file_fd, syscall_list_file); + if (file_fd < 0) { + ret = file_fd; + goto fd_error; + } + return file_fd; + +open_error: + fput(syscall_list_file); +file_error: + put_unused_fd(file_fd); +fd_error: + return ret; +}