}
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
/*
* Should be called with sessions lock held.
*/
-int lttng_syscalls_register_event(struct lttng_event_recorder_enabler *syscall_event_enabler)
+int lttng_syscalls_register_event_recorder(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;
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);
}
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);
}
}
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);
}
}
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);
}
{
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();
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
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) {
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
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)
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
return 0;
}
-int lttng_syscall_filter_enable_event_notifier(
- struct lttng_kernel_event_notifier *event_notifier)
+int lttng_syscall_filter_enable_event(struct lttng_kernel_event_common *event)
{
- struct lttng_event_notifier_group *group = event_notifier->priv->group;
- struct lttng_kernel_syscall_table *syscall_table = &group->syscall_table;
- unsigned int syscall_id = event_notifier->priv->parent.u.syscall.syscall_id;
- struct hlist_head *dispatch_list;
- int ret = 0;
+ struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_event(event);
+ int ret;
- WARN_ON_ONCE(event_notifier->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
+ WARN_ON_ONCE(event->priv->instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
ret = lttng_syscall_filter_enable(syscall_table->sc_filter,
- event_notifier->priv->parent.desc->event_name,
- event_notifier->priv->parent.u.syscall.abi,
- event_notifier->priv->parent.u.syscall.entryexit);
- if (ret) {
- goto end;
- }
+ event->priv->desc->event_name, event->priv->u.syscall.abi,
+ event->priv->u.syscall.entryexit);
+ if (ret)
+ return ret;
- switch (event_notifier->priv->parent.u.syscall.entryexit) {
- case LTTNG_SYSCALL_ENTRY:
- switch (event_notifier->priv->parent.u.syscall.abi) {
- case LTTNG_SYSCALL_ABI_NATIVE:
- dispatch_list = &syscall_table->syscall_dispatch[syscall_id];
- break;
- case LTTNG_SYSCALL_ABI_COMPAT:
- dispatch_list = &syscall_table->compat_syscall_dispatch[syscall_id];
- break;
- default:
- ret = -EINVAL;
- goto end;
- }
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
break;
- case LTTNG_SYSCALL_EXIT:
- switch (event_notifier->priv->parent.u.syscall.abi) {
- case LTTNG_SYSCALL_ABI_NATIVE:
- dispatch_list = &syscall_table->syscall_exit_dispatch[syscall_id];
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ {
+ unsigned int syscall_id = event->priv->u.syscall.syscall_id;
+ struct hlist_head *dispatch_list;
+
+ switch (event->priv->u.syscall.entryexit) {
+ case LTTNG_SYSCALL_ENTRY:
+ switch (event->priv->u.syscall.abi) {
+ case LTTNG_SYSCALL_ABI_NATIVE:
+ dispatch_list = &syscall_table->syscall_dispatch[syscall_id];
+ break;
+ case LTTNG_SYSCALL_ABI_COMPAT:
+ dispatch_list = &syscall_table->compat_syscall_dispatch[syscall_id];
+ break;
+ default:
+ ret = -EINVAL;
+ goto end;
+ }
break;
- case LTTNG_SYSCALL_ABI_COMPAT:
- dispatch_list = &syscall_table->compat_syscall_exit_dispatch[syscall_id];
+ case LTTNG_SYSCALL_EXIT:
+ switch (event->priv->u.syscall.abi) {
+ case LTTNG_SYSCALL_ABI_NATIVE:
+ dispatch_list = &syscall_table->syscall_exit_dispatch[syscall_id];
+ break;
+ case LTTNG_SYSCALL_ABI_COMPAT:
+ dispatch_list = &syscall_table->compat_syscall_exit_dispatch[syscall_id];
+ break;
+ default:
+ ret = -EINVAL;
+ goto end;
+ }
break;
default:
ret = -EINVAL;
goto end;
}
+
+ hlist_add_head_rcu(&event->priv->u.syscall.node, dispatch_list);
break;
+ }
default:
- ret = -EINVAL;
- goto end;
+ WARN_ON_ONCE(1);
+ return -ENOSYS;
}
-
- hlist_add_head_rcu(&event_notifier->priv->parent.u.syscall.node, dispatch_list);
-
end:
- return ret ;
-}
-
-int lttng_syscall_filter_enable_event(
- struct lttng_kernel_channel_buffer *channel,
- struct lttng_kernel_event_recorder *event_recorder)
-{
- struct lttng_kernel_syscall_table *syscall_table = &channel->priv->parent.syscall_table;
-
- WARN_ON_ONCE(event_recorder->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
-
- return lttng_syscall_filter_enable(syscall_table->sc_filter,
- event_recorder->priv->parent.desc->event_name,
- event_recorder->priv->parent.u.syscall.abi,
- event_recorder->priv->parent.u.syscall.entryexit);
+ return ret;
}
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)
{
return 0;
}
-int lttng_syscall_filter_disable_event_notifier(
- struct lttng_kernel_event_notifier *event_notifier)
+int lttng_syscall_filter_disable_event(struct lttng_kernel_event_common *event)
{
- struct lttng_event_notifier_group *group = event_notifier->priv->group;
- struct lttng_kernel_syscall_table *syscall_table = &group->syscall_table;
+ struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_event(event);
int ret;
- WARN_ON_ONCE(event_notifier->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
-
ret = lttng_syscall_filter_disable(syscall_table->sc_filter,
- event_notifier->priv->parent.desc->event_name,
- event_notifier->priv->parent.u.syscall.abi,
- event_notifier->priv->parent.u.syscall.entryexit);
- WARN_ON_ONCE(ret != 0);
+ event->priv->desc->event_name, event->priv->u.syscall.abi,
+ event->priv->u.syscall.entryexit);
+ if (ret)
+ return ret;
- hlist_del_rcu(&event_notifier->priv->parent.u.syscall.node);
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ break;
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ {
+ hlist_del_rcu(&event->priv->u.syscall.node);
+ break;
+ }
+ default:
+ WARN_ON_ONCE(1);
+ return -ENOSYS;
+ }
return 0;
}
-int lttng_syscall_filter_disable_event(
- struct lttng_kernel_channel_buffer *channel,
- struct lttng_kernel_event_recorder *event_recorder)
-{
- struct lttng_kernel_syscall_table *syscall_table = &channel->priv->parent.syscall_table;
-
- return lttng_syscall_filter_disable(syscall_table->sc_filter,
- event_recorder->priv->parent.desc->event_name,
- event_recorder->priv->parent.u.syscall.abi,
- event_recorder->priv->parent.u.syscall.entryexit);
-}
-
static
const struct trace_syscall_entry *syscall_list_get_entry(loff_t *pos)
{
projects / lttng-modules.git / blobdiff