X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=src%2Flttng-syscalls.c;h=3bbb266c3bf118527d5914db5fe8333025baa941;hb=6053e75e863ee76362cceb6912c001b738c11b13;hp=fdc8524de6ef9bb0634f6ddfeedccb19d49ef9f4;hpb=0bb716a83d94370708a034f44dfbed4527eecfbe;p=lttng-modules.git diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c index fdc8524d..3bbb266c 100644 --- a/src/lttng-syscalls.c +++ b/src/lttng-syscalls.c @@ -488,8 +488,8 @@ struct lttng_kernel_syscall_table *get_syscall_table_from_enabler(struct lttng_e switch (event_enabler->enabler_type) { case LTTNG_EVENT_ENABLER_TYPE_RECORDER: { - struct lttng_event_enabler *event_recorder_enabler = - container_of(event_enabler, struct lttng_event_enabler, parent); + struct lttng_event_recorder_enabler *event_recorder_enabler = + container_of(event_enabler, struct lttng_event_recorder_enabler, parent); return &event_recorder_enabler->chan->priv->parent.syscall_table; } case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER: @@ -530,7 +530,7 @@ struct lttng_kernel_syscall_table *get_syscall_table_from_event(struct lttng_ker */ static int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *table, size_t table_len, - struct hlist_head *chan_table, struct lttng_event_enabler *syscall_event_enabler, + struct hlist_head *chan_table, struct lttng_event_recorder_enabler *syscall_event_enabler, enum sc_type type) { struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(&syscall_event_enabler->parent); @@ -541,7 +541,7 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl /* Allocate events for each syscall matching enabler, insert into table */ for (i = 0; i < table_len; i++) { const struct lttng_kernel_event_desc *desc = table[i].desc; - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; struct lttng_kernel_abi_event ev; struct lttng_kernel_event_recorder_private *event_recorder_priv; struct lttng_kernel_event_recorder *event_recorder; @@ -553,7 +553,7 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl continue; } if (lttng_desc_match_enabler(desc, - lttng_event_enabler_as_enabler(syscall_event_enabler)) <= 0) + lttng_event_recorder_enabler_as_enabler(syscall_event_enabler)) <= 0) continue; /* * Check if already created. @@ -592,13 +592,13 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1); ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; - event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan); + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan); if (!event_enabler) { return -ENOMEM; } event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc); WARN_ON_ONCE(!event_recorder); - lttng_event_enabler_destroy(event_enabler); + lttng_event_enabler_destroy(&event_enabler->parent); if (IS_ERR(event_recorder)) { /* * If something goes wrong in event registration @@ -616,7 +616,7 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl /* * Should be called with sessions lock held. */ -int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enabler) +int lttng_syscalls_register_event(struct lttng_event_recorder_enabler *syscall_event_enabler) { struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(&syscall_event_enabler->parent); struct lttng_kernel_abi_event ev; @@ -657,7 +657,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab const struct lttng_kernel_event_desc *desc = &__event_desc___syscall_entry_unknown; struct lttng_kernel_event_recorder *event_recorder; - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; memset(&ev, 0, sizeof(ev)); strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); @@ -665,12 +665,12 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; - event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); if (!event_enabler) { return -ENOMEM; } event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc); - lttng_event_enabler_destroy(event_enabler); + lttng_event_enabler_destroy(&event_enabler->parent); WARN_ON_ONCE(!event_recorder); if (IS_ERR(event_recorder)) { return PTR_ERR(event_recorder); @@ -682,7 +682,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab const struct lttng_kernel_event_desc *desc = &__event_desc___compat_syscall_entry_unknown; struct lttng_kernel_event_recorder *event_recorder; - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; memset(&ev, 0, sizeof(ev)); strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); @@ -690,13 +690,13 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; - event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); if (!event_enabler) { return -ENOMEM; } event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc); WARN_ON_ONCE(!event_recorder); - lttng_event_enabler_destroy(event_enabler); + lttng_event_enabler_destroy(&event_enabler->parent); if (IS_ERR(event_recorder)) { return PTR_ERR(event_recorder); } @@ -707,7 +707,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab const struct lttng_kernel_event_desc *desc = &__event_desc___compat_syscall_exit_unknown; struct lttng_kernel_event_recorder *event_recorder; - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; memset(&ev, 0, sizeof(ev)); strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); @@ -715,13 +715,13 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; - event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); if (!event_enabler) { return -ENOMEM; } event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc); WARN_ON_ONCE(!event_recorder); - lttng_event_enabler_destroy(event_enabler); + lttng_event_enabler_destroy(&event_enabler->parent); if (IS_ERR(event_recorder)) { return PTR_ERR(event_recorder); } @@ -732,7 +732,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab const struct lttng_kernel_event_desc *desc = &__event_desc___syscall_exit_unknown; struct lttng_kernel_event_recorder *event_recorder; - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; memset(&ev, 0, sizeof(ev)); strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); @@ -740,13 +740,13 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; - event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); if (!event_enabler) { return -ENOMEM; } event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc); WARN_ON_ONCE(!event_recorder); - lttng_event_enabler_destroy(event_enabler); + lttng_event_enabler_destroy(&event_enabler->parent); if (IS_ERR(event_recorder)) { return PTR_ERR(event_recorder); } @@ -812,7 +812,6 @@ int lttng_syscalls_register_event_notifier( { struct lttng_event_notifier_group *group = event_notifier_enabler->group; struct lttng_kernel_syscall_table *syscall_table = &group->syscall_table; - unsigned int i; int ret = 0; wrapper_vmalloc_sync_mappings(); @@ -821,26 +820,12 @@ int lttng_syscalls_register_event_notifier( syscall_table->syscall_dispatch = kzalloc(sizeof(struct hlist_head) * sc_table.len, GFP_KERNEL); if (!syscall_table->syscall_dispatch) return -ENOMEM; - - /* Initialize all list_head */ - for (i = 0; i < sc_table.len; i++) - INIT_HLIST_HEAD(&syscall_table->syscall_dispatch[i]); - - /* Init the unknown syscall notifier list. */ - INIT_HLIST_HEAD(&syscall_table->unknown_syscall_dispatch); } if (!syscall_table->syscall_exit_dispatch) { syscall_table->syscall_exit_dispatch = kzalloc(sizeof(struct hlist_head) * sc_table.len, GFP_KERNEL); if (!syscall_table->syscall_exit_dispatch) return -ENOMEM; - - /* Initialize all list_head */ - for (i = 0; i < sc_table.len; i++) - INIT_HLIST_HEAD(&syscall_table->syscall_exit_dispatch[i]); - - /* Init the unknown exit syscall notifier list. */ - INIT_HLIST_HEAD(&syscall_table->unknown_syscall_exit_dispatch); } #ifdef CONFIG_COMPAT @@ -848,13 +833,6 @@ int lttng_syscalls_register_event_notifier( syscall_table->compat_syscall_dispatch = kzalloc(sizeof(struct hlist_head) * compat_sc_table.len, GFP_KERNEL); if (!syscall_table->compat_syscall_dispatch) return -ENOMEM; - - /* Initialize all list_head */ - for (i = 0; i < compat_sc_table.len; i++) - INIT_HLIST_HEAD(&syscall_table->compat_syscall_dispatch[i]); - - /* Init the unknown syscall notifier list. */ - INIT_HLIST_HEAD(&syscall_table->compat_unknown_syscall_dispatch); } if (!syscall_table->compat_syscall_exit_dispatch) { @@ -863,13 +841,6 @@ int lttng_syscalls_register_event_notifier( GFP_KERNEL); if (!syscall_table->compat_syscall_exit_dispatch) return -ENOMEM; - - /* Initialize all list_head */ - for (i = 0; i < compat_sc_exit_table.len; i++) - INIT_HLIST_HEAD(&syscall_table->compat_syscall_exit_dispatch[i]); - - /* Init the unknown exit syscall notifier list. */ - INIT_HLIST_HEAD(&syscall_table->compat_unknown_syscall_exit_dispatch); } #endif @@ -1137,47 +1108,8 @@ end: return ret; } -/* - * Unregister the syscall event_notifier probes from the callsites. - */ -int lttng_syscalls_unregister_event_notifier_group( - struct lttng_event_notifier_group *event_notifier_group) -{ - struct lttng_kernel_syscall_table *syscall_table = &event_notifier_group->syscall_table; - int ret; - - /* - * Only register the event_notifier probe on the `sys_enter` callsite for now. - * At the moment, we don't think it's desirable to have one fired - * event_notifier for the entry and one for the exit of a syscall. - */ - if (syscall_table->sys_enter_registered) { - ret = lttng_wrapper_tracepoint_probe_unregister("sys_enter", - (void *) syscall_entry_event_probe, syscall_table); - if (ret) - return ret; - syscall_table->sys_enter_registered = 0; - } - if (syscall_table->sys_exit_registered) { - ret = lttng_wrapper_tracepoint_probe_unregister("sys_exit", - (void *) syscall_exit_event_probe, syscall_table); - if (ret) - return ret; - syscall_table->sys_enter_registered = 0; - } - - kfree(syscall_table->syscall_dispatch); - kfree(syscall_table->syscall_exit_dispatch); -#ifdef CONFIG_COMPAT - kfree(syscall_table->compat_syscall_dispatch); - kfree(syscall_table->compat_syscall_exit_dispatch); -#endif - return 0; -} - -int lttng_syscalls_unregister_channel(struct lttng_kernel_channel_buffer *chan) +int lttng_syscalls_unregister_syscall_table(struct lttng_kernel_syscall_table *syscall_table) { - struct lttng_kernel_syscall_table *syscall_table = &chan->priv->parent.syscall_table; int ret; if (!syscall_table->syscall_dispatch) @@ -1199,10 +1131,8 @@ int lttng_syscalls_unregister_channel(struct lttng_kernel_channel_buffer *chan) return 0; } -int lttng_syscalls_destroy_event(struct lttng_kernel_channel_buffer *chan) +int lttng_syscalls_destroy_syscall_table(struct lttng_kernel_syscall_table *syscall_table) { - struct lttng_kernel_syscall_table *syscall_table = &chan->priv->parent.syscall_table; - kfree(syscall_table->syscall_dispatch); kfree(syscall_table->syscall_exit_dispatch); #ifdef CONFIG_COMPAT @@ -1358,8 +1288,7 @@ int lttng_syscall_filter_enable( return 0; } -int lttng_syscall_filter_enable_event_notifier( - struct lttng_kernel_event_notifier *event_notifier) +int lttng_syscall_filter_enable_event_notifier(struct lttng_kernel_event_notifier *event_notifier) { struct lttng_event_notifier_group *group = event_notifier->priv->group; struct lttng_kernel_syscall_table *syscall_table = &group->syscall_table; @@ -1415,10 +1344,9 @@ end: return ret ; } -int lttng_syscall_filter_enable_event( - struct lttng_kernel_channel_buffer *channel, - struct lttng_kernel_event_recorder *event_recorder) +int lttng_syscall_filter_enable_event_recorder(struct lttng_kernel_event_recorder *event_recorder) { + struct lttng_kernel_channel_buffer *channel = event_recorder->chan; struct lttng_kernel_syscall_table *syscall_table = &channel->priv->parent.syscall_table; WARN_ON_ONCE(event_recorder->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL); @@ -1430,8 +1358,7 @@ int lttng_syscall_filter_enable_event( } static -int lttng_syscall_filter_disable( - struct lttng_syscall_filter *filter, +int lttng_syscall_filter_disable(struct lttng_syscall_filter *filter, const char *desc_name, enum lttng_syscall_abi abi, enum lttng_syscall_entryexit entryexit) { @@ -1489,8 +1416,7 @@ int lttng_syscall_filter_disable( return 0; } -int lttng_syscall_filter_disable_event_notifier( - struct lttng_kernel_event_notifier *event_notifier) +int lttng_syscall_filter_disable_event_notifier(struct lttng_kernel_event_notifier *event_notifier) { struct lttng_event_notifier_group *group = event_notifier->priv->group; struct lttng_kernel_syscall_table *syscall_table = &group->syscall_table; @@ -1508,10 +1434,9 @@ int lttng_syscall_filter_disable_event_notifier( return 0; } -int lttng_syscall_filter_disable_event( - struct lttng_kernel_channel_buffer *channel, - struct lttng_kernel_event_recorder *event_recorder) +int lttng_syscall_filter_disable_event_recorder(struct lttng_kernel_event_recorder *event_recorder) { + struct lttng_kernel_channel_buffer *channel = event_recorder->chan; struct lttng_kernel_syscall_table *syscall_table = &channel->priv->parent.syscall_table; return lttng_syscall_filter_disable(syscall_table->sc_filter,