Cleanup: syscall filter enable/disable event

[lttng-modules.git] / src / lttng-syscalls.c

diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c
index 34dc138e41718968cc2a7c06e7802e583fb8977d..62761b8286b620bd54564b234144820a03a1a1b2 100644 (file)
--- a/src/lttng-syscalls.c
+++ b/src/lttng-syscalls.c
@@ -598,7 +598,7 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl
                }
                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
@@ -670,7 +670,7 @@ int lttng_syscalls_register_event(struct lttng_event_recorder_enabler *syscall_e
                        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);
@@ -696,7 +696,7 @@ int lttng_syscalls_register_event(struct lttng_event_recorder_enabler *syscall_e
                }
                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);
                }
@@ -721,7 +721,7 @@ int lttng_syscalls_register_event(struct lttng_event_recorder_enabler *syscall_e
                }
                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);
                }
@@ -746,7 +746,7 @@ int lttng_syscalls_register_event(struct lttng_event_recorder_enabler *syscall_e
                }
                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
 
@@ -1358,8 +1329,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 +1385,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 +1399,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 +1457,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 +1475,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,