Fix: syscall tracing: missing trigger actions
[lttng-modules.git] / src / lttng-syscalls.c
index d4914037392219e38bd5a29be2bace941b7a288c..202745b8a5f2dcaa066f16b3ad3067fbf00942e9 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)
@@ -59,15 +62,11 @@ enum sc_type {
 #define SYSCALL_EXIT_STR               __stringify(SYSCALL_EXIT_TOK)
 #define COMPAT_SYSCALL_EXIT_STR                __stringify(COMPAT_SYSCALL_EXIT_TOK)
 
-static
 void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id);
-static
 void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret);
 
-static
 void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs,
                long id);
-static
 void syscall_exit_event_notifier_probe(void *__data, struct pt_regs *regs,
                long ret);
 
@@ -117,265 +116,15 @@ typedef __kernel_old_time_t time_t;
 #include <instrumentation/syscalls/headers/syscalls_unknown.h>
 #undef TRACE_SYSTEM
 
-#define SC_ENTER
-
-#undef sc_exit
-#define sc_exit(...)
-#undef sc_in
-#define sc_in(...)     __VA_ARGS__
-#undef sc_out
-#define sc_out(...)
-#undef sc_inout
-#define sc_inout(...)  __VA_ARGS__
-
-/* Hijack probe callback for system call enter */
-#undef TP_PROBE_CB
-#define TP_PROBE_CB(_template)         &syscall_entry_event_probe
-#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _fields) \
-       LTTNG_TRACEPOINT_EVENT(syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \
-               PARAMS(_fields))
-#define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code_pre, _fields, _code_post) \
-       LTTNG_TRACEPOINT_EVENT_CODE(syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \
-               PARAMS(_locvar), PARAMS(_code_pre),                             \
-               PARAMS(_fields), PARAMS(_code_post))
-#define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields) \
-       LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscall_entry_##_name, PARAMS(_fields))
-#define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name)            \
-       LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscall_entry_##_template, syscall_entry_##_name)
-/* Enumerations only defined at first inclusion. */
-#define SC_LTTNG_TRACEPOINT_ENUM(_name, _values) \
-       LTTNG_TRACEPOINT_ENUM(_name, PARAMS(_values))
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM syscall_entry_integers
-#define TRACE_INCLUDE_FILE syscalls_integers
-#include <instrumentation/syscalls/headers/syscalls_integers.h>
-#undef TRACE_INCLUDE_FILE
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM syscall_entry_pointers
-#define TRACE_INCLUDE_FILE syscalls_pointers
-#include <instrumentation/syscalls/headers/syscalls_pointers.h>
-#undef TRACE_INCLUDE_FILE
-#undef TRACE_SYSTEM
-#undef SC_LTTNG_TRACEPOINT_ENUM
-#undef SC_LTTNG_TRACEPOINT_EVENT_CODE
-#undef SC_LTTNG_TRACEPOINT_EVENT
-#undef SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS
-#undef SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS
-#undef TP_PROBE_CB
-#undef _TRACE_SYSCALLS_INTEGERS_H
-#undef _TRACE_SYSCALLS_POINTERS_H
-
-/* Hijack probe callback for compat system call enter */
-#define TP_PROBE_CB(_template)         &syscall_entry_event_probe
-#define LTTNG_SC_COMPAT
-#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _fields) \
-       LTTNG_TRACEPOINT_EVENT(compat_syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \
-               PARAMS(_fields))
-#define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code_pre, _fields, _code_post) \
-       LTTNG_TRACEPOINT_EVENT_CODE(compat_syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \
-               PARAMS(_locvar), PARAMS(_code_pre), PARAMS(_fields), PARAMS(_code_post))
-#define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields) \
-       LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(compat_syscall_entry_##_name, PARAMS(_fields))
-#define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name)            \
-       LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(compat_syscall_entry_##_template, \
-               compat_syscall_entry_##_name)
-/* Enumerations only defined at inital inclusion (not here). */
-#define SC_LTTNG_TRACEPOINT_ENUM(_name, _values)
-#define TRACE_SYSTEM compat_syscall_entry_integers
-#define TRACE_INCLUDE_FILE compat_syscalls_integers
-#include <instrumentation/syscalls/headers/compat_syscalls_integers.h>
-#undef TRACE_INCLUDE_FILE
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM compat_syscall_entry_pointers
-#define TRACE_INCLUDE_FILE compat_syscalls_pointers
-#include <instrumentation/syscalls/headers/compat_syscalls_pointers.h>
-#undef TRACE_INCLUDE_FILE
-#undef TRACE_SYSTEM
-#undef SC_LTTNG_TRACEPOINT_ENUM
-#undef SC_LTTNG_TRACEPOINT_EVENT_CODE
-#undef SC_LTTNG_TRACEPOINT_EVENT
-#undef SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS
-#undef SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS
-#undef TP_PROBE_CB
-#undef _TRACE_SYSCALLS_INTEGERS_H
-#undef _TRACE_SYSCALLS_POINTERS_H
-#undef LTTNG_SC_COMPAT
-
-#undef SC_ENTER
-
-#define SC_EXIT
-
-#undef sc_exit
-#define sc_exit(...)           __VA_ARGS__
-#undef sc_in
-#define sc_in(...)
-#undef sc_out
-#define sc_out(...)            __VA_ARGS__
-#undef sc_inout
-#define sc_inout(...)          __VA_ARGS__
-
-/* Hijack probe callback for system call exit */
-#define TP_PROBE_CB(_template)         &syscall_exit_event_probe
-#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _fields) \
-       LTTNG_TRACEPOINT_EVENT(syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \
-               PARAMS(_fields))
-#define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code_pre, _fields, _code_post) \
-       LTTNG_TRACEPOINT_EVENT_CODE(syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \
-               PARAMS(_locvar), PARAMS(_code_pre), PARAMS(_fields), PARAMS(_code_post))
-#define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields) \
-       LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscall_exit_##_name, PARAMS(_fields))
-#define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name)            \
-       LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscall_exit_##_template,        \
-               syscall_exit_##_name)
-/* Enumerations only defined at inital inclusion (not here). */
-#define SC_LTTNG_TRACEPOINT_ENUM(_name, _values)
-#define TRACE_SYSTEM syscall_exit_integers
-#define TRACE_INCLUDE_FILE syscalls_integers
-#include <instrumentation/syscalls/headers/syscalls_integers.h>
-#undef TRACE_INCLUDE_FILE
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM syscall_exit_pointers
-#define TRACE_INCLUDE_FILE syscalls_pointers
-#include <instrumentation/syscalls/headers/syscalls_pointers.h>
-#undef TRACE_INCLUDE_FILE
-#undef TRACE_SYSTEM
-#undef SC_LTTNG_TRACEPOINT_ENUM
-#undef SC_LTTNG_TRACEPOINT_EVENT_CODE
-#undef SC_LTTNG_TRACEPOINT_EVENT
-#undef SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS
-#undef SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS
-#undef TP_PROBE_CB
-#undef _TRACE_SYSCALLS_INTEGERS_H
-#undef _TRACE_SYSCALLS_POINTERS_H
-
-
-/* Hijack probe callback for compat system call exit */
-#define TP_PROBE_CB(_template)         &syscall_exit_event_probe
-#define LTTNG_SC_COMPAT
-#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _fields) \
-       LTTNG_TRACEPOINT_EVENT(compat_syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \
-               PARAMS(_fields))
-#define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code_pre, _fields, _code_post) \
-       LTTNG_TRACEPOINT_EVENT_CODE(compat_syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \
-               PARAMS(_locvar), PARAMS(_code_pre), PARAMS(_fields), PARAMS(_code_post))
-#define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields) \
-       LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(compat_syscall_exit_##_name, PARAMS(_fields))
-#define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name)            \
-       LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(compat_syscall_exit_##_template, \
-               compat_syscall_exit_##_name)
-/* Enumerations only defined at inital inclusion (not here). */
-#define SC_LTTNG_TRACEPOINT_ENUM(_name, _values)
-#define TRACE_SYSTEM compat_syscall_exit_integers
-#define TRACE_INCLUDE_FILE compat_syscalls_integers
-#include <instrumentation/syscalls/headers/compat_syscalls_integers.h>
-#undef TRACE_INCLUDE_FILE
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM compat_syscall_exit_pointers
-#define TRACE_INCLUDE_FILE compat_syscalls_pointers
-#include <instrumentation/syscalls/headers/compat_syscalls_pointers.h>
-#undef TRACE_INCLUDE_FILE
-#undef TRACE_SYSTEM
-#undef SC_LTTNG_TRACEPOINT_ENUM
-#undef SC_LTTNG_TRACEPOINT_EVENT_CODE
-#undef SC_LTTNG_TRACEPOINT_EVENT
-#undef SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS
-#undef SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS
 #undef TP_PROBE_CB
-#undef _TRACE_SYSCALLS_INTEGERS_H
-#undef _TRACE_SYSCALLS_POINTERS_H
-#undef LTTNG_SC_COMPAT
 
-#undef SC_EXIT
-
-#undef TP_MODULE_NOINIT
-#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
-
-#undef sc_exit
-#define sc_exit(...)
-
-#undef TRACE_SYSCALL_TABLE
-#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[] = {
-#include <instrumentation/syscalls/headers/syscalls_integers.h>
-#include <instrumentation/syscalls/headers/syscalls_pointers.h>
-};
-
-#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[] = {
-#include <instrumentation/syscalls/headers/compat_syscalls_integers.h>
-#include <instrumentation/syscalls/headers/compat_syscalls_pointers.h>
-};
-
-#undef SC_ENTER
-
-#define SC_EXIT
-
-#undef sc_exit
-#define sc_exit(...)           __VA_ARGS__
-
-#undef TRACE_SYSCALL_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, \
-       },
+extern const struct trace_syscall_table sc_table;
+extern const struct trace_syscall_table compat_sc_table;
 
 /* Event syscall 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>
-};
+extern const struct trace_syscall_table sc_exit_table;
+extern const struct trace_syscall_table compat_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[] = {
-#include <instrumentation/syscalls/headers/compat_syscalls_integers.h>
-#include <instrumentation/syscalls/headers/compat_syscalls_pointers.h>
-};
 
 #undef SC_EXIT
 
@@ -386,6 +135,15 @@ struct lttng_syscall_filter {
        DECLARE_BITMAP(sc_exit, NR_syscalls);
        DECLARE_BITMAP(sc_compat_entry, NR_compat_syscalls);
        DECLARE_BITMAP(sc_compat_exit, NR_compat_syscalls);
+
+       /*
+        * Reference counters keeping track of number of events enabled
+        * for each bit.
+        */
+       u32 sc_entry_refcount_map[NR_syscalls];
+       u32 sc_exit_refcount_map[NR_syscalls];
+       u32 sc_compat_entry_refcount_map[NR_compat_syscalls];
+       u32 sc_compat_exit_refcount_map[NR_compat_syscalls];
 };
 
 static void syscall_entry_event_unknown(struct hlist_head *unknown_action_list_head,
@@ -396,59 +154,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);
-               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);
+                       __event_probe__compat_syscall_entry_unknown(event_priv->pub, id, 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 +173,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 +183,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 +195,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 +208,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 +222,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 +237,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 +253,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:
@@ -721,33 +265,33 @@ void syscall_entry_event_notifier_call_func(struct hlist_head *dispatch_list,
 
 void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id)
 {
-       struct lttng_channel *chan = __data;
+       struct lttng_kernel_channel_buffer *chan = __data;
        struct hlist_head *action_list, *unknown_action_list;
        const struct trace_syscall_entry *table, *entry;
        size_t table_len;
 
        if (unlikely(in_compat_syscall())) {
-               struct lttng_syscall_filter *filter = chan->sc_filter;
+               struct lttng_syscall_filter *filter = chan->priv->parent.sc_filter;
 
                if (id < 0 || id >= NR_compat_syscalls
-                       || (!READ_ONCE(chan->syscall_all_entry) && !test_bit(id, filter->sc_compat_entry))) {
+                       || (!READ_ONCE(chan->priv->parent.syscall_all_entry) && !test_bit(id, filter->sc_compat_entry))) {
                        /* System call filtered out. */
                        return;
                }
-               table = compat_sc_table;
-               table_len = ARRAY_SIZE(compat_sc_table);
-               unknown_action_list = &chan->sc_compat_unknown;
+               table = compat_sc_table.table;
+               table_len = compat_sc_table.len;
+               unknown_action_list = &chan->priv->parent.sc_compat_unknown;
        } else {
-               struct lttng_syscall_filter *filter = chan->sc_filter;
+               struct lttng_syscall_filter *filter = chan->priv->parent.sc_filter;
 
                if (id < 0 || id >= NR_syscalls
-                       || (!READ_ONCE(chan->syscall_all_entry) && !test_bit(id, filter->sc_entry))) {
+                       || (!READ_ONCE(chan->priv->parent.syscall_all_entry) && !test_bit(id, filter->sc_entry))) {
                        /* System call filtered out. */
                        return;
                }
-               table = sc_table;
-               table_len = ARRAY_SIZE(sc_table);
-               unknown_action_list = &chan->sc_unknown;
+               table = sc_table.table;
+               table_len = sc_table.len;
+               unknown_action_list = &chan->priv->parent.sc_unknown;
        }
        if (unlikely(id < 0 || id >= table_len)) {
                syscall_entry_event_unknown(unknown_action_list, regs, id);
@@ -761,14 +305,14 @@ void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id)
        }
 
        if (unlikely(in_compat_syscall())) {
-               action_list = &chan->compat_sc_table[id];
+               action_list = &chan->priv->parent.compat_sc_table[id];
        } else {
-               action_list = &chan->sc_table[id];
+               action_list = &chan->priv->parent.sc_table[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 +332,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 +344,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 +370,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 +382,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 +402,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 +414,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 +427,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 +441,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 +456,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 +472,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 +489,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:
@@ -996,7 +501,7 @@ void syscall_exit_call_func(struct hlist_head *action_list,
 
 void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret)
 {
-       struct lttng_channel *chan = __data;
+       struct lttng_kernel_channel_buffer *chan = __data;
        struct hlist_head *action_list, *unknown_action_list;
        const struct trace_syscall_entry *table, *entry;
        size_t table_len;
@@ -1005,27 +510,27 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret)
        id = syscall_get_nr(current, regs);
 
        if (unlikely(in_compat_syscall())) {
-               struct lttng_syscall_filter *filter = chan->sc_filter;
+               struct lttng_syscall_filter *filter = chan->priv->parent.sc_filter;
 
                if (id < 0 || id >= NR_compat_syscalls
-                       || (!READ_ONCE(chan->syscall_all_exit) && !test_bit(id, filter->sc_compat_exit))) {
+                       || (!READ_ONCE(chan->priv->parent.syscall_all_exit) && !test_bit(id, filter->sc_compat_exit))) {
                        /* System call filtered out. */
                        return;
                }
-               table = compat_sc_exit_table;
-               table_len = ARRAY_SIZE(compat_sc_exit_table);
-               unknown_action_list = &chan->compat_sc_exit_unknown;
+               table = compat_sc_exit_table.table;
+               table_len = compat_sc_exit_table.len;
+               unknown_action_list = &chan->priv->parent.compat_sc_exit_unknown;
        } else {
-               struct lttng_syscall_filter *filter = chan->sc_filter;
+               struct lttng_syscall_filter *filter = chan->priv->parent.sc_filter;
 
                if (id < 0 || id >= NR_syscalls
-                       || (!READ_ONCE(chan->syscall_all_exit) && !test_bit(id, filter->sc_exit))) {
+                       || (!READ_ONCE(chan->priv->parent.syscall_all_exit) && !test_bit(id, filter->sc_exit))) {
                        /* System call filtered out. */
                        return;
                }
-               table = sc_exit_table;
-               table_len = ARRAY_SIZE(sc_exit_table);
-               unknown_action_list = &chan->sc_exit_unknown;
+               table = sc_exit_table.table;
+               table_len = sc_exit_table.len;
+               unknown_action_list = &chan->priv->parent.sc_exit_unknown;
        }
        if (unlikely(id < 0 || id >= table_len)) {
                syscall_exit_event_unknown(unknown_action_list, regs, id, ret);
@@ -1039,158 +544,17 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret)
        }
 
        if (unlikely(in_compat_syscall())) {
-               action_list = &chan->compat_sc_exit_table[id];
+               action_list = &chan->priv->parent.compat_sc_exit_table[id];
        } else {
-               action_list = &chan->sc_exit_table[id];
+               action_list = &chan->priv->parent.sc_exit_table[id];
        }
        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 +575,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 +587,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 +613,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.
@@ -1261,8 +625,8 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl
        struct hlist_head *chan_table, struct lttng_event_enabler *event_enabler,
        enum sc_type type)
 {
-       struct lttng_channel *chan = event_enabler->chan;
-       struct lttng_session *session = chan->session;
+       struct lttng_kernel_channel_buffer *chan = event_enabler->chan;
+       struct lttng_kernel_session *session = chan->parent.session;
        unsigned int i;
 
        /* Allocate events for each syscall matching enabler, insert into table */
@@ -1285,7 +649,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
@@ -1339,46 +703,46 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl
  */
 int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler)
 {
-       struct lttng_channel *chan = event_enabler->chan;
+       struct lttng_kernel_channel_buffer *chan = event_enabler->chan;
        struct lttng_kernel_abi_event ev;
        int ret;
 
        wrapper_vmalloc_sync_mappings();
 
-       if (!chan->sc_table) {
+       if (!chan->priv->parent.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);
-               if (!chan->sc_table)
+               chan->priv->parent.sc_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
+                                       * sc_table.len, GFP_KERNEL);
+               if (!chan->priv->parent.sc_table)
                        return -ENOMEM;
        }
-       if (!chan->sc_exit_table) {
+       if (!chan->priv->parent.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);
-               if (!chan->sc_exit_table)
+               chan->priv->parent.sc_exit_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
+                                       * sc_exit_table.len, GFP_KERNEL);
+               if (!chan->priv->parent.sc_exit_table)
                        return -ENOMEM;
        }
 
 
 #ifdef CONFIG_COMPAT
-       if (!chan->compat_sc_table) {
+       if (!chan->priv->parent.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);
-               if (!chan->compat_sc_table)
+               chan->priv->parent.compat_sc_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
+                                       * compat_sc_table.len, GFP_KERNEL);
+               if (!chan->priv->parent.compat_sc_table)
                        return -ENOMEM;
        }
 
-       if (!chan->compat_sc_exit_table) {
+       if (!chan->priv->parent.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);
-               if (!chan->compat_sc_exit_table)
+               chan->priv->parent.compat_sc_exit_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
+                                       * compat_sc_exit_table.len, GFP_KERNEL);
+               if (!chan->priv->parent.compat_sc_exit_table)
                        return -ENOMEM;
        }
 #endif
-       if (hlist_empty(&chan->sc_unknown)) {
+       if (hlist_empty(&chan->priv->parent.sc_unknown)) {
                const struct lttng_kernel_event_desc *desc =
                        &__event_desc___syscall_entry_unknown;
                struct lttng_kernel_event_recorder *event_recorder;
@@ -1395,10 +759,10 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler)
                if (IS_ERR(event_recorder)) {
                        return PTR_ERR(event_recorder);
                }
-               hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->sc_unknown);
+               hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->priv->parent.sc_unknown);
        }
 
-       if (hlist_empty(&chan->sc_compat_unknown)) {
+       if (hlist_empty(&chan->priv->parent.sc_compat_unknown)) {
                const struct lttng_kernel_event_desc *desc =
                        &__event_desc___compat_syscall_entry_unknown;
                struct lttng_kernel_event_recorder *event_recorder;
@@ -1415,10 +779,10 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler)
                if (IS_ERR(event_recorder)) {
                        return PTR_ERR(event_recorder);
                }
-               hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->sc_compat_unknown);
+               hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->priv->parent.sc_compat_unknown);
        }
 
-       if (hlist_empty(&chan->compat_sc_exit_unknown)) {
+       if (hlist_empty(&chan->priv->parent.compat_sc_exit_unknown)) {
                const struct lttng_kernel_event_desc *desc =
                        &__event_desc___compat_syscall_exit_unknown;
                struct lttng_kernel_event_recorder *event_recorder;
@@ -1435,10 +799,10 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler)
                if (IS_ERR(event_recorder)) {
                        return PTR_ERR(event_recorder);
                }
-               hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->compat_sc_exit_unknown);
+               hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->priv->parent.compat_sc_exit_unknown);
        }
 
-       if (hlist_empty(&chan->sc_exit_unknown)) {
+       if (hlist_empty(&chan->priv->parent.sc_exit_unknown)) {
                const struct lttng_kernel_event_desc *desc =
                        &__event_desc___syscall_exit_unknown;
                struct lttng_kernel_event_recorder *event_recorder;
@@ -1455,48 +819,48 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler)
                if (IS_ERR(event_recorder)) {
                        return PTR_ERR(event_recorder);
                }
-               hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->sc_exit_unknown);
+               hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->priv->parent.sc_exit_unknown);
        }
 
-       ret = lttng_create_syscall_event_if_missing(sc_table, ARRAY_SIZE(sc_table),
-                       chan->sc_table, event_enabler, SC_TYPE_ENTRY);
+       ret = lttng_create_syscall_event_if_missing(sc_table.table, sc_table.len,
+                       chan->priv->parent.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),
-                       chan->sc_exit_table, event_enabler, SC_TYPE_EXIT);
+       ret = lttng_create_syscall_event_if_missing(sc_exit_table.table, sc_exit_table.len,
+                       chan->priv->parent.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),
-                       chan->compat_sc_table, event_enabler, SC_TYPE_COMPAT_ENTRY);
+       ret = lttng_create_syscall_event_if_missing(compat_sc_table.table, compat_sc_table.len,
+                       chan->priv->parent.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),
-                       chan->compat_sc_exit_table, event_enabler, SC_TYPE_COMPAT_EXIT);
+       ret = lttng_create_syscall_event_if_missing(compat_sc_exit_table.table, compat_sc_exit_table.len,
+                       chan->priv->parent.compat_sc_exit_table, event_enabler, SC_TYPE_COMPAT_EXIT);
        if (ret)
                return ret;
 #endif
 
-       if (!chan->sc_filter) {
-               chan->sc_filter = kzalloc(sizeof(struct lttng_syscall_filter),
+       if (!chan->priv->parent.sc_filter) {
+               chan->priv->parent.sc_filter = kzalloc(sizeof(struct lttng_syscall_filter),
                                GFP_KERNEL);
-               if (!chan->sc_filter)
+               if (!chan->priv->parent.sc_filter)
                        return -ENOMEM;
        }
 
-       if (!chan->sys_enter_registered) {
+       if (!chan->priv->parent.sys_enter_registered) {
                ret = lttng_wrapper_tracepoint_probe_register("sys_enter",
                                (void *) syscall_entry_event_probe, chan);
                if (ret)
                        return ret;
-               chan->sys_enter_registered = 1;
+               chan->priv->parent.sys_enter_registered = 1;
        }
        /*
         * We change the name of sys_exit tracepoint due to namespace
         * conflict with sys_exit syscall entry.
         */
-       if (!chan->sys_exit_registered) {
+       if (!chan->priv->parent.sys_exit_registered) {
                ret = lttng_wrapper_tracepoint_probe_register("sys_exit",
                                (void *) syscall_exit_event_probe, chan);
                if (ret) {
@@ -1504,7 +868,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler)
                                (void *) syscall_entry_event_probe, chan));
                        return ret;
                }
-               chan->sys_exit_registered = 1;
+               chan->priv->parent.sys_exit_registered = 1;
        }
        return ret;
 }
@@ -1523,13 +887,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 +902,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 +918,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 +933,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 +1161,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 +1184,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 +1195,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;
@@ -1883,38 +1247,38 @@ int lttng_syscalls_unregister_event_notifier_group(
        return 0;
 }
 
-int lttng_syscalls_unregister_channel(struct lttng_channel *chan)
+int lttng_syscalls_unregister_channel(struct lttng_kernel_channel_buffer *chan)
 {
        int ret;
 
-       if (!chan->sc_table)
+       if (!chan->priv->parent.sc_table)
                return 0;
-       if (chan->sys_enter_registered) {
+       if (chan->priv->parent.sys_enter_registered) {
                ret = lttng_wrapper_tracepoint_probe_unregister("sys_enter",
                                (void *) syscall_entry_event_probe, chan);
                if (ret)
                        return ret;
-               chan->sys_enter_registered = 0;
+               chan->priv->parent.sys_enter_registered = 0;
        }
-       if (chan->sys_exit_registered) {
+       if (chan->priv->parent.sys_exit_registered) {
                ret = lttng_wrapper_tracepoint_probe_unregister("sys_exit",
                                (void *) syscall_exit_event_probe, chan);
                if (ret)
                        return ret;
-               chan->sys_exit_registered = 0;
+               chan->priv->parent.sys_exit_registered = 0;
        }
        return 0;
 }
 
-int lttng_syscalls_destroy_event(struct lttng_channel *chan)
+int lttng_syscalls_destroy_event(struct lttng_kernel_channel_buffer *chan)
 {
-       kfree(chan->sc_table);
-       kfree(chan->sc_exit_table);
+       kfree(chan->priv->parent.sc_table);
+       kfree(chan->priv->parent.sc_exit_table);
 #ifdef CONFIG_COMPAT
-       kfree(chan->compat_sc_table);
-       kfree(chan->compat_sc_exit_table);
+       kfree(chan->priv->parent.compat_sc_table);
+       kfree(chan->priv->parent.compat_sc_exit_table);
 #endif
-       kfree(chan->sc_filter);
+       kfree(chan->priv->parent.sc_filter);
        return 0;
 }
 
@@ -1924,11 +1288,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 +1311,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 +1331,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
@@ -2012,6 +1376,7 @@ int lttng_syscall_filter_enable(
 {
        const char *syscall_name;
        unsigned long *bitmap;
+       u32 *refcount_map;
        int syscall_nr;
 
        syscall_name = get_syscall_name(desc_name, abi, entryexit);
@@ -2034,9 +1399,11 @@ int lttng_syscall_filter_enable(
                switch (abi) {
                case LTTNG_SYSCALL_ABI_NATIVE:
                        bitmap = filter->sc_entry;
+                       refcount_map = filter->sc_entry_refcount_map;
                        break;
                case LTTNG_SYSCALL_ABI_COMPAT:
                        bitmap = filter->sc_compat_entry;
+                       refcount_map = filter->sc_compat_entry_refcount_map;
                        break;
                default:
                        return -EINVAL;
@@ -2046,9 +1413,11 @@ int lttng_syscall_filter_enable(
                switch (abi) {
                case LTTNG_SYSCALL_ABI_NATIVE:
                        bitmap = filter->sc_exit;
+                       refcount_map = filter->sc_exit_refcount_map;
                        break;
                case LTTNG_SYSCALL_ABI_COMPAT:
                        bitmap = filter->sc_compat_exit;
+                       refcount_map = filter->sc_compat_exit_refcount_map;
                        break;
                default:
                        return -EINVAL;
@@ -2057,9 +1426,10 @@ int lttng_syscall_filter_enable(
        default:
                return -EINVAL;
        }
-       if (test_bit(syscall_nr, bitmap))
-               return -EEXIST;
-       bitmap_set(bitmap, syscall_nr, 1);
+       if (refcount_map[syscall_nr] == U32_MAX)
+               return -EOVERFLOW;
+       if (refcount_map[syscall_nr]++ == 0)
+               bitmap_set(bitmap, syscall_nr, 1);
        return 0;
 }
 
@@ -2073,13 +1443,16 @@ int lttng_syscall_filter_enable_event_notifier(
 
        WARN_ON_ONCE(event_notifier->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
 
+       /* Skip unknown syscall */
+       if (syscall_id == -1U)
+               return 0;
+
        ret = lttng_syscall_filter_enable(group->sc_filter,
                event_notifier->priv->parent.desc->event_name,
                event_notifier->priv->parent.u.syscall.abi,
                event_notifier->priv->parent.u.syscall.entryexit);
-       if (ret) {
-               goto end;
-       }
+       if (ret)
+               return ret;
 
        switch (event_notifier->priv->parent.u.syscall.entryexit) {
        case LTTNG_SYSCALL_ENTRY:
@@ -2116,16 +1489,22 @@ int lttng_syscall_filter_enable_event_notifier(
        hlist_add_head_rcu(&event_notifier->priv->parent.u.syscall.node, dispatch_list);
 
 end:
-       return ret ;
+       return ret;
 }
 
 int lttng_syscall_filter_enable_event(
-               struct lttng_channel *channel,
+               struct lttng_kernel_channel_buffer *channel,
                struct lttng_kernel_event_recorder *event_recorder)
 {
+       unsigned int syscall_id = event_recorder->priv->parent.u.syscall.syscall_id;
+
        WARN_ON_ONCE(event_recorder->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
 
-       return lttng_syscall_filter_enable(channel->sc_filter,
+       /* Skip unknown syscall */
+       if (syscall_id == -1U)
+               return 0;
+
+       return lttng_syscall_filter_enable(channel->priv->parent.sc_filter,
                event_recorder->priv->parent.desc->event_name,
                event_recorder->priv->parent.u.syscall.abi,
                event_recorder->priv->parent.u.syscall.entryexit);
@@ -2139,6 +1518,7 @@ int lttng_syscall_filter_disable(
 {
        const char *syscall_name;
        unsigned long *bitmap;
+       u32 *refcount_map;
        int syscall_nr;
 
        syscall_name = get_syscall_name(desc_name, abi, entryexit);
@@ -2161,9 +1541,11 @@ int lttng_syscall_filter_disable(
                switch (abi) {
                case LTTNG_SYSCALL_ABI_NATIVE:
                        bitmap = filter->sc_entry;
+                       refcount_map = filter->sc_entry_refcount_map;
                        break;
                case LTTNG_SYSCALL_ABI_COMPAT:
                        bitmap = filter->sc_compat_entry;
+                       refcount_map = filter->sc_compat_entry_refcount_map;
                        break;
                default:
                        return -EINVAL;
@@ -2173,9 +1555,11 @@ int lttng_syscall_filter_disable(
                switch (abi) {
                case LTTNG_SYSCALL_ABI_NATIVE:
                        bitmap = filter->sc_exit;
+                       refcount_map = filter->sc_exit_refcount_map;
                        break;
                case LTTNG_SYSCALL_ABI_COMPAT:
                        bitmap = filter->sc_compat_exit;
+                       refcount_map = filter->sc_compat_exit_refcount_map;
                        break;
                default:
                        return -EINVAL;
@@ -2184,10 +1568,10 @@ int lttng_syscall_filter_disable(
        default:
                return -EINVAL;
        }
-       if (!test_bit(syscall_nr, bitmap))
-               return -EEXIST;
-       bitmap_clear(bitmap, syscall_nr, 1);
-
+       if (refcount_map[syscall_nr] == 0)
+               return -ENOENT;
+       if (--refcount_map[syscall_nr] == 0)
+               bitmap_clear(bitmap, syscall_nr, 1);
        return 0;
 }
 
@@ -2195,25 +1579,37 @@ int lttng_syscall_filter_disable_event_notifier(
                struct lttng_kernel_event_notifier *event_notifier)
 {
        struct lttng_event_notifier_group *group = event_notifier->priv->group;
+       unsigned int syscall_id = event_notifier->priv->parent.u.syscall.syscall_id;
        int ret;
 
        WARN_ON_ONCE(event_notifier->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
 
+       /* Skip unknown syscall */
+       if (syscall_id == -1U)
+               return 0;
+
        ret = lttng_syscall_filter_disable(group->sc_filter,
                event_notifier->priv->parent.desc->event_name,
                event_notifier->priv->parent.u.syscall.abi,
                event_notifier->priv->parent.u.syscall.entryexit);
-       WARN_ON_ONCE(ret != 0);
+       if (ret)
+               return ret;
 
        hlist_del_rcu(&event_notifier->priv->parent.u.syscall.node);
        return 0;
 }
 
 int lttng_syscall_filter_disable_event(
-               struct lttng_channel *channel,
+               struct lttng_kernel_channel_buffer *channel,
                struct lttng_kernel_event_recorder *event_recorder)
 {
-       return lttng_syscall_filter_disable(channel->sc_filter,
+       unsigned int syscall_id = event_recorder->priv->parent.u.syscall.syscall_id;
+
+       /* Skip unknown syscall */
+       if (syscall_id == -1U)
+               return 0;
+
+       return lttng_syscall_filter_disable(channel->priv->parent.sc_filter,
                event_recorder->priv->parent.desc->event_name,
                event_recorder->priv->parent.u.syscall.abi,
                event_recorder->priv->parent.u.syscall.entryexit);
@@ -2225,14 +1621,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 +1660,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 +1692,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",
@@ -2333,7 +1729,7 @@ const struct file_operations lttng_syscall_list_fops = {
 /*
  * A syscall is enabled if it is traced for either entry or exit.
  */
-long lttng_channel_syscall_mask(struct lttng_channel *channel,
+long lttng_channel_syscall_mask(struct lttng_kernel_channel_buffer *channel,
                struct lttng_kernel_abi_syscall_mask __user *usyscall_mask)
 {
        uint32_t len, sc_tables_len, bitmask_len;
@@ -2353,14 +1749,14 @@ long lttng_channel_syscall_mask(struct lttng_channel *channel,
        tmp_mask = kzalloc(bitmask_len, GFP_KERNEL);
        if (!tmp_mask)
                return -ENOMEM;
-       filter = channel->sc_filter;
+       filter = channel->priv->parent.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) {
-                       if (!(READ_ONCE(channel->syscall_all_entry)
-                                       || READ_ONCE(channel->syscall_all_exit)) && filter)
+               if (channel->priv->parent.sc_table) {
+                       if (!(READ_ONCE(channel->priv->parent.syscall_all_entry)
+                                       || READ_ONCE(channel->priv->parent.syscall_all_exit)) && filter)
                                state = test_bit(bit, filter->sc_entry)
                                        || test_bit(bit, filter->sc_exit);
                        else
@@ -2373,12 +1769,12 @@ long lttng_channel_syscall_mask(struct lttng_channel *channel,
        for (; bit < sc_tables_len; bit++) {
                char state;
 
-               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),
+               if (channel->priv->parent.compat_sc_table) {
+                       if (!(READ_ONCE(channel->priv->parent.syscall_all_entry)
+                                       || READ_ONCE(channel->priv->parent.syscall_all_exit)) && filter)
+                               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.047826 seconds and 4 git commands to generate.