Fix: kernels 3.0.x do not implement IS_ENABLED macro
[lttng-modules.git] / src / lttng-syscalls.c
index 2a9125a257595eed4dfab2a27388cc52d5724300..bf1f2b732217397cf3e489bdb3e5f260f24dc361 100644 (file)
@@ -132,9 +132,6 @@ struct lttng_syscall_filter {
        DECLARE_BITMAP(sc_compat_exit, NR_compat_syscalls);
 };
 
-static
-int lttng_syscalls_create_matching_event_notifiers(struct lttng_event_enabler_common *event_enabler);
-
 static void syscall_entry_event_unknown(struct hlist_head *unknown_action_list_head,
        struct pt_regs *regs, long id)
 {
@@ -571,14 +568,15 @@ void lttng_syscall_event_enabler_create_event(struct lttng_event_enabler_common
                if (!event_recorder_enabler)
                        return;
                event = _lttng_kernel_event_create(&event_recorder_enabler->parent, desc);
-               WARN_ON_ONCE(!event || IS_ERR(event));
+               WARN_ON_ONCE(IS_ERR(event));
                lttng_event_enabler_destroy(&event_recorder_enabler->parent);
-               if (!event || IS_ERR(event)) {
+               if (IS_ERR(event)) {
                        printk(KERN_INFO "Unable to create event recorder %s\n", desc->event_name);
                        return;
                }
+               event->priv->u.syscall.syscall_id = syscall_nr;
                if (dispatch_table)
-                       hlist_add_head_rcu(&event->priv->u.syscall.node, &dispatch_table[syscall_nr]);
+                       hlist_add_head_rcu(&event->priv->u.syscall.node, dispatch_table);
                break;
        }
        case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
@@ -620,9 +618,9 @@ void lttng_syscall_event_enabler_create_event(struct lttng_event_enabler_common
                                &event_notifier_param, syscall_event_notifier_enabler->group);
                WARN_ON_ONCE(!event_notifier_enabler);
                event = _lttng_kernel_event_create(&event_notifier_enabler->parent, desc);
-               WARN_ON_ONCE(!event || IS_ERR(event));
+               WARN_ON_ONCE(IS_ERR(event));
                lttng_event_enabler_destroy(&event_notifier_enabler->parent);
-               if (!event || IS_ERR(event)) {
+               if (IS_ERR(event)) {
                        printk(KERN_INFO "Unable to create event notifier %s\n", desc->event_name);
                        return;
                }
@@ -636,182 +634,148 @@ void lttng_syscall_event_enabler_create_event(struct lttng_event_enabler_common
        }
 }
 
-/*
- * noinline to diminish caller stack size.
- * Should be called with sessions lock held.
- */
 static
-int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *table, size_t table_len,
-       struct hlist_head *dispatch_table, struct lttng_event_recorder_enabler *syscall_event_enabler,
-       enum sc_type type)
+void lttng_syscall_event_enabler_create_matching_syscall_table_events(struct lttng_event_enabler_common *syscall_event_enabler_common,
+               const struct trace_syscall_entry *table, size_t table_len, enum sc_type type)
 {
-       struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&syscall_event_enabler->parent);
+       struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(syscall_event_enabler_common);
+       const struct lttng_kernel_event_desc *desc;
        unsigned int i;
 
-       /* Allocate events for each syscall matching enabler, insert into table */
+#ifndef CONFIG_COMPAT
+       if (type == SC_TYPE_COMPAT_ENTRY || type == SC_TYPE_COMPAT_EXIT)
+               return;
+#endif
+       /* iterate over all syscall and create event that match */
        for (i = 0; i < table_len; i++) {
-               const struct lttng_kernel_event_desc *desc = table[i].desc;
                struct lttng_kernel_event_common_private *event_priv;
                struct hlist_head *head;
                bool found = false;
 
+               desc = table[i].desc;
                if (!desc) {
                        /* Unknown syscall */
                        continue;
                }
-               if (!lttng_desc_match_enabler(desc,
-                               lttng_event_recorder_enabler_as_enabler(syscall_event_enabler)))
+
+               if (!lttng_desc_match_enabler(desc, syscall_event_enabler_common))
                        continue;
+
                /*
                 * Check if already created.
                 */
                head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name);
                lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
-                       if (lttng_event_enabler_desc_match_event(&syscall_event_enabler->parent, desc, event_priv->pub))
+                       if (lttng_event_enabler_desc_match_event(syscall_event_enabler_common, desc, event_priv->pub)) {
                                found = true;
+                               break;
+                       }
                }
                if (found)
                        continue;
 
-               lttng_syscall_event_enabler_create_event(&syscall_event_enabler->parent, desc, dispatch_table, type, i);
+               lttng_syscall_event_enabler_create_event(syscall_event_enabler_common, desc, NULL, type, i);
        }
-       return 0;
 }
 
 static
-int lttng_syscalls_populate_events(struct lttng_event_enabler_common *syscall_event_enabler)
+bool lttng_syscall_event_enabler_is_wildcard_all(struct lttng_event_enabler_common *event_enabler)
 {
-       struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(syscall_event_enabler);
-       struct lttng_event_recorder_enabler *event_recorder_enabler;
-       struct lttng_kernel_channel_buffer *chan;
-       struct lttng_kernel_abi_event ev;
-       int ret;
+       if (event_enabler->event_param.instrumentation != LTTNG_KERNEL_ABI_SYSCALL)
+               return false;
+       if (event_enabler->event_param.u.syscall.abi != LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL)
+               return false;
+       if (event_enabler->event_param.u.syscall.match != LTTNG_KERNEL_ABI_SYSCALL_MATCH_NAME)
+               return false;
+       if (strcmp(event_enabler->event_param.name, "*"))
+               return false;
+       return true;
+}
 
-       if (syscall_event_enabler->enabler_type != LTTNG_EVENT_ENABLER_TYPE_RECORDER)
-               return 0;
-       event_recorder_enabler = container_of(syscall_event_enabler, struct lttng_event_recorder_enabler, parent);
-       chan = event_recorder_enabler->chan;
+static
+void create_unknown_syscall_event(struct lttng_event_enabler_common *event_enabler, enum sc_type type)
+{
+       struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(event_enabler);
+       struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(event_enabler);
+       struct lttng_kernel_event_common_private *event_priv;
+       const struct lttng_kernel_event_desc *desc;
+       struct hlist_head *unknown_dispatch_list;
+       bool found = false;
+       struct hlist_head *head;
 
-       if (hlist_empty(&syscall_table->unknown_syscall_dispatch)) {
-               const struct lttng_kernel_event_desc *desc =
-                       &__event_desc___syscall_entry_unknown;
-               struct lttng_kernel_event_common *event;
-               struct lttng_event_recorder_enabler *event_enabler;
+#ifndef CONFIG_COMPAT
+       if (type == SC_TYPE_COMPAT_ENTRY || type == SC_TYPE_COMPAT_EXIT)
+               return;
+#endif
+       /*
+        * Considering that currently system calls can only be enabled on a per
+        * name basis (or wildcard based on a name), unknown syscall events are
+        * only used when matching *all* system calls, because this is the only
+        * case which can be associated with an unknown system call.
+        *
+        * When enabling system call on a per system call number basis will be
+        * supported, this will need to be revisited.
+        */
+       if (!lttng_syscall_event_enabler_is_wildcard_all(event_enabler))
+               return;
 
-               memset(&ev, 0, sizeof(ev));
-               strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
-               ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
-               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_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan);
-               if (!event_enabler) {
-                       return -ENOMEM;
-               }
-               event = _lttng_kernel_event_create(&event_enabler->parent, desc);
-               lttng_event_enabler_destroy(&event_enabler->parent);
-               WARN_ON_ONCE(!event);
-               if (IS_ERR(event)) {
-                       return PTR_ERR(event);
-               }
-               hlist_add_head(&event->priv->u.syscall.node, &syscall_table->unknown_syscall_dispatch);
+       switch (type) {
+       case SC_TYPE_ENTRY:
+               desc = &__event_desc___syscall_entry_unknown;
+               unknown_dispatch_list = &syscall_table->unknown_syscall_dispatch;
+               break;
+       case SC_TYPE_EXIT:
+               desc = &__event_desc___syscall_exit_unknown;
+               unknown_dispatch_list = &syscall_table->unknown_syscall_exit_dispatch;
+               break;
+       case SC_TYPE_COMPAT_ENTRY:
+               desc = &__event_desc___compat_syscall_entry_unknown;
+               unknown_dispatch_list = &syscall_table->compat_unknown_syscall_dispatch;
+               break;
+       case SC_TYPE_COMPAT_EXIT:
+               desc = &__event_desc___compat_syscall_exit_unknown;
+               unknown_dispatch_list = &syscall_table->compat_unknown_syscall_exit_dispatch;
+               break;
+       default:
+               WARN_ON_ONCE(1);
        }
 
-       if (hlist_empty(&syscall_table->compat_unknown_syscall_dispatch)) {
-               const struct lttng_kernel_event_desc *desc =
-                       &__event_desc___compat_syscall_entry_unknown;
-               struct lttng_kernel_event_common *event;
-               struct lttng_event_recorder_enabler *event_enabler;
-
-               memset(&ev, 0, sizeof(ev));
-               strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
-               ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
-               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_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan);
-               if (!event_enabler) {
-                       return -ENOMEM;
-               }
-               event = _lttng_kernel_event_create(&event_enabler->parent, desc);
-               WARN_ON_ONCE(!event);
-               lttng_event_enabler_destroy(&event_enabler->parent);
-               if (IS_ERR(event)) {
-                       return PTR_ERR(event);
+       /*
+        * Check if already created.
+        */
+       head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name);
+       lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
+               if (lttng_event_enabler_desc_match_event(event_enabler, desc, event_priv->pub)) {
+                       found = true;
+                       break;
                }
-               hlist_add_head(&event->priv->u.syscall.node, &syscall_table->compat_unknown_syscall_dispatch);
        }
+       if (!found)
+               lttng_syscall_event_enabler_create_event(event_enabler, desc, unknown_dispatch_list, type, -1U);
+}
 
-       if (hlist_empty(&syscall_table->compat_unknown_syscall_exit_dispatch)) {
-               const struct lttng_kernel_event_desc *desc =
-                       &__event_desc___compat_syscall_exit_unknown;
-               struct lttng_kernel_event_common *event;
-               struct lttng_event_recorder_enabler *event_enabler;
+static
+void lttng_syscall_event_enabler_create_matching_events(struct lttng_event_enabler_common *event_enabler)
+{
+       enum lttng_kernel_abi_syscall_entryexit entryexit = event_enabler->event_param.u.syscall.entryexit;
 
-               memset(&ev, 0, sizeof(ev));
-               strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
-               ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
-               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_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan);
-               if (!event_enabler) {
-                       return -ENOMEM;
-               }
-               event = _lttng_kernel_event_create(&event_enabler->parent, desc);
-               WARN_ON_ONCE(!event);
-               lttng_event_enabler_destroy(&event_enabler->parent);
-               if (IS_ERR(event)) {
-                       return PTR_ERR(event);
-               }
-               hlist_add_head(&event->priv->u.syscall.node, &syscall_table->compat_unknown_syscall_exit_dispatch);
+       if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
+               lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler,
+                       sc_table.table, sc_table.len, SC_TYPE_ENTRY);
+               lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler,
+                       compat_sc_table.table, compat_sc_table.len, SC_TYPE_COMPAT_ENTRY);
+               create_unknown_syscall_event(event_enabler, SC_TYPE_ENTRY);
+               create_unknown_syscall_event(event_enabler, SC_TYPE_COMPAT_ENTRY);
        }
 
-       if (hlist_empty(&syscall_table->unknown_syscall_exit_dispatch)) {
-               const struct lttng_kernel_event_desc *desc =
-                       &__event_desc___syscall_exit_unknown;
-               struct lttng_kernel_event_common *event;
-               struct lttng_event_recorder_enabler *event_enabler;
-
-               memset(&ev, 0, sizeof(ev));
-               strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
-               ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
-               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_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan);
-               if (!event_enabler) {
-                       return -ENOMEM;
-               }
-               event = _lttng_kernel_event_create(&event_enabler->parent, desc);
-               WARN_ON_ONCE(!event);
-               lttng_event_enabler_destroy(&event_enabler->parent);
-               if (IS_ERR(event)) {
-                       return PTR_ERR(event);
-               }
-               hlist_add_head(&event->priv->u.syscall.node, &syscall_table->unknown_syscall_exit_dispatch);
+       if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
+               lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler,
+                       sc_exit_table.table, sc_exit_table.len, SC_TYPE_EXIT);
+               lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler,
+                       compat_sc_exit_table.table, compat_sc_exit_table.len, SC_TYPE_COMPAT_EXIT);
+               create_unknown_syscall_event(event_enabler, SC_TYPE_EXIT);
+               create_unknown_syscall_event(event_enabler, SC_TYPE_COMPAT_EXIT);
        }
-
-       ret = lttng_create_syscall_event_if_missing(sc_table.table, sc_table.len,
-                       syscall_table->syscall_dispatch, event_recorder_enabler, SC_TYPE_ENTRY);
-       if (ret)
-               return ret;
-       ret = lttng_create_syscall_event_if_missing(sc_exit_table.table, sc_exit_table.len,
-                       syscall_table->syscall_exit_dispatch, event_recorder_enabler, SC_TYPE_EXIT);
-       if (ret)
-               return ret;
-
-#ifdef CONFIG_COMPAT
-       ret = lttng_create_syscall_event_if_missing(compat_sc_table.table, compat_sc_table.len,
-                       syscall_table->compat_syscall_dispatch, event_recorder_enabler, SC_TYPE_COMPAT_ENTRY);
-       if (ret)
-               return ret;
-       ret = lttng_create_syscall_event_if_missing(compat_sc_exit_table.table, compat_sc_exit_table.len,
-                       syscall_table->compat_syscall_exit_dispatch, event_recorder_enabler, SC_TYPE_COMPAT_EXIT);
-       if (ret)
-               return ret;
-#endif
-       return ret;
 }
 
 /*
@@ -835,7 +799,6 @@ int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enab
                        return -ENOMEM;
        }
 
-
 #ifdef CONFIG_COMPAT
        if (!syscall_table->compat_syscall_dispatch) {
                /* create syscall table mapping compat syscall to events */
@@ -858,14 +821,6 @@ int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enab
                        return -ENOMEM;
        }
 
-       ret = lttng_syscalls_populate_events(syscall_event_enabler);
-       if (ret)
-               return ret;
-
-       ret = lttng_syscalls_create_matching_event_notifiers(syscall_event_enabler);
-       if (ret)
-               return ret;
-
        if (!syscall_table->sys_enter_registered) {
                ret = lttng_wrapper_tracepoint_probe_register("sys_enter",
                                (void *) syscall_entry_event_probe, syscall_table);
@@ -884,128 +839,8 @@ int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enab
                syscall_table->sys_exit_registered = 1;
        }
 
-       return ret;
-}
-
-static
-void create_unknown_event_notifier(
-               struct lttng_event_notifier_enabler *event_notifier_enabler,
-               enum sc_type type)
-{
-       struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(&event_notifier_enabler->parent);
-       struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_notifier_enabler->parent);
-       struct lttng_kernel_event_common_private *event_priv;
-       const struct lttng_kernel_event_desc *desc;
-       struct hlist_head *unknown_dispatch_list;
-       bool found = false;
-       struct hlist_head *head;
-
-       switch (type) {
-       case SC_TYPE_ENTRY:
-               desc = &__event_desc___syscall_entry_unknown;
-               unknown_dispatch_list = &syscall_table->unknown_syscall_dispatch;
-               break;
-       case SC_TYPE_EXIT:
-               desc = &__event_desc___syscall_exit_unknown;
-               unknown_dispatch_list = &syscall_table->unknown_syscall_exit_dispatch;
-               break;
-       case SC_TYPE_COMPAT_ENTRY:
-               desc = &__event_desc___compat_syscall_entry_unknown;
-               unknown_dispatch_list = &syscall_table->compat_unknown_syscall_dispatch;
-               break;
-       case SC_TYPE_COMPAT_EXIT:
-               desc = &__event_desc___compat_syscall_exit_unknown;
-               unknown_dispatch_list = &syscall_table->compat_unknown_syscall_exit_dispatch;
-               break;
-       default:
-               WARN_ON_ONCE(1);
-       }
-
-       /*
-        * Check if already created.
-        */
-       head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name);
-       lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
-               if (lttng_event_enabler_desc_match_event(&event_notifier_enabler->parent, desc, event_priv->pub))
-                       found = true;
-       }
-       if (!found)
-               lttng_syscall_event_enabler_create_event(&event_notifier_enabler->parent, desc, unknown_dispatch_list, type, -1U);
-}
-
-static
-void create_matching_event_notifiers(
-               struct lttng_event_notifier_enabler *syscall_event_notifier_enabler,
-               const struct trace_syscall_entry *table,
-               size_t table_len, enum sc_type type)
-{
-       struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&syscall_event_notifier_enabler->parent);
-       const struct lttng_kernel_event_desc *desc;
-       unsigned int i;
-
-       /* iterate over all syscall and create event_notifier that match */
-       for (i = 0; i < table_len; i++) {
-               struct lttng_kernel_event_common_private *event_priv;
-               struct hlist_head *head;
-               int found = 0;
+       lttng_syscall_event_enabler_create_matching_events(syscall_event_enabler);
 
-               desc = table[i].desc;
-               if (!desc) {
-                       /* Unknown syscall */
-                       continue;
-               }
-
-               if (!lttng_desc_match_enabler(desc,
-                               lttng_event_notifier_enabler_as_enabler(syscall_event_notifier_enabler)))
-                       continue;
-
-               /*
-                * Check if already created.
-                */
-               head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name);
-               lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
-                       if (lttng_event_enabler_desc_match_event(&syscall_event_notifier_enabler->parent, desc, event_priv->pub))
-                               found = 1;
-               }
-               if (found)
-                       continue;
-
-               lttng_syscall_event_enabler_create_event(&syscall_event_notifier_enabler->parent, desc, NULL, type, i);
-       }
-}
-
-static
-int lttng_syscalls_create_matching_event_notifiers(struct lttng_event_enabler_common *event_enabler)
-{
-       int ret;
-       enum lttng_kernel_abi_syscall_entryexit entryexit =
-                       event_enabler->event_param.u.syscall.entryexit;
-       struct lttng_event_notifier_enabler *event_notifier_enabler;
-
-       if (event_enabler->enabler_type != LTTNG_EVENT_ENABLER_TYPE_NOTIFIER)
-               return 0;
-       event_notifier_enabler = container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
-
-       if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
-               create_matching_event_notifiers(event_notifier_enabler,
-                       sc_table.table, sc_table.len, SC_TYPE_ENTRY);
-               create_matching_event_notifiers(event_notifier_enabler,
-                       compat_sc_table.table, compat_sc_table.len,
-                       SC_TYPE_COMPAT_ENTRY);
-               create_unknown_event_notifier(event_notifier_enabler, SC_TYPE_ENTRY);
-               create_unknown_event_notifier(event_notifier_enabler, SC_TYPE_COMPAT_ENTRY);
-       }
-
-       if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
-               create_matching_event_notifiers(event_notifier_enabler,
-                       sc_exit_table.table, sc_exit_table.len,
-                       SC_TYPE_EXIT);
-               create_matching_event_notifiers(event_notifier_enabler,
-                       compat_sc_exit_table.table, compat_sc_exit_table.len,
-                       SC_TYPE_COMPAT_EXIT);
-               create_unknown_event_notifier(event_notifier_enabler, SC_TYPE_EXIT);
-               create_unknown_event_notifier(event_notifier_enabler, SC_TYPE_COMPAT_EXIT);
-       }
        return ret;
 }
 
@@ -1192,6 +1027,8 @@ int lttng_syscall_filter_enable(
 int lttng_syscall_filter_enable_event(struct lttng_kernel_event_common *event)
 {
        struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_event(event);
+       unsigned int syscall_id = event->priv->u.syscall.syscall_id;
+       struct hlist_head *dispatch_list;
        int ret;
 
        WARN_ON_ONCE(event->priv->instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
@@ -1202,53 +1039,39 @@ int lttng_syscall_filter_enable_event(struct lttng_kernel_event_common *event)
        if (ret)
                return ret;
 
-       switch (event->type) {
-       case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+       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_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;
-                       }
+       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_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;
-                       }
+               case LTTNG_SYSCALL_ABI_COMPAT:
+                       dispatch_list = &syscall_table->compat_syscall_exit_dispatch[syscall_id];
                        break;
                default:
                        ret = -EINVAL;
                        goto end;
                }
-
-               hlist_add_head_rcu(&event->priv->u.syscall.node, dispatch_list);
                break;
-       }
        default:
-               WARN_ON_ONCE(1);
-               return -ENOSYS;
+               ret = -EINVAL;
+               goto end;
        }
+
+       hlist_add_head_rcu(&event->priv->u.syscall.node, dispatch_list);
 end:
        return ret;
 }
@@ -1322,19 +1145,7 @@ int lttng_syscall_filter_disable_event(struct lttng_kernel_event_common *event)
                event->priv->u.syscall.entryexit);
        if (ret)
                return ret;
-
-       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;
-       }
+       hlist_del_rcu(&event->priv->u.syscall.node);
        return 0;
 }
 
@@ -1344,15 +1155,8 @@ void lttng_syscall_table_set_wildcard_all(struct lttng_event_enabler_common *eve
        enum lttng_kernel_abi_syscall_entryexit entryexit;
        int enabled = event_enabler->enabled;
 
-       if (event_enabler->event_param.instrumentation != LTTNG_KERNEL_ABI_SYSCALL)
+       if (!lttng_syscall_event_enabler_is_wildcard_all(event_enabler))
                return;
-       if (event_enabler->event_param.u.syscall.abi != LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL)
-               return;
-       if (event_enabler->event_param.u.syscall.match != LTTNG_KERNEL_ABI_SYSCALL_MATCH_NAME)
-               return;
-       if (strcmp(event_enabler->event_param.name, "*"))
-               return;
-
        entryexit = event_enabler->event_param.u.syscall.entryexit;
        if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT)
                WRITE_ONCE(syscall_table->syscall_all_entry, enabled);
This page took 0.030115 seconds and 4 git commands to generate.