Refactoring: syscall tracing: combine common fields into struct lttng_kernel_syscall_...

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

diff --git a/src/lttng-events.c b/src/lttng-events.c
index 230e393446735edcfaef947c274a39faa0d6f891..e40c1db23d1871074e354b824b3997149d718d7e 100644 (file)
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -66,7 +66,6 @@ static struct kmem_cache *event_notifier_private_cache;
 
 static void lttng_session_lazy_sync_event_enablers(struct lttng_kernel_session *session);
 static void lttng_session_sync_event_enablers(struct lttng_kernel_session *session);
-static void lttng_event_enabler_destroy(struct lttng_event_enabler *event_enabler);
 static void lttng_event_notifier_enabler_destroy(struct lttng_event_notifier_enabler *event_notifier_enabler);
 static void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group *event_notifier_group);
 
@@ -425,7 +424,7 @@ void lttng_event_notifier_group_destroy(
 
        irq_work_sync(&event_notifier_group->wakeup_pending);
 
-       kfree(event_notifier_group->sc_filter);
+       kfree(event_notifier_group->syscall_table.sc_filter);
 
        list_for_each_entry_safe(event_notifier_enabler, tmp_event_notifier_enabler,
                        &event_notifier_group->enablers_head, node)
@@ -860,11 +859,12 @@ void _lttng_metadata_channel_hangup(struct lttng_metadata_stream *stream)
  * Supports event creation while tracing session is active.
  * Needs to be called with sessions mutex held.
  */
-struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_kernel_channel_buffer *chan,
-                               struct lttng_kernel_abi_event *event_param,
-                               const struct lttng_kernel_event_desc *event_desc,
-                               enum lttng_kernel_abi_instrumentation itype)
+struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_event_enabler *event_enabler,
+                               const struct lttng_kernel_event_desc *event_desc)
 {
+       struct lttng_kernel_channel_buffer *chan = event_enabler->chan;
+       struct lttng_kernel_abi_event *event_param = &event_enabler->parent.event_param;
+       enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation;
        struct lttng_kernel_session *session = chan->parent.session;
        struct lttng_kernel_event_recorder *event_recorder;
        struct lttng_kernel_event_recorder_private *event_recorder_priv;
@@ -1395,15 +1395,13 @@ int lttng_kernel_counter_clear(struct lttng_counter *counter,
        return counter->ops->counter_clear(counter->counter, dim_indexes);
 }
 
-struct lttng_kernel_event_recorder *lttng_kernel_event_recorder_create(struct lttng_kernel_channel_buffer *chan,
-                               struct lttng_kernel_abi_event *event_param,
-                               const struct lttng_kernel_event_desc *event_desc,
-                               enum lttng_kernel_abi_instrumentation itype)
+struct lttng_kernel_event_recorder *lttng_kernel_event_recorder_create(struct lttng_event_enabler *event_enabler,
+                               const struct lttng_kernel_event_desc *event_desc)
 {
        struct lttng_kernel_event_recorder *event;
 
        mutex_lock(&sessions_mutex);
-       event = _lttng_kernel_event_recorder_create(chan, event_param, event_desc, itype);
+       event = _lttng_kernel_event_recorder_create(event_enabler, event_desc);
        mutex_unlock(&sessions_mutex);
        return event;
 }
@@ -1980,7 +1978,7 @@ int lttng_match_enabler_name(const char *desc_name,
 }
 
 int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc,
-               struct lttng_enabler *enabler)
+               struct lttng_event_enabler_common *enabler)
 {
        const char *desc_name, *enabler_name;
        bool compat = false, entry = false;
@@ -2072,7 +2070,7 @@ static
 int lttng_event_enabler_match_event(struct lttng_event_enabler *event_enabler,
                struct lttng_kernel_event_recorder *event_recorder)
 {
-       struct lttng_enabler *base_enabler = lttng_event_enabler_as_enabler(
+       struct lttng_event_enabler_common *base_enabler = lttng_event_enabler_as_enabler(
                event_enabler);
 
        if (base_enabler->event_param.instrumentation != event_recorder->priv->parent.instrumentation)
@@ -2088,14 +2086,14 @@ static
 int lttng_event_notifier_enabler_match_event_notifier(struct lttng_event_notifier_enabler *event_notifier_enabler,
                struct lttng_kernel_event_notifier *event_notifier)
 {
-       struct lttng_enabler *base_enabler = lttng_event_notifier_enabler_as_enabler(
+       struct lttng_event_enabler_common *base_enabler = lttng_event_notifier_enabler_as_enabler(
                event_notifier_enabler);
 
        if (base_enabler->event_param.instrumentation != event_notifier->priv->parent.instrumentation)
                return 0;
        if (lttng_desc_match_enabler(event_notifier->priv->parent.desc, base_enabler)
                        && event_notifier->priv->group == event_notifier_enabler->group
-                       && event_notifier->priv->parent.user_token == event_notifier_enabler->base.user_token)
+                       && event_notifier->priv->parent.user_token == event_notifier_enabler->parent.user_token)
                return 1;
        else
                return 0;
@@ -2104,7 +2102,7 @@ int lttng_event_notifier_enabler_match_event_notifier(struct lttng_event_notifie
 static
 struct lttng_enabler_ref *lttng_enabler_ref(
                struct list_head *enablers_ref_list,
-               struct lttng_enabler *enabler)
+               struct lttng_event_enabler_common *enabler)
 {
        struct lttng_enabler_ref *enabler_ref;
 
@@ -2160,8 +2158,7 @@ void lttng_create_tracepoint_event_if_missing(struct lttng_event_enabler *event_
                         * We need to create an event for this
                         * event probe.
                         */
-                       event_recorder = _lttng_kernel_event_recorder_create(event_enabler->chan,
-                                       NULL, desc, LTTNG_KERNEL_ABI_TRACEPOINT);
+                       event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc);
                        if (!event_recorder) {
                                printk(KERN_INFO "LTTng: Unable to create event %s\n",
                                        probe_desc->event_desc[i]->event_name);
@@ -2205,7 +2202,7 @@ void lttng_create_tracepoint_event_notifier_if_missing(struct lttng_event_notifi
                                LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name);
                        lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) {
                                if (event_notifier_priv->parent.desc == desc
-                                               && event_notifier_priv->parent.user_token == event_notifier_enabler->base.user_token)
+                                               && event_notifier_priv->parent.user_token == event_notifier_enabler->parent.user_token)
                                        found = 1;
                        }
                        if (found)
@@ -2215,7 +2212,7 @@ void lttng_create_tracepoint_event_notifier_if_missing(struct lttng_event_notifi
                         * We need to create a event_notifier for this event probe.
                         */
                        event_notifier = _lttng_event_notifier_create(desc,
-                               event_notifier_enabler->base.user_token,
+                               event_notifier_enabler->parent.user_token,
                                event_notifier_enabler->error_counter_index,
                                event_notifier_group, NULL,
                                LTTNG_KERNEL_ABI_TRACEPOINT);
@@ -2255,7 +2252,7 @@ void lttng_create_syscall_event_notifier_if_missing(struct lttng_event_notifier_
 static
 void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler)
 {
-       switch (event_enabler->base.event_param.instrumentation) {
+       switch (event_enabler->parent.event_param.instrumentation) {
        case LTTNG_KERNEL_ABI_TRACEPOINT:
                lttng_create_tracepoint_event_if_missing(event_enabler);
                break;
@@ -2280,7 +2277,7 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
 {
        struct lttng_kernel_channel_buffer *chan = event_enabler->chan;
        struct lttng_kernel_session *session = event_enabler->chan->parent.session;
-       struct lttng_enabler *base_enabler = lttng_event_enabler_as_enabler(event_enabler);
+       struct lttng_event_enabler_common *base_enabler = lttng_event_enabler_as_enabler(event_enabler);
        struct lttng_kernel_event_recorder_private *event_recorder_priv;
 
        if (base_enabler->event_param.instrumentation == LTTNG_KERNEL_ABI_SYSCALL &&
@@ -2291,10 +2288,10 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
                enum lttng_kernel_abi_syscall_entryexit entryexit = base_enabler->event_param.u.syscall.entryexit;
 
                if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT)
-                       WRITE_ONCE(chan->priv->parent.syscall_all_entry, enabled);
+                       WRITE_ONCE(chan->priv->parent.syscall_table.syscall_all_entry, enabled);
 
                if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT)
-                       WRITE_ONCE(chan->priv->parent.syscall_all_exit, enabled);
+                       WRITE_ONCE(chan->priv->parent.syscall_table.syscall_all_exit, enabled);
        }
 
        /* First ensure that probe events are created for this enabler. */
@@ -2341,7 +2338,7 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
 static
 void lttng_create_event_notifier_if_missing(struct lttng_event_notifier_enabler *event_notifier_enabler)
 {
-       switch (event_notifier_enabler->base.event_param.instrumentation) {
+       switch (event_notifier_enabler->parent.event_param.instrumentation) {
        case LTTNG_KERNEL_ABI_TRACEPOINT:
                lttng_create_tracepoint_event_notifier_if_missing(event_notifier_enabler);
                break;
@@ -2364,7 +2361,7 @@ int lttng_event_notifier_enabler_ref_event_notifiers(
                struct lttng_event_notifier_enabler *event_notifier_enabler)
 {
        struct lttng_event_notifier_group *event_notifier_group = event_notifier_enabler->group;
-       struct lttng_enabler *base_enabler = lttng_event_notifier_enabler_as_enabler(event_notifier_enabler);
+       struct lttng_event_enabler_common *base_enabler = lttng_event_notifier_enabler_as_enabler(event_notifier_enabler);
        struct lttng_kernel_event_notifier_private *event_notifier_priv;
 
        if (base_enabler->event_param.instrumentation == LTTNG_KERNEL_ABI_SYSCALL &&
@@ -2376,10 +2373,10 @@ int lttng_event_notifier_enabler_ref_event_notifiers(
                enum lttng_kernel_abi_syscall_entryexit entryexit = base_enabler->event_param.u.syscall.entryexit;
 
                if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT)
-                       WRITE_ONCE(event_notifier_group->syscall_all_entry, enabled);
+                       WRITE_ONCE(event_notifier_group->syscall_table.syscall_all_entry, enabled);
 
                if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT)
-                       WRITE_ONCE(event_notifier_group->syscall_all_exit, enabled);
+                       WRITE_ONCE(event_notifier_group->syscall_table.syscall_all_exit, enabled);
 
        }
 
@@ -2449,7 +2446,7 @@ static bool lttng_event_notifier_group_has_active_event_notifiers(
 
        list_for_each_entry(event_notifier_enabler, &event_notifier_group->enablers_head,
                        node) {
-               if (event_notifier_enabler->base.enabled)
+               if (event_notifier_enabler->parent.enabled)
                        return true;
        }
        return false;
@@ -2485,18 +2482,25 @@ struct lttng_event_enabler *lttng_event_enabler_create(
        event_enabler = kzalloc(sizeof(*event_enabler), GFP_KERNEL);
        if (!event_enabler)
                return NULL;
-       event_enabler->base.format_type = format_type;
-       INIT_LIST_HEAD(&event_enabler->base.filter_bytecode_head);
-       memcpy(&event_enabler->base.event_param, event_param,
-               sizeof(event_enabler->base.event_param));
+       event_enabler->parent.enabler_type = LTTNG_EVENT_ENABLER_TYPE_RECORDER;
+       event_enabler->parent.format_type = format_type;
+       INIT_LIST_HEAD(&event_enabler->parent.filter_bytecode_head);
+       memcpy(&event_enabler->parent.event_param, event_param,
+               sizeof(event_enabler->parent.event_param));
        event_enabler->chan = chan;
        /* ctx left NULL */
-       event_enabler->base.enabled = 0;
+       event_enabler->parent.enabled = 0;
+       return event_enabler;
+}
+
+void lttng_event_enabler_session_add(struct lttng_kernel_session *session,
+               struct lttng_event_enabler *event_enabler)
+{
        mutex_lock(&sessions_mutex);
-       list_add(&event_enabler->node, &event_enabler->chan->parent.session->priv->enablers_head);
-       lttng_session_lazy_sync_event_enablers(event_enabler->chan->parent.session);
+       list_add(&event_enabler->node, &session->priv->enablers_head);
+       event_enabler->published = true;
+       lttng_session_lazy_sync_event_enablers(session);
        mutex_unlock(&sessions_mutex);
-       return event_enabler;
 }
 
 int lttng_event_enabler_enable(struct lttng_event_enabler *event_enabler)
@@ -2518,7 +2522,7 @@ int lttng_event_enabler_disable(struct lttng_event_enabler *event_enabler)
 }
 
 static
-int lttng_enabler_attach_filter_bytecode(struct lttng_enabler *enabler,
+int lttng_enabler_attach_filter_bytecode(struct lttng_event_enabler_common *enabler,
                struct lttng_kernel_abi_filter_bytecode __user *bytecode)
 {
        struct lttng_kernel_bytecode_node *bytecode_node;
@@ -2579,7 +2583,7 @@ int lttng_event_add_callsite(struct lttng_kernel_event_common *event,
 }
 
 static
-void lttng_enabler_destroy(struct lttng_enabler *enabler)
+void lttng_enabler_destroy(struct lttng_event_enabler_common *enabler)
 {
        struct lttng_kernel_bytecode_node *filter_node, *tmp_filter_node;
 
@@ -2590,12 +2594,12 @@ void lttng_enabler_destroy(struct lttng_enabler *enabler)
        }
 }
 
-static
 void lttng_event_enabler_destroy(struct lttng_event_enabler *event_enabler)
 {
        lttng_enabler_destroy(lttng_event_enabler_as_enabler(event_enabler));
 
-       list_del(&event_enabler->node);
+       if (event_enabler->published)
+               list_del(&event_enabler->node);
        kfree(event_enabler);
 }
 
@@ -2610,18 +2614,19 @@ struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create(
        if (!event_notifier_enabler)
                return NULL;
 
-       event_notifier_enabler->base.format_type = format_type;
-       INIT_LIST_HEAD(&event_notifier_enabler->base.filter_bytecode_head);
+       event_notifier_enabler->parent.enabler_type = LTTNG_EVENT_ENABLER_TYPE_NOTIFIER;
+       event_notifier_enabler->parent.format_type = format_type;
+       INIT_LIST_HEAD(&event_notifier_enabler->parent.filter_bytecode_head);
        INIT_LIST_HEAD(&event_notifier_enabler->capture_bytecode_head);
 
        event_notifier_enabler->error_counter_index = event_notifier_param->error_counter_index;
        event_notifier_enabler->num_captures = 0;
 
-       memcpy(&event_notifier_enabler->base.event_param, &event_notifier_param->event,
-               sizeof(event_notifier_enabler->base.event_param));
+       memcpy(&event_notifier_enabler->parent.event_param, &event_notifier_param->event,
+               sizeof(event_notifier_enabler->parent.event_param));
 
-       event_notifier_enabler->base.enabled = 0;
-       event_notifier_enabler->base.user_token = event_notifier_param->event.token;
+       event_notifier_enabler->parent.enabled = 0;
+       event_notifier_enabler->parent.user_token = event_notifier_param->event.token;
        event_notifier_enabler->group = event_notifier_group;
 
        mutex_lock(&sessions_mutex);
@@ -2677,7 +2682,7 @@ int lttng_event_notifier_enabler_attach_capture_bytecode(
                struct lttng_kernel_abi_capture_bytecode __user *bytecode)
 {
        struct lttng_kernel_bytecode_node *bytecode_node;
-       struct lttng_enabler *enabler =
+       struct lttng_event_enabler_common *enabler =
                        lttng_event_notifier_enabler_as_enabler(event_notifier_enabler);
        uint32_t bytecode_len;
        int ret;