Add `struct trace_syscall_table`
[lttng-modules.git] / src / lttng-syscalls.c
index d4914037392219e38bd5a29be2bace941b7a288c..2b469cb5b1c3fbb59a967b53e8a0d5fd6938a6f2 100644 (file)
 #include <wrapper/rcu.h>
 #include <wrapper/syscall.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <lttng/utils.h>
 
+#include "lttng-syscalls.h"
+
 #ifndef CONFIG_COMPAT
 # ifndef is_compat_task
 #  define is_compat_task()     (0)
@@ -291,14 +294,6 @@ typedef __kernel_old_time_t time_t;
 #undef LTTNG_PACKAGE_BUILD
 #undef CREATE_TRACE_POINTS
 
-struct trace_syscall_entry {
-       void *event_func;
-       void *event_notifier_func;
-       const struct lttng_kernel_event_desc *desc;
-       const struct lttng_kernel_event_field **fields;
-       unsigned int nrargs;
-};
-
 #define CREATE_SYSCALL_TABLE
 
 #define SC_ENTER
@@ -310,34 +305,43 @@ struct trace_syscall_entry {
 #define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs)    \
        [ _nr ] = {                                             \
                .event_func = __event_probe__syscall_entry_##_template, \
-               .event_notifier_func = __event_notifier_probe__syscall_entry_##_template, \
                .nrargs = (_nrargs),                            \
                .fields = __event_fields___syscall_entry_##_template, \
                .desc = &__event_desc___syscall_entry_##_name,  \
        },
 
 /* Event syscall enter tracing table */
-static const struct trace_syscall_entry sc_table[] = {
+static const struct trace_syscall_entry _sc_table[] = {
 #include <instrumentation/syscalls/headers/syscalls_integers.h>
 #include <instrumentation/syscalls/headers/syscalls_pointers.h>
 };
 
+
+const struct trace_syscall_table sc_table = {
+       .table = _sc_table,
+       .len = ARRAY_SIZE(_sc_table),
+};
+
 #undef TRACE_SYSCALL_TABLE
 #define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs)    \
        [ _nr ] = {                                             \
                .event_func = __event_probe__compat_syscall_entry_##_template, \
-               .event_notifier_func = __event_notifier_probe__compat_syscall_entry_##_template, \
                .nrargs = (_nrargs),                            \
                .fields = __event_fields___compat_syscall_entry_##_template, \
                .desc = &__event_desc___compat_syscall_entry_##_name, \
        },
 
 /* Event compat syscall enter table */
-const struct trace_syscall_entry compat_sc_table[] = {
+const struct trace_syscall_entry _compat_sc_table[] = {
 #include <instrumentation/syscalls/headers/compat_syscalls_integers.h>
 #include <instrumentation/syscalls/headers/compat_syscalls_pointers.h>
 };
 
+const struct trace_syscall_table compat_sc_table = {
+       .table = _compat_sc_table,
+       .len = ARRAY_SIZE(_compat_sc_table),
+};
+
 #undef SC_ENTER
 
 #define SC_EXIT
@@ -349,34 +353,43 @@ const struct trace_syscall_entry compat_sc_table[] = {
 #define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs)    \
        [ _nr ] = {                                             \
                .event_func = __event_probe__syscall_exit_##_template, \
-               .event_notifier_func = __event_notifier_probe__syscall_exit_##_template, \
                .nrargs = (_nrargs),                            \
                .fields = __event_fields___syscall_exit_##_template, \
                .desc = &__event_desc___syscall_exit_##_name, \
        },
 
 /* Event syscall exit table */
-static const struct trace_syscall_entry sc_exit_table[] = {
+static const struct trace_syscall_entry _sc_exit_table[] = {
 #include <instrumentation/syscalls/headers/syscalls_integers.h>
 #include <instrumentation/syscalls/headers/syscalls_pointers.h>
 };
 
+const struct trace_syscall_table sc_exit_table = {
+       .table = _sc_exit_table,
+       .len = ARRAY_SIZE(_sc_exit_table),
+};
+
+
 #undef TRACE_SYSCALL_TABLE
 #define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs)    \
        [ _nr ] = {                                             \
                .event_func = __event_probe__compat_syscall_exit_##_template, \
-               .event_notifier_func = __event_notifier_probe__compat_syscall_exit_##_template, \
                .nrargs = (_nrargs),                            \
                .fields = __event_fields___compat_syscall_exit_##_template, \
                .desc = &__event_desc___compat_syscall_exit_##_name, \
        },
 
 /* Event compat syscall exit table */
-const struct trace_syscall_entry compat_sc_exit_table[] = {
+const struct trace_syscall_entry _compat_sc_exit_table[] = {
 #include <instrumentation/syscalls/headers/compat_syscalls_integers.h>
 #include <instrumentation/syscalls/headers/compat_syscalls_pointers.h>
 };
 
+const struct trace_syscall_table compat_sc_exit_table = {
+       .table = _compat_sc_exit_table,
+       .len = ARRAY_SIZE(_compat_sc_exit_table),
+};
+
 #undef SC_EXIT
 
 #undef CREATE_SYSCALL_TABLE
@@ -396,59 +409,15 @@ static void syscall_entry_event_unknown(struct hlist_head *unknown_action_list_h
 
        lttng_syscall_get_arguments(current, regs, args);
        lttng_hlist_for_each_entry_rcu(event_priv, unknown_action_list_head, u.syscall.node) {
-               struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                       container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-               struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
-               if (unlikely(in_compat_syscall()))
-                       __event_probe__compat_syscall_entry_unknown(event_recorder, id, args);
-               else
-                       __event_probe__syscall_entry_unknown(event_recorder, id, args);
-       }
-}
-
-static void syscall_entry_event_notifier_unknown(
-               struct hlist_head *unknown_dispatch_list_head,
-               struct pt_regs *regs, long id)
-{
-       unsigned long args[LTTNG_SYSCALL_NR_ARGS];
-       struct lttng_kernel_event_common_private *event_priv;
-
-       lttng_syscall_get_arguments(current, regs, args);
-       lttng_hlist_for_each_entry_rcu(event_priv, unknown_dispatch_list_head, u.syscall.node) {
-               struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                       container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-               struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
                if (unlikely(in_compat_syscall()))
-                       __event_notifier_probe__compat_syscall_entry_unknown(event_notifier, id, args);
+                       __event_probe__compat_syscall_entry_unknown(event_priv->pub, id, args);
                else
-                       __event_notifier_probe__syscall_entry_unknown(event_notifier, id, args);
-       }
-}
-
-static void syscall_exit_event_notifier_unknown(
-               struct hlist_head *unknown_dispatch_list_head,
-               struct pt_regs *regs, long id, long ret)
-{
-       unsigned long args[LTTNG_SYSCALL_NR_ARGS];
-       struct lttng_kernel_event_common_private *event_priv;
-
-       lttng_syscall_get_arguments(current, regs, args);
-       lttng_hlist_for_each_entry_rcu(event_priv, unknown_dispatch_list_head, u.syscall.node) {
-               struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                       container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-               struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
-               if (unlikely(in_compat_syscall()))
-                       __event_notifier_probe__compat_syscall_exit_unknown(event_notifier, id, ret, args);
-               else
-                       __event_notifier_probe__syscall_exit_unknown(event_notifier, id, ret, args);
+                       __event_probe__syscall_entry_unknown(event_priv->pub, id, args);
        }
 }
 
 static __always_inline
-void syscall_entry_call_func(struct hlist_head *action_list,
+void syscall_entry_event_call_func(struct hlist_head *action_list,
                void *func, unsigned int nrargs,
                struct pt_regs *regs)
 {
@@ -459,13 +428,8 @@ void syscall_entry_call_func(struct hlist_head *action_list,
        {
                void (*fptr)(void *__data) = func;
 
-               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
-                       struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                               container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-                       struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
-                       fptr(event_recorder);
-               }
+               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node)
+                       fptr(event_priv->pub);
                break;
        }
        case 1:
@@ -474,13 +438,8 @@ void syscall_entry_call_func(struct hlist_head *action_list,
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
                lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
-                       struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                               container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-                       struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
-                       fptr(event_recorder, args[0]);
-               }
+               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node)
+                       fptr(event_priv->pub, args[0]);
                break;
        }
        case 2:
@@ -491,13 +450,8 @@ void syscall_entry_call_func(struct hlist_head *action_list,
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
                lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
-                       struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                               container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-                       struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
-                       fptr(event_recorder, args[0], args[1]);
-               }
+               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node)
+                       fptr(event_priv->pub, args[0], args[1]);
                break;
        }
        case 3:
@@ -509,13 +463,8 @@ void syscall_entry_call_func(struct hlist_head *action_list,
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
                lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
-                       struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                               container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-                       struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
-                       fptr(event_recorder, args[0], args[1], args[2]);
-               }
+               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node)
+                       fptr(event_priv->pub, args[0], args[1], args[2]);
                break;
        }
        case 4:
@@ -528,13 +477,8 @@ void syscall_entry_call_func(struct hlist_head *action_list,
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
                lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
-                       struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                               container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-                       struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
-                       fptr(event_recorder, args[0], args[1], args[2], args[3]);
-               }
+               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node)
+                       fptr(event_priv->pub, args[0], args[1], args[2], args[3]);
                break;
        }
        case 5:
@@ -548,13 +492,8 @@ void syscall_entry_call_func(struct hlist_head *action_list,
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
                lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
-                       struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                               container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-                       struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
-                       fptr(event_recorder, args[0], args[1], args[2], args[3], args[4]);
-               }
+               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node)
+                       fptr(event_priv->pub, args[0], args[1], args[2], args[3], args[4]);
                break;
        }
        case 6:
@@ -569,149 +508,9 @@ void syscall_entry_call_func(struct hlist_head *action_list,
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
                lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
-                       struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                               container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-                       struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
-                       fptr(event_recorder, args[0], args[1], args[2],
+               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node)
+                       fptr(event_priv->pub, args[0], args[1], args[2],
                             args[3], args[4], args[5]);
-               }
-               break;
-       }
-       default:
-               break;
-       }
-}
-
-static __always_inline
-void syscall_entry_event_notifier_call_func(struct hlist_head *dispatch_list,
-               void *func, unsigned int nrargs, struct pt_regs *regs)
-{
-       struct lttng_kernel_event_common_private *event_priv;
-
-       switch (nrargs) {
-       case 0:
-       {
-               void (*fptr)(void *__data) = func;
-
-               lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
-                       struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                               container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-                       struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
-                       fptr(event_notifier);
-               }
-               break;
-       }
-       case 1:
-       {
-               void (*fptr)(void *__data, unsigned long arg0) = func;
-               unsigned long args[LTTNG_SYSCALL_NR_ARGS];
-
-               lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
-                       struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                               container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-                       struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
-                       fptr(event_notifier, args[0]);
-               }
-               break;
-       }
-       case 2:
-       {
-               void (*fptr)(void *__data,
-                       unsigned long arg0,
-                       unsigned long arg1) = func;
-               unsigned long args[LTTNG_SYSCALL_NR_ARGS];
-
-               lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
-                       struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                               container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-                       struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
-                       fptr(event_notifier, args[0], args[1]);
-               }
-               break;
-       }
-       case 3:
-       {
-               void (*fptr)(void *__data,
-                       unsigned long arg0,
-                       unsigned long arg1,
-                       unsigned long arg2) = func;
-               unsigned long args[LTTNG_SYSCALL_NR_ARGS];
-
-               lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
-                       struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                               container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-                       struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
-                       fptr(event_notifier, args[0], args[1], args[2]);
-               }
-               break;
-       }
-       case 4:
-       {
-               void (*fptr)(void *__data,
-                       unsigned long arg0,
-                       unsigned long arg1,
-                       unsigned long arg2,
-                       unsigned long arg3) = func;
-               unsigned long args[LTTNG_SYSCALL_NR_ARGS];
-
-               lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
-                       struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                               container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-                       struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
-                       fptr(event_notifier, args[0], args[1], args[2], args[3]);
-               }
-               break;
-       }
-       case 5:
-       {
-               void (*fptr)(void *__data,
-                       unsigned long arg0,
-                       unsigned long arg1,
-                       unsigned long arg2,
-                       unsigned long arg3,
-                       unsigned long arg4) = func;
-               unsigned long args[LTTNG_SYSCALL_NR_ARGS];
-
-               lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
-                       struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                               container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-                       struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
-                       fptr(event_notifier, args[0], args[1], args[2], args[3], args[4]);
-               }
-               break;
-       }
-       case 6:
-       {
-               void (*fptr)(void *__data,
-                       unsigned long arg0,
-                       unsigned long arg1,
-                       unsigned long arg2,
-                       unsigned long arg3,
-                       unsigned long arg4,
-                       unsigned long arg5) = func;
-               unsigned long args[LTTNG_SYSCALL_NR_ARGS];
-
-               lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
-                       struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                               container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-                       struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
-                       fptr(event_notifier, args[0], args[1], args[2], args[3], args[4], args[5]);
-               }
                break;
        }
        default:
@@ -734,8 +533,8 @@ void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id)
                        /* System call filtered out. */
                        return;
                }
-               table = compat_sc_table;
-               table_len = ARRAY_SIZE(compat_sc_table);
+               table = compat_sc_table.table;
+               table_len = compat_sc_table.len;
                unknown_action_list = &chan->sc_compat_unknown;
        } else {
                struct lttng_syscall_filter *filter = chan->sc_filter;
@@ -745,8 +544,8 @@ void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id)
                        /* System call filtered out. */
                        return;
                }
-               table = sc_table;
-               table_len = ARRAY_SIZE(sc_table);
+               table = sc_table.table;
+               table_len = sc_table.len;
                unknown_action_list = &chan->sc_unknown;
        }
        if (unlikely(id < 0 || id >= table_len)) {
@@ -768,7 +567,7 @@ void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id)
        if (unlikely(hlist_empty(action_list)))
                return;
 
-       syscall_entry_call_func(action_list, entry->event_func, entry->nrargs, regs);
+       syscall_entry_event_call_func(action_list, entry->event_func, entry->nrargs, regs);
 }
 
 void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs,
@@ -788,8 +587,8 @@ void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs,
                        /* System call filtered out. */
                        return;
                }
-               table = compat_sc_table;
-               table_len = ARRAY_SIZE(compat_sc_table);
+               table = compat_sc_table.table;
+               table_len = compat_sc_table.len;
                unknown_dispatch_list = &group->event_notifier_compat_unknown_syscall_dispatch;
        } else {
                struct lttng_syscall_filter *filter = group->sc_filter;
@@ -800,20 +599,20 @@ void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs,
                        /* System call filtered out. */
                        return;
                }
-               table = sc_table;
-               table_len = ARRAY_SIZE(sc_table);
+               table = sc_table.table;
+               table_len = sc_table.len;
                unknown_dispatch_list = &group->event_notifier_unknown_syscall_dispatch;
        }
        /* Check if the syscall id is out of bound. */
        if (unlikely(id < 0 || id >= table_len)) {
-               syscall_entry_event_notifier_unknown(unknown_dispatch_list,
+               syscall_entry_event_unknown(unknown_dispatch_list,
                                regs, id);
                return;
        }
 
        entry = &table[id];
-       if (!entry->event_notifier_func) {
-               syscall_entry_event_notifier_unknown(unknown_dispatch_list,
+       if (!entry->event_func) {
+               syscall_entry_event_unknown(unknown_dispatch_list,
                                regs, id);
                return;
        }
@@ -826,8 +625,8 @@ void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs,
        if (unlikely(hlist_empty(dispatch_list)))
                return;
 
-       syscall_entry_event_notifier_call_func(dispatch_list,
-                       entry->event_notifier_func, entry->nrargs, regs);
+       syscall_entry_event_call_func(dispatch_list,
+                       entry->event_func, entry->nrargs, regs);
 }
 
 static void syscall_exit_event_unknown(struct hlist_head *unknown_action_list_head,
@@ -838,20 +637,16 @@ static void syscall_exit_event_unknown(struct hlist_head *unknown_action_list_he
 
        lttng_syscall_get_arguments(current, regs, args);
        lttng_hlist_for_each_entry_rcu(event_priv, unknown_action_list_head, u.syscall.node) {
-               struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                       container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-               struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
                if (unlikely(in_compat_syscall()))
-                       __event_probe__compat_syscall_exit_unknown(event_recorder, id, ret,
+                       __event_probe__compat_syscall_exit_unknown(event_priv->pub, id, ret,
                                args);
                else
-                       __event_probe__syscall_exit_unknown(event_recorder, id, ret, args);
+                       __event_probe__syscall_exit_unknown(event_priv->pub, id, ret, args);
        }
 }
 
 static __always_inline
-void syscall_exit_call_func(struct hlist_head *action_list,
+void syscall_exit_event_call_func(struct hlist_head *action_list,
                void *func, unsigned int nrargs,
                struct pt_regs *regs, long ret)
 {
@@ -862,13 +657,8 @@ void syscall_exit_call_func(struct hlist_head *action_list,
        {
                void (*fptr)(void *__data, long ret) = func;
 
-               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
-                       struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                               container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-                       struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
-                       fptr(event_recorder, ret);
-               }
+               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node)
+                       fptr(event_priv->pub, ret);
                break;
        }
        case 1:
@@ -879,13 +669,8 @@ void syscall_exit_call_func(struct hlist_head *action_list,
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
                lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
-                       struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                               container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-                       struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
-                       fptr(event_recorder, ret, args[0]);
-               }
+               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node)
+                       fptr(event_priv->pub, ret, args[0]);
                break;
        }
        case 2:
@@ -897,13 +682,8 @@ void syscall_exit_call_func(struct hlist_head *action_list,
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
                lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
-                       struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                               container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-                       struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
-                       fptr(event_recorder, ret, args[0], args[1]);
-               }
+               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node)
+                       fptr(event_priv->pub, ret, args[0], args[1]);
                break;
        }
        case 3:
@@ -916,13 +696,8 @@ void syscall_exit_call_func(struct hlist_head *action_list,
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
                lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
-                       struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                               container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-                       struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
-                       fptr(event_recorder, ret, args[0], args[1], args[2]);
-               }
+               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node)
+                       fptr(event_priv->pub, ret, args[0], args[1], args[2]);
                break;
        }
        case 4:
@@ -936,13 +711,8 @@ void syscall_exit_call_func(struct hlist_head *action_list,
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
                lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
-                       struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                               container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-                       struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
-                       fptr(event_recorder, ret, args[0], args[1], args[2], args[3]);
-               }
+               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node)
+                       fptr(event_priv->pub, ret, args[0], args[1], args[2], args[3]);
                break;
        }
        case 5:
@@ -957,13 +727,8 @@ void syscall_exit_call_func(struct hlist_head *action_list,
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
                lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
-                       struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                               container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-                       struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
-                       fptr(event_recorder, ret, args[0], args[1], args[2], args[3], args[4]);
-               }
+               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node)
+                       fptr(event_priv->pub, ret, args[0], args[1], args[2], args[3], args[4]);
                break;
        }
        case 6:
@@ -979,14 +744,9 @@ void syscall_exit_call_func(struct hlist_head *action_list,
                unsigned long args[LTTNG_SYSCALL_NR_ARGS];
 
                lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
-                       struct lttng_kernel_event_recorder_private *event_recorder_priv =
-                               container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
-                       struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
-
-                       fptr(event_recorder, ret, args[0], args[1], args[2],
+               lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node)
+                       fptr(event_priv->pub, ret, args[0], args[1], args[2],
                             args[3], args[4], args[5]);
-               }
                break;
        }
        default:
@@ -1012,8 +772,8 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret)
                        /* System call filtered out. */
                        return;
                }
-               table = compat_sc_exit_table;
-               table_len = ARRAY_SIZE(compat_sc_exit_table);
+               table = compat_sc_exit_table.table;
+               table_len = compat_sc_exit_table.len;
                unknown_action_list = &chan->compat_sc_exit_unknown;
        } else {
                struct lttng_syscall_filter *filter = chan->sc_filter;
@@ -1023,8 +783,8 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret)
                        /* System call filtered out. */
                        return;
                }
-               table = sc_exit_table;
-               table_len = ARRAY_SIZE(sc_exit_table);
+               table = sc_exit_table.table;
+               table_len = sc_exit_table.len;
                unknown_action_list = &chan->sc_exit_unknown;
        }
        if (unlikely(id < 0 || id >= table_len)) {
@@ -1046,150 +806,10 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret)
        if (unlikely(hlist_empty(action_list)))
                return;
 
-       syscall_exit_call_func(action_list, entry->event_func, entry->nrargs,
+       syscall_exit_event_call_func(action_list, entry->event_func, entry->nrargs,
                               regs, ret);
 }
 
-static __always_inline
-void syscall_exit_event_notifier_call_func(struct hlist_head *dispatch_list,
-               void *func, unsigned int nrargs, struct pt_regs *regs, long ret)
-{
-       struct lttng_kernel_event_common_private *event_priv;
-
-       switch (nrargs) {
-       case 0:
-       {
-               void (*fptr)(void *__data, long ret) = func;
-
-               lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
-                       struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                               container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-                       struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
-                       fptr(event_notifier, ret);
-               }
-               break;
-       }
-       case 1:
-       {
-               void (*fptr)(void *__data, long ret, unsigned long arg0) = func;
-               unsigned long args[LTTNG_SYSCALL_NR_ARGS];
-
-               lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
-                       struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                               container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-                       struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
-                       fptr(event_notifier, ret, args[0]);
-               }
-               break;
-       }
-       case 2:
-       {
-               void (*fptr)(void *__data,
-                       long ret,
-                       unsigned long arg0,
-                       unsigned long arg1) = func;
-               unsigned long args[LTTNG_SYSCALL_NR_ARGS];
-
-               lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
-                       struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                               container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-                       struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
-                       fptr(event_notifier, ret, args[0], args[1]);
-               }
-               break;
-       }
-       case 3:
-       {
-               void (*fptr)(void *__data,
-                       long ret,
-                       unsigned long arg0,
-                       unsigned long arg1,
-                       unsigned long arg2) = func;
-               unsigned long args[LTTNG_SYSCALL_NR_ARGS];
-
-               lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
-                       struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                               container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-                       struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
-                       fptr(event_notifier, ret, args[0], args[1], args[2]);
-               }
-               break;
-       }
-       case 4:
-       {
-               void (*fptr)(void *__data,
-                       long ret,
-                       unsigned long arg0,
-                       unsigned long arg1,
-                       unsigned long arg2,
-                       unsigned long arg3) = func;
-               unsigned long args[LTTNG_SYSCALL_NR_ARGS];
-
-               lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
-                       struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                               container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-                       struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
-                       fptr(event_notifier, ret, args[0], args[1], args[2], args[3]);
-               }
-               break;
-       }
-       case 5:
-       {
-               void (*fptr)(void *__data,
-                       long ret,
-                       unsigned long arg0,
-                       unsigned long arg1,
-                       unsigned long arg2,
-                       unsigned long arg3,
-                       unsigned long arg4) = func;
-               unsigned long args[LTTNG_SYSCALL_NR_ARGS];
-
-               lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
-                       struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                               container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-                       struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
-                       fptr(event_notifier, ret, args[0], args[1], args[2], args[3], args[4]);
-               }
-               break;
-       }
-       case 6:
-       {
-               void (*fptr)(void *__data,
-                       long ret,
-                       unsigned long arg0,
-                       unsigned long arg1,
-                       unsigned long arg2,
-                       unsigned long arg3,
-                       unsigned long arg4,
-                       unsigned long arg5) = func;
-               unsigned long args[LTTNG_SYSCALL_NR_ARGS];
-
-               lttng_syscall_get_arguments(current, regs, args);
-               lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
-                       struct lttng_kernel_event_notifier_private *event_notifier_priv =
-                               container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
-                       struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
-
-                       fptr(event_notifier, ret, args[0], args[1], args[2], args[3], args[4], args[5]);
-               }
-               break;
-       }
-       default:
-               break;
-       }
-}
-
 static
 void syscall_exit_event_notifier_probe(void *__data, struct pt_regs *regs,
                long ret)
@@ -1211,8 +831,8 @@ void syscall_exit_event_notifier_probe(void *__data, struct pt_regs *regs,
                        /* System call filtered out. */
                        return;
                }
-               table = compat_sc_exit_table;
-               table_len = ARRAY_SIZE(compat_sc_exit_table);
+               table = compat_sc_exit_table.table;
+               table_len = compat_sc_exit_table.len;
                unknown_dispatch_list = &group->event_notifier_exit_compat_unknown_syscall_dispatch;
        } else {
                struct lttng_syscall_filter *filter = group->sc_filter;
@@ -1223,20 +843,20 @@ void syscall_exit_event_notifier_probe(void *__data, struct pt_regs *regs,
                        /* System call filtered out. */
                        return;
                }
-               table = sc_exit_table;
-               table_len = ARRAY_SIZE(sc_exit_table);
+               table = sc_exit_table.table;
+               table_len = sc_exit_table.len;
                unknown_dispatch_list = &group->event_notifier_exit_unknown_syscall_dispatch;
        }
        /* Check if the syscall id is out of bound. */
        if (unlikely(id < 0 || id >= table_len)) {
-               syscall_exit_event_notifier_unknown(unknown_dispatch_list,
+               syscall_exit_event_unknown(unknown_dispatch_list,
                                regs, id, ret);
                return;
        }
 
        entry = &table[id];
-       if (!entry->event_notifier_func) {
-               syscall_entry_event_notifier_unknown(unknown_dispatch_list,
+       if (!entry->event_func) {
+               syscall_entry_event_unknown(unknown_dispatch_list,
                                regs, id);
                return;
        }
@@ -1249,8 +869,8 @@ void syscall_exit_event_notifier_probe(void *__data, struct pt_regs *regs,
        if (unlikely(hlist_empty(dispatch_list)))
                return;
 
-       syscall_exit_event_notifier_call_func(dispatch_list,
-                       entry->event_notifier_func, entry->nrargs, regs, ret);
+       syscall_exit_event_call_func(dispatch_list,
+                       entry->event_func, entry->nrargs, regs, ret);
 }
 /*
  * noinline to diminish caller stack size.
@@ -1262,7 +882,7 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl
        enum sc_type type)
 {
        struct lttng_channel *chan = event_enabler->chan;
-       struct lttng_session *session = chan->session;
+       struct lttng_kernel_session *session = chan->session;
        unsigned int i;
 
        /* Allocate events for each syscall matching enabler, insert into table */
@@ -1285,7 +905,7 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl
                 * Check if already created.
                 */
                head = utils_borrow_hash_table_bucket(
-                       session->events_ht.table, LTTNG_EVENT_HT_SIZE,
+                       session->priv->events_ht.table, LTTNG_EVENT_HT_SIZE,
                        desc->event_name);
                lttng_hlist_for_each_entry(event_recorder_priv, head, hlist) {
                        if (event_recorder_priv->parent.desc == desc
@@ -1348,14 +968,14 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler)
        if (!chan->sc_table) {
                /* create syscall table mapping syscall to events */
                chan->sc_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
-                                       * ARRAY_SIZE(sc_table), GFP_KERNEL);
+                                       * sc_table.len, GFP_KERNEL);
                if (!chan->sc_table)
                        return -ENOMEM;
        }
        if (!chan->sc_exit_table) {
                /* create syscall table mapping syscall to events */
                chan->sc_exit_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
-                                       * ARRAY_SIZE(sc_exit_table), GFP_KERNEL);
+                                       * sc_exit_table.len, GFP_KERNEL);
                if (!chan->sc_exit_table)
                        return -ENOMEM;
        }
@@ -1365,7 +985,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler)
        if (!chan->compat_sc_table) {
                /* create syscall table mapping compat syscall to events */
                chan->compat_sc_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
-                                       * ARRAY_SIZE(compat_sc_table), GFP_KERNEL);
+                                       * compat_sc_table.len, GFP_KERNEL);
                if (!chan->compat_sc_table)
                        return -ENOMEM;
        }
@@ -1373,7 +993,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler)
        if (!chan->compat_sc_exit_table) {
                /* create syscall table mapping compat syscall to events */
                chan->compat_sc_exit_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
-                                       * ARRAY_SIZE(compat_sc_exit_table), GFP_KERNEL);
+                                       * compat_sc_exit_table.len, GFP_KERNEL);
                if (!chan->compat_sc_exit_table)
                        return -ENOMEM;
        }
@@ -1458,21 +1078,21 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler)
                hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->sc_exit_unknown);
        }
 
-       ret = lttng_create_syscall_event_if_missing(sc_table, ARRAY_SIZE(sc_table),
+       ret = lttng_create_syscall_event_if_missing(sc_table.table, sc_table.len,
                        chan->sc_table, event_enabler, SC_TYPE_ENTRY);
        if (ret)
                return ret;
-       ret = lttng_create_syscall_event_if_missing(sc_exit_table, ARRAY_SIZE(sc_exit_table),
+       ret = lttng_create_syscall_event_if_missing(sc_exit_table.table, sc_exit_table.len,
                        chan->sc_exit_table, event_enabler, SC_TYPE_EXIT);
        if (ret)
                return ret;
 
 #ifdef CONFIG_COMPAT
-       ret = lttng_create_syscall_event_if_missing(compat_sc_table, ARRAY_SIZE(compat_sc_table),
+       ret = lttng_create_syscall_event_if_missing(compat_sc_table.table, compat_sc_table.len,
                        chan->compat_sc_table, event_enabler, SC_TYPE_COMPAT_ENTRY);
        if (ret)
                return ret;
-       ret = lttng_create_syscall_event_if_missing(compat_sc_exit_table, ARRAY_SIZE(compat_sc_exit_table),
+       ret = lttng_create_syscall_event_if_missing(compat_sc_exit_table.table, compat_sc_exit_table.len,
                        chan->compat_sc_exit_table, event_enabler, SC_TYPE_COMPAT_EXIT);
        if (ret)
                return ret;
@@ -1523,13 +1143,13 @@ int lttng_syscalls_register_event_notifier(
 
        if (!group->event_notifier_syscall_dispatch) {
                group->event_notifier_syscall_dispatch =
-                               kzalloc(sizeof(struct hlist_head) * ARRAY_SIZE(sc_table),
+                               kzalloc(sizeof(struct hlist_head) * sc_table.len,
                                        GFP_KERNEL);
                if (!group->event_notifier_syscall_dispatch)
                        return -ENOMEM;
 
                /* Initialize all list_head */
-               for (i = 0; i < ARRAY_SIZE(sc_table); i++)
+               for (i = 0; i < sc_table.len; i++)
                        INIT_HLIST_HEAD(&group->event_notifier_syscall_dispatch[i]);
 
                /* Init the unknown syscall notifier list. */
@@ -1538,13 +1158,13 @@ int lttng_syscalls_register_event_notifier(
 
        if (!group->event_notifier_exit_syscall_dispatch) {
                group->event_notifier_exit_syscall_dispatch =
-                               kzalloc(sizeof(struct hlist_head) * ARRAY_SIZE(sc_table),
+                               kzalloc(sizeof(struct hlist_head) * sc_table.len,
                                        GFP_KERNEL);
                if (!group->event_notifier_exit_syscall_dispatch)
                        return -ENOMEM;
 
                /* Initialize all list_head */
-               for (i = 0; i < ARRAY_SIZE(sc_table); i++)
+               for (i = 0; i < sc_table.len; i++)
                        INIT_HLIST_HEAD(&group->event_notifier_exit_syscall_dispatch[i]);
 
                /* Init the unknown exit syscall notifier list. */
@@ -1554,13 +1174,13 @@ int lttng_syscalls_register_event_notifier(
 #ifdef CONFIG_COMPAT
        if (!group->event_notifier_compat_syscall_dispatch) {
                group->event_notifier_compat_syscall_dispatch =
-                               kzalloc(sizeof(struct hlist_head) * ARRAY_SIZE(compat_sc_table),
+                               kzalloc(sizeof(struct hlist_head) * compat_sc_table.len,
                                        GFP_KERNEL);
                if (!group->event_notifier_syscall_dispatch)
                        return -ENOMEM;
 
                /* Initialize all list_head */
-               for (i = 0; i < ARRAY_SIZE(compat_sc_table); i++)
+               for (i = 0; i < compat_sc_table.len; i++)
                        INIT_HLIST_HEAD(&group->event_notifier_compat_syscall_dispatch[i]);
 
                /* Init the unknown syscall notifier list. */
@@ -1569,13 +1189,13 @@ int lttng_syscalls_register_event_notifier(
 
        if (!group->event_notifier_exit_compat_syscall_dispatch) {
                group->event_notifier_exit_compat_syscall_dispatch =
-                               kzalloc(sizeof(struct hlist_head) * ARRAY_SIZE(compat_sc_exit_table),
+                               kzalloc(sizeof(struct hlist_head) * compat_sc_exit_table.len,
                                        GFP_KERNEL);
                if (!group->event_notifier_exit_syscall_dispatch)
                        return -ENOMEM;
 
                /* Initialize all list_head */
-               for (i = 0; i < ARRAY_SIZE(compat_sc_exit_table); i++)
+               for (i = 0; i < compat_sc_exit_table.len; i++)
                        INIT_HLIST_HEAD(&group->event_notifier_exit_compat_syscall_dispatch[i]);
 
                /* Init the unknown exit syscall notifier list. */
@@ -1797,12 +1417,12 @@ int lttng_syscalls_create_matching_event_notifiers(
 
        if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
                ret = create_matching_event_notifiers(event_notifier_enabler,
-                       sc_table, ARRAY_SIZE(sc_table), SC_TYPE_ENTRY);
+                       sc_table.table, sc_table.len, SC_TYPE_ENTRY);
                if (ret)
                        goto end;
 
                ret = create_matching_event_notifiers(event_notifier_enabler,
-                       compat_sc_table, ARRAY_SIZE(compat_sc_table),
+                       compat_sc_table.table, compat_sc_table.len,
                        SC_TYPE_COMPAT_ENTRY);
                if (ret)
                        goto end;
@@ -1820,7 +1440,7 @@ int lttng_syscalls_create_matching_event_notifiers(
 
        if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
                ret = create_matching_event_notifiers(event_notifier_enabler,
-                       sc_exit_table, ARRAY_SIZE(sc_exit_table),
+                       sc_exit_table.table, sc_exit_table.len,
                        SC_TYPE_EXIT);
                if (ret)
                        goto end;
@@ -1831,7 +1451,7 @@ int lttng_syscalls_create_matching_event_notifiers(
                        goto end;
 
                ret = create_matching_event_notifiers(event_notifier_enabler,
-                       compat_sc_exit_table, ARRAY_SIZE(compat_sc_exit_table),
+                       compat_sc_exit_table.table, compat_sc_exit_table.len,
                        SC_TYPE_COMPAT_EXIT);
                if (ret)
                        goto end;
@@ -1924,11 +1544,11 @@ int get_syscall_nr(const char *syscall_name)
        int syscall_nr = -1;
        int i;
 
-       for (i = 0; i < ARRAY_SIZE(sc_table); i++) {
+       for (i = 0; i < sc_table.len; i++) {
                const struct trace_syscall_entry *entry;
                const char *it_name;
 
-               entry = &sc_table[i];
+               entry = &sc_table.table[i];
                if (!entry->desc)
                        continue;
                it_name = entry->desc->event_name;
@@ -1947,11 +1567,11 @@ int get_compat_syscall_nr(const char *syscall_name)
        int syscall_nr = -1;
        int i;
 
-       for (i = 0; i < ARRAY_SIZE(compat_sc_table); i++) {
+       for (i = 0; i < compat_sc_table.len; i++) {
                const struct trace_syscall_entry *entry;
                const char *it_name;
 
-               entry = &compat_sc_table[i];
+               entry = &compat_sc_table.table[i];
                if (!entry->desc)
                        continue;
                it_name = entry->desc->event_name;
@@ -1967,7 +1587,7 @@ int get_compat_syscall_nr(const char *syscall_name)
 static
 uint32_t get_sc_tables_len(void)
 {
-       return ARRAY_SIZE(sc_table) + ARRAY_SIZE(compat_sc_table);
+       return sc_table.len + compat_sc_table.len;
 }
 
 static
@@ -2225,14 +1845,14 @@ const struct trace_syscall_entry *syscall_list_get_entry(loff_t *pos)
        const struct trace_syscall_entry *entry;
        int iter = 0;
 
-       for (entry = sc_table;
-                       entry < sc_table + ARRAY_SIZE(sc_table);
+       for (entry = sc_table.table;
+                       entry < sc_table.table + sc_table.len;
                         entry++) {
                if (iter++ >= *pos)
                        return entry;
        }
-       for (entry = compat_sc_table;
-                       entry < compat_sc_table + ARRAY_SIZE(compat_sc_table);
+       for (entry = compat_sc_table.table;
+                       entry < compat_sc_table.table + compat_sc_table.len;
                         entry++) {
                if (iter++ >= *pos)
                        return entry;
@@ -2264,21 +1884,21 @@ int get_sc_table(const struct trace_syscall_entry *entry,
                const struct trace_syscall_entry **table,
                unsigned int *bitness)
 {
-       if (entry >= sc_table && entry < sc_table + ARRAY_SIZE(sc_table)) {
+       if (entry >= sc_table.table && entry < sc_table.table + sc_table.len) {
                if (bitness)
                        *bitness = BITS_PER_LONG;
                if (table)
-                       *table = sc_table;
+                       *table = sc_table.table;
                return 0;
        }
-       if (!(entry >= compat_sc_table
-                       && entry < compat_sc_table + ARRAY_SIZE(compat_sc_table))) {
+       if (!(entry >= compat_sc_table.table
+                       && entry < compat_sc_table.table + compat_sc_table.len)) {
                return -EINVAL;
        }
        if (bitness)
                *bitness = 32;
        if (table)
-               *table = compat_sc_table;
+               *table = compat_sc_table.table;
        return 0;
 }
 
@@ -2296,11 +1916,11 @@ int syscall_list_show(struct seq_file *m, void *p)
                return ret;
        if (!entry->desc)
                return 0;
-       if (table == sc_table) {
+       if (table == sc_table.table) {
                index = entry - table;
                name = &entry->desc->event_name[strlen(SYSCALL_ENTRY_STR)];
        } else {
-               index = (entry - table) + ARRAY_SIZE(sc_table);
+               index = (entry - table) + sc_table.len;
                name = &entry->desc->event_name[strlen(COMPAT_SYSCALL_ENTRY_STR)];
        }
        seq_printf(m,   "syscall { index = %lu; name = %s; bitness = %u; };\n",
@@ -2355,7 +1975,7 @@ long lttng_channel_syscall_mask(struct lttng_channel *channel,
                return -ENOMEM;
        filter = channel->sc_filter;
 
-       for (bit = 0; bit < ARRAY_SIZE(sc_table); bit++) {
+       for (bit = 0; bit < sc_table.len; bit++) {
                char state;
 
                if (channel->sc_table) {
@@ -2376,9 +1996,9 @@ long lttng_channel_syscall_mask(struct lttng_channel *channel,
                if (channel->compat_sc_table) {
                        if (!(READ_ONCE(channel->syscall_all_entry)
                                        || READ_ONCE(channel->syscall_all_exit)) && filter)
-                               state = test_bit(bit - ARRAY_SIZE(sc_table),
+                               state = test_bit(bit - sc_table.len,
                                                filter->sc_compat_entry)
-                                       || test_bit(bit - ARRAY_SIZE(sc_table),
+                                       || test_bit(bit - sc_table.len,
                                                filter->sc_compat_exit);
                        else
                                state = 1;
This page took 0.039891 seconds and 4 git commands to generate.