Refactoring: syscall: combine syscall filter enable/disable recorder/notifier
[lttng-modules.git] / src / lttng-syscalls.c
index 33f05ea358b13a45e0dbd115acfd8f666b5f3b1b..f72afbe2c6eeffdab3b513316dd8006f677808f4 100644 (file)
@@ -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_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;
@@ -1108,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)
+int lttng_syscalls_unregister_syscall_table(struct lttng_kernel_syscall_table *syscall_table)
 {
-       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)
-{
-       struct lttng_kernel_syscall_table *syscall_table = &chan->priv->parent.syscall_table;
        int ret;
 
        if (!syscall_table->syscall_dispatch)
@@ -1170,10 +1131,8 @@ int lttng_syscalls_unregister_channel(struct lttng_kernel_channel_buffer *chan)
        return 0;
 }
 
-int lttng_syscalls_destroy_channel(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
@@ -1329,73 +1288,68 @@ 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(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_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);
-
-       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
@@ -1457,35 +1411,32 @@ int lttng_syscall_filter_disable(struct lttng_syscall_filter *filter,
        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_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,
-               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)
 {
This page took 0.02551 seconds and 4 git commands to generate.