Remove unused TRACEPOINT_HAS_DATA_ARG
[lttng-modules.git] / include / lttng / events.h
index cf04a30585dc3f0839e1dd9937f672f9477c5893..676d2869cbfa47c28050ee3a22f3d2200a6ab6bf 100644 (file)
 #ifndef _LTTNG_EVENTS_H
 #define _LTTNG_EVENTS_H
 
-#include <linux/irq_work.h>
-#include <linux/version.h>
+#include <lttng/kernel-version.h>
 #include <linux/list.h>
 #include <linux/kprobes.h>
 #include <linux/kref.h>
 #include <linux/uuid.h>
+#include <linux/irq_work.h>
 #include <wrapper/uprobes.h>
 #include <lttng/cpuhotplug.h>
 #include <lttng/tracer.h>
@@ -23,7 +23,7 @@
 #include <lttng/abi-old.h>
 #include <lttng/endian.h>
 
-#define lttng_is_signed_type(type)     (((type)(-1)) < 0)
+#define lttng_is_signed_type(type)     (((type) -1) < (type) 1)
 
 struct lttng_channel;
 struct lttng_session;
@@ -35,22 +35,22 @@ struct lib_ring_buffer_config;
 
 /* Type description */
 
-enum abstract_types {
-       atype_integer,
-       atype_string,
-       atype_enum_nestable,
-       atype_array_nestable,
-       atype_sequence_nestable,
-       atype_struct_nestable,
-       atype_variant_nestable,
-       NR_ABSTRACT_TYPES,
+enum lttng_kernel_type {
+       lttng_kernel_type_integer,
+       lttng_kernel_type_string,
+       lttng_kernel_type_enum,
+       lttng_kernel_type_array,
+       lttng_kernel_type_sequence,
+       lttng_kernel_type_struct,
+       lttng_kernel_type_variant,
+       NR_LTTNG_KERNEL_TYPES,
 };
 
-enum lttng_string_encodings {
-       lttng_encode_none = 0,
-       lttng_encode_UTF8 = 1,
-       lttng_encode_ASCII = 2,
-       NR_STRING_ENCODINGS,
+enum lttng_kernel_string_encoding {
+       lttng_kernel_string_encoding_none = 0,
+       lttng_kernel_string_encoding_UTF8 = 1,
+       lttng_kernel_string_encoding_ASCII = 2,
+       NR_LTTNG_KERNEL_STRING_ENCODING,
 };
 
 enum channel_type {
@@ -58,167 +58,258 @@ enum channel_type {
        METADATA_CHANNEL,
 };
 
-struct lttng_enum_value {
+struct lttng_kernel_enum_value {
        unsigned long long value;
        unsigned int signedness:1;
 };
 
-struct lttng_enum_entry {
-       struct lttng_enum_value start, end;     /* start and end are inclusive */
+struct lttng_kernel_enum_entry {
+       struct lttng_kernel_enum_value start, end;      /* start and end are inclusive */
        const char *string;
        struct {
                unsigned int is_auto:1;
        } options;
 };
 
-#define __type_integer(_type, _size, _alignment, _signedness,  \
-               _byte_order, _base, _encoding)  \
-       {                                                       \
-           .atype = atype_integer,                             \
-           .u.integer =                                        \
-               {                                               \
-                 .size = (_size) ? : sizeof(_type) * CHAR_BIT, \
-                 .alignment = (_alignment) ? : lttng_alignof(_type) * CHAR_BIT, \
-                 .signedness = (_signedness) >= 0 ? (_signedness) : lttng_is_signed_type(_type), \
-                 .reverse_byte_order = _byte_order != __BYTE_ORDER, \
-                 .base = _base,                                \
-                 .encoding = lttng_encode_##_encoding,         \
-               },                                              \
-       }                                                       \
-
-struct lttng_integer_type {
+/*
+ * struct lttng_kernel_type_common is fixed-size. Its children inherits
+ * from it by embedding struct lttng_kernel_type_common as its first field.
+ */
+struct lttng_kernel_type_common {
+       enum lttng_kernel_type type;
+};
+
+struct lttng_kernel_type_integer {
+       struct lttng_kernel_type_common parent;
        unsigned int size;              /* in bits */
        unsigned short alignment;       /* in bits */
        unsigned int signedness:1,
                reverse_byte_order:1;
        unsigned int base;              /* 2, 8, 10, 16, for pretty print */
-       enum lttng_string_encodings encoding;
 };
 
-struct lttng_type {
-       enum abstract_types atype;
-       union {
-               struct lttng_integer_type integer;
-               struct {
-                       enum lttng_string_encodings encoding;
-               } string;
-               struct {
-                       const struct lttng_enum_desc *desc;     /* Enumeration mapping */
-                       const struct lttng_type *container_type;
-               } enum_nestable;
-               struct {
-                       const struct lttng_type *elem_type;
-                       unsigned int length;                    /* Num. elems. */
-                       unsigned int alignment;
-               } array_nestable;
-               struct {
-                       const char *length_name;                /* Length field name. */
-                       const struct lttng_type *elem_type;
-                       unsigned int alignment;                 /* Alignment before elements. */
-               } sequence_nestable;
-               struct {
-                       unsigned int nr_fields;
-                       const struct lttng_event_field *fields; /* Array of fields. */
-                       unsigned int alignment;
-               } struct_nestable;
-               struct {
-                       const char *tag_name;
-                       const struct lttng_event_field *choices; /* Array of fields. */
-                       unsigned int nr_choices;
-                       unsigned int alignment;
-               } variant_nestable;
-       } u;
+struct lttng_kernel_type_string {
+       struct lttng_kernel_type_common parent;
+       enum lttng_kernel_string_encoding encoding;
 };
 
-struct lttng_enum_desc {
-       const char *name;
-       const struct lttng_enum_entry *entries;
-       unsigned int nr_entries;
+struct lttng_kernel_type_enum {
+       struct lttng_kernel_type_common parent;
+       const struct lttng_kernel_enum_desc *desc;      /* Enumeration mapping */
+       const struct lttng_kernel_type_common *container_type;
 };
 
-/* Event field description */
+struct lttng_kernel_type_array {
+       struct lttng_kernel_type_common parent;
+       const struct lttng_kernel_type_common *elem_type;
+       unsigned int length;                    /* Num. elems. */
+       unsigned int alignment;
+       enum lttng_kernel_string_encoding encoding;
+};
 
-struct lttng_event_field {
-       const char *name;
-       struct lttng_type type;
-       unsigned int nowrite:1,         /* do not write into trace */
-                       user:1,         /* fetch from user-space */
-                       nofilter:1;     /* do not consider for filter */
+struct lttng_kernel_type_sequence {
+       struct lttng_kernel_type_common parent;
+       const char *length_name;        /* Length field name. If NULL, use previous field. */
+       const struct lttng_kernel_type_common *elem_type;
+       unsigned int alignment;         /* Alignment before elements. */
+       enum lttng_kernel_string_encoding encoding;
 };
 
-union lttng_ctx_value {
-       int64_t s64;
-       const char *str;
-       double d;
+struct lttng_kernel_type_struct {
+       struct lttng_kernel_type_common parent;
+       unsigned int nr_fields;
+       const struct lttng_kernel_event_field **fields; /* Array of pointers to fields. */
+       unsigned int alignment;
 };
 
-/*
- * We need to keep this perf counter field separately from struct
- * lttng_ctx_field because cpu hotplug needs fixed-location addresses.
- */
-struct lttng_perf_counter_field {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
-       struct lttng_cpuhp_node cpuhp_prepare;
-       struct lttng_cpuhp_node cpuhp_online;
-#else
-       struct notifier_block nb;
-       int hp_enable;
-#endif
-       struct perf_event_attr *attr;
-       struct perf_event **e;  /* per-cpu array */
+struct lttng_kernel_type_variant {
+       struct lttng_kernel_type_common parent;
+       const char *tag_name;           /* Tag field name. If NULL, use previous field. */
+       const struct lttng_kernel_event_field **choices; /* Array of pointers to fields. */
+       unsigned int nr_choices;
+       unsigned int alignment;
 };
 
-struct lttng_probe_ctx {
-       struct lttng_event *event;
-       struct lttng_event_notifier *event_notifier; // Not sure if we will ever need it.
-       uint8_t interruptible;
+struct lttng_kernel_enum_desc {
+       const char *name;
+       const struct lttng_kernel_enum_entry **entries;
+       unsigned int nr_entries;
 };
 
-struct lttng_ctx_field {
-       struct lttng_event_field event_field;
-       size_t (*get_size)(size_t offset);
-       size_t (*get_size_arg)(size_t offset, struct lttng_ctx_field *field,
-                              struct lib_ring_buffer_ctx *ctx,
-                              struct lttng_channel *chan);
-       void (*record)(struct lttng_ctx_field *field,
-                      struct lib_ring_buffer_ctx *ctx,
-                      struct lttng_channel *chan);
-       void (*get_value)(struct lttng_ctx_field *field,
-                        struct lttng_probe_ctx *lttng_probe_ctx,
-                        union lttng_ctx_value *value);
-       union {
-               struct lttng_perf_counter_field *perf_counter;
-       } u;
-       void (*destroy)(struct lttng_ctx_field *field);
-       /*
-        * Private data to keep state between get_size and record.
-        * User must perform its own synchronization to protect against
-        * concurrent and reentrant contexts.
-        */
-       void *priv;
+/* Event field description */
+
+struct lttng_kernel_event_field {
+       const char *name;
+       const struct lttng_kernel_type_common *type;
+       unsigned int nowrite:1,         /* do not write into trace */
+                       user:1,         /* fetch from user-space */
+                       nofilter:1;     /* do not consider for filter */
 };
 
-struct lttng_ctx {
-       struct lttng_ctx_field *fields;
-       unsigned int nr_fields;
-       unsigned int allocated_fields;
-       size_t largest_align;   /* in bytes */
+#define lttng_kernel_static_type_integer(_size, _alignment, _signedness, _byte_order, _base)           \
+       ((const struct lttng_kernel_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_type_integer, { \
+               .parent = {                                                                             \
+                       .type = lttng_kernel_type_integer,                                                      \
+               },                                                                                      \
+               .size = (_size),                                                                        \
+               .alignment = (_alignment),                                                              \
+               .signedness = (_signedness),                                                            \
+               .reverse_byte_order = (_byte_order) != __BYTE_ORDER,                                    \
+               .base = (_base),                                                                        \
+       }))
+
+#define lttng_kernel_static_type_integer_from_type(_type, _byte_order, _base)                          \
+       lttng_kernel_static_type_integer(sizeof(_type) * CHAR_BIT,                                      \
+                       lttng_alignof(_type) * CHAR_BIT,                                                \
+                       lttng_is_signed_type(_type),                                                    \
+                       _byte_order,                                                                    \
+                       _base)
+
+#define lttng_kernel_static_type_enum(_desc, _container_type)                                          \
+       ((const struct lttng_kernel_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_type_enum, { \
+               .parent = {                                                                             \
+                       .type = lttng_kernel_type_enum,                                                 \
+               },                                                                                      \
+               .desc = (_desc),                                                                        \
+               .container_type = (_container_type),                                                    \
+       }))
+
+#define lttng_kernel_static_type_array(_length, _elem_type, _alignment, _encoding)                     \
+       ((const struct lttng_kernel_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_type_array, { \
+               .parent = {                                                                             \
+                       .type = lttng_kernel_type_array,                                                \
+               },                                                                                      \
+               .length = (_length),                                                                    \
+               .alignment = (_alignment),                                                              \
+               .encoding = lttng_kernel_string_encoding_##_encoding,                                   \
+               .elem_type = (_elem_type),                                                              \
+       }))
+
+#define lttng_kernel_static_type_array_text(_length)                                                   \
+       lttng_kernel_static_type_array(_length,                                                         \
+               lttng_kernel_static_type_integer(sizeof(char) * CHAR_BIT,                               \
+                               lttng_alignof(char) * CHAR_BIT, lttng_is_signed_type(char),             \
+                               __BYTE_ORDER, 10),                                                      \
+               0, UTF8)
+
+#define lttng_kernel_static_type_sequence(_length_name, _elem_type, _alignment, _encoding)                     \
+       ((const struct lttng_kernel_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_type_sequence, { \
+               .parent = {                                                                             \
+                       .type = lttng_kernel_type_sequence,                                             \
+               },                                                                                      \
+               .length_name = (_length_name),                                                          \
+               .alignment = (_alignment),                                                              \
+               .encoding = lttng_kernel_string_encoding_##_encoding,                                   \
+               .elem_type = (_elem_type),                                                              \
+       }))
+
+#define lttng_kernel_static_type_string(_encoding)                                                     \
+       ((const struct lttng_kernel_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_type_string, { \
+               .parent = {                                                                             \
+                       .type = lttng_kernel_type_string,                                               \
+               },                                                                                      \
+               .encoding = lttng_kernel_string_encoding_##_encoding,                                   \
+       }))
+
+#define lttng_kernel_static_type_struct(_nr_fields, _fields, _alignment)                               \
+       ((const struct lttng_kernel_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_type_struct, { \
+               .parent = {                                                                             \
+                       .type = lttng_kernel_type_struct,                                               \
+               },                                                                                      \
+               .nr_fields = (_nr_fields),                                                              \
+               .fields = _fields,                                                                      \
+               .alignment = (_alignment),                                                              \
+       }))
+
+#define lttng_kernel_static_type_variant(_nr_choices, _choices, _tag_name, _alignment)                 \
+       ((const struct lttng_kernel_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_type_variant, { \
+               .parent = {                                                                             \
+                       .type = lttng_kernel_type_variant,                                              \
+               },                                                                                      \
+               .tag_name = (_tag_name),                                                                \
+               .choices = _choices,                                                                    \
+               .nr_choices = (_nr_choices),                                                            \
+               .alignment = (_alignment),                                                              \
+       }))
+
+#define lttng_kernel_static_event_field(_name, _type, _nowrite, _user, _nofilter)                      \
+       __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_event_field, {                               \
+               .name = (_name),                                                                        \
+               .type = (_type),                                                                        \
+               .nowrite = (_nowrite),                                                                  \
+               .user = (_user),                                                                        \
+               .nofilter = (_nofilter),                                                                \
+       })
+
+#define lttng_kernel_static_event_field_array(_fields...)                                              \
+       __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_event_field *,                               \
+               _fields                                                                                 \
+       )
+
+#define lttng_kernel_static_enum_entry_value(_string, _value)                                          \
+       __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_enum_entry, {                                \
+               .start = {                                                                              \
+                       .signedness = lttng_is_signed_type(__typeof__(_value)),                         \
+                       .value = lttng_is_signed_type(__typeof__(_value)) ?                             \
+                               (long long) (_value) : (_value),                                        \
+               },                                                                                      \
+               .end = {                                                                                \
+                       .signedness = lttng_is_signed_type(__typeof__(_value)),                         \
+                       .value = lttng_is_signed_type(__typeof__(_value)) ?                             \
+                               (long long) (_value) : (_value),                                        \
+               },                                                                                      \
+               .string = (_string),                                                                    \
+       }),
+
+#define lttng_kernel_static_enum_entry_range(_string, _range_start, _range_end)                                \
+       __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_enum_entry, {                                \
+               .start = {                                                                              \
+                       .signedness = lttng_is_signed_type(__typeof__(_range_start)),                   \
+                       .value = lttng_is_signed_type(__typeof__(_range_start)) ?                       \
+                               (long long) (_range_start) : (_range_start),                            \
+               },                                                                                      \
+               .end = {                                                                                \
+                       .signedness = lttng_is_signed_type(__typeof__(_range_end)),                     \
+                       .value = lttng_is_signed_type(__typeof__(_range_end)) ?                         \
+                               (long long) (_range_end) : (_range_end),                                \
+               },                                                                                      \
+               .string = (_string),                                                                    \
+       }),
+
+#define lttng_kernel_static_enum_entry_auto(_string)                                                   \
+       __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_enum_entry, {                                \
+               .start = {                                                                              \
+                       .signedness = -1,                                                               \
+                       .value = -1,                                                                    \
+               },                                                                                      \
+               .end = {                                                                                \
+                       .signedness = -1,                                                               \
+                       .value = -1,                                                                    \
+               },                                                                                      \
+               .string = (_string),                                                                    \
+               .options = {                                                                            \
+                       .is_auto = 1,                                                                   \
+               }                                                                                       \
+       }),
+
+struct lttng_kernel_probe_ctx {
+       struct lttng_kernel_event_common *event;
+       uint8_t interruptible;
 };
 
-struct lttng_event_desc {
-       const char *name;               /* lttng-modules name */
-       const char *kname;              /* Linux kernel name (tracepoints) */
-       void *probe_callback;
-       const struct lttng_event_ctx *ctx;      /* context */
-       const struct lttng_event_field *fields; /* event payload */
+struct lttng_kernel_event_desc {
+       const char *event_name;         /* lttng-modules name */
+       const char *event_kname;        /* Linux kernel name (tracepoints) */
+       const struct lttng_kernel_probe_desc *probe_desc;
+       void (*probe_callback)(void);
+       const struct lttng_kernel_event_field **fields; /* event payload */
        unsigned int nr_fields;
        struct module *owner;
-       void *event_notifier_callback;
 };
 
-struct lttng_probe_desc {
-       const char *provider;
-       const struct lttng_event_desc **event_desc;
+struct lttng_kernel_probe_desc {
+       const char *provider_name;
+       const struct lttng_kernel_event_desc **event_desc;
        unsigned int nr_events;
        struct list_head head;                  /* chain registered probes */
        struct list_head lazy_init_head;
@@ -227,50 +318,8 @@ struct lttng_probe_desc {
 
 struct lttng_krp;                              /* Kretprobe handling */
 
-enum lttng_event_type {
-       LTTNG_TYPE_EVENT = 0,
-       LTTNG_TYPE_ENABLER = 1,
-};
-
-struct lttng_filter_bytecode_node {
-       struct list_head node;
-       struct lttng_enabler *enabler;
-       /*
-        * struct lttng_kernel_filter_bytecode has var. sized array, must be
-        * last field.
-        */
-       struct lttng_kernel_filter_bytecode bc;
-};
-
-/*
- * Filter return value masks.
- */
-enum lttng_filter_ret {
-       LTTNG_FILTER_DISCARD = 0,
-       LTTNG_FILTER_RECORD_FLAG = (1ULL << 0),
-       /* Other bits are kept for future use. */
-};
-
-struct lttng_bytecode_runtime {
-       /* Associated bytecode */
-       struct lttng_filter_bytecode_node *bc;
-       uint64_t (*filter)(void *filter_data, struct lttng_probe_ctx *lttng_probe_ctx,
-                       const char *filter_stack_data);
-       int link_failed;
-       struct list_head node;  /* list of bytecode runtime in event */
-       struct lttng_ctx *ctx;
-};
-
-/*
- * Objects in a linked-list of enablers, owned by an event.
- */
-struct lttng_enabler_ref {
-       struct list_head node;                  /* enabler ref list */
-       struct lttng_enabler *ref;              /* backward ref */
-};
-
 struct lttng_uprobe_handler {
-       struct lttng_event *event;
+       struct lttng_kernel_event_common *event;
        loff_t offset;
        struct uprobe_consumer up_consumer;
        struct list_head node;
@@ -281,6 +330,11 @@ struct lttng_kprobe {
        char *symbol_name;
 };
 
+struct lttng_uprobe {
+       struct inode *inode;
+       struct list_head head;
+};
+
 enum lttng_syscall_entryexit {
        LTTNG_SYSCALL_ENTRY,
        LTTNG_SYSCALL_EXIT,
@@ -292,125 +346,59 @@ enum lttng_syscall_abi {
 };
 
 /*
- * lttng_event structure is referred to by the tracing fast path. It must be
- * kept small.
+ * Result of the run_filter() callback.
  */
-struct lttng_event {
-       enum lttng_event_type evtype;   /* First field. */
-       unsigned int id;
-       struct lttng_channel *chan;
-       int enabled;
-       const struct lttng_event_desc *desc;
-       void *filter;
-       struct lttng_ctx *ctx;
-       enum lttng_kernel_instrumentation instrumentation;
-       union {
-               struct lttng_kprobe kprobe;
-               struct {
-                       struct lttng_krp *lttng_krp;
-                       char *symbol_name;
-               } kretprobe;
-               struct {
-                       struct inode *inode;
-                       struct list_head head;
-               } uprobe;
-               struct {
-                       char *syscall_name;
-                       enum lttng_syscall_entryexit entryexit;
-                       enum lttng_syscall_abi abi;
-               } syscall;
-       } u;
-       struct list_head list;          /* Event list in session */
-       unsigned int metadata_dumped:1;
-
-       /* Backward references: list of lttng_enabler_ref (ref to enablers) */
-       struct list_head enablers_ref_head;
-       struct hlist_node hlist;        /* session ht of events */
-       int registered;                 /* has reg'd tracepoint probe */
-       /* list of struct lttng_bytecode_runtime, sorted by seqnum */
-       struct list_head bytecode_runtime_head;
-       int has_enablers_without_bytecode;
+enum lttng_kernel_event_filter_result {
+       LTTNG_KERNEL_EVENT_FILTER_ACCEPT = 0,
+       LTTNG_KERNEL_EVENT_FILTER_REJECT = 1,
 };
 
-// FIXME: Really similar to lttng_event above. Could those be merged ?
-struct lttng_event_notifier {
-       enum lttng_event_type evtype;   /* First field. */
-       uint64_t user_token;
-       int enabled;
-       int registered;                 /* has reg'd tracepoint probe */
-       const struct lttng_event_desc *desc;
-       void *filter;
-       struct list_head list;          /* event_notifier list in event_notifier group */
-
-       enum lttng_kernel_instrumentation instrumentation;
-       union {
-               struct lttng_kprobe kprobe;
-       } u;
-
-       /* Backward references: list of lttng_enabler_ref (ref to enablers) */
-       struct list_head enablers_ref_head;
-       struct hlist_node hlist;        /* session ht of event_notifiers */
-       /* list of struct lttng_bytecode_runtime, sorted by seqnum */
-       struct list_head bytecode_runtime_head;
-       int has_enablers_without_bytecode;
-
-       void (*send_notification)(struct lttng_event_notifier *event_notifier);
-       struct lttng_event_notifier_group *group; /* Weak ref */
-};
+struct lttng_kernel_event_common_private;
 
-enum lttng_enabler_format_type {
-       LTTNG_ENABLER_FORMAT_STAR_GLOB,
-       LTTNG_ENABLER_FORMAT_NAME,
+enum lttng_kernel_event_type {
+       LTTNG_KERNEL_EVENT_TYPE_RECORDER = 0,
+       LTTNG_KERNEL_EVENT_TYPE_NOTIFIER = 1,
 };
 
-/*
- * Enabler field, within whatever object is enabling an event. Target of
- * backward reference.
- */
-struct lttng_enabler {
-       enum lttng_event_type evtype;   /* First field. */
+struct lttng_kernel_event_common {
+       struct lttng_kernel_event_common_private *priv; /* Private event interface */
 
-       enum lttng_enabler_format_type format_type;
+       enum lttng_kernel_event_type type;
+       /* Get child with container_of(). */
 
-       /* head list of struct lttng_ust_filter_bytecode_node */
-       struct list_head filter_bytecode_head;
+       int enabled;
+       int eval_filter;                                /* Need to evaluate filters */
+       int (*run_filter)(const struct lttng_kernel_event_common *event,
+               const char *stack_data,
+               struct lttng_kernel_probe_ctx *probe_ctx,
+               void *filter_ctx);
+};
 
-       struct lttng_kernel_event event_param;
-       unsigned int enabled:1;
+struct lttng_kernel_event_recorder_private;
 
-       uint64_t user_token;            /* User-provided token. */
-};
+struct lttng_kernel_event_recorder {
+       struct lttng_kernel_event_common parent;
+       struct lttng_kernel_event_recorder_private *priv;       /* Private event record interface */
 
-struct lttng_event_enabler {
-       struct lttng_enabler base;
-       struct list_head node;  /* per-session list of enablers */
        struct lttng_channel *chan;
-       /*
-        * Unused, but kept around to make it explicit that the tracer can do
-        * it.
-        */
-       struct lttng_ctx *ctx;
 };
 
-struct lttng_event_notifier_enabler {
-       struct lttng_enabler base;
-       struct list_head node;  /* List of event_notifier enablers */
-       struct lttng_event_notifier_group *group;
+struct lttng_kernel_notification_ctx {
+       int eval_capture;                                       /* Capture evaluation available. */
 };
 
-static inline
-struct lttng_enabler *lttng_event_enabler_as_enabler(
-               struct lttng_event_enabler *event_enabler)
-{
-       return &event_enabler->base;
-}
+struct lttng_kernel_event_notifier_private;
 
-static inline
-struct lttng_enabler *lttng_event_notifier_enabler_as_enabler(
-               struct lttng_event_notifier_enabler *event_notifier_enabler)
-{
-       return &event_notifier_enabler->base;
-}
+struct lttng_kernel_event_notifier {
+       struct lttng_kernel_event_common parent;
+       struct lttng_kernel_event_notifier_private *priv;       /* Private event notifier interface */
+
+       int eval_capture;                               /* Need to evaluate capture */
+       void (*notification_send)(struct lttng_kernel_event_notifier *event_notifier,
+               const char *stack_data,
+               struct lttng_kernel_probe_ctx *probe_ctx,
+               struct lttng_kernel_notification_ctx *notif_ctx);
+};
 
 struct lttng_channel_ops {
        struct channel *(*channel_create)(const char *name,
@@ -423,8 +411,7 @@ struct lttng_channel_ops {
        struct lib_ring_buffer *(*buffer_read_open)(struct channel *chan);
        int (*buffer_has_read_closed_stream)(struct channel *chan);
        void (*buffer_read_close)(struct lib_ring_buffer *buf);
-       int (*event_reserve)(struct lib_ring_buffer_ctx *ctx,
-                            uint32_t event_id);
+       int (*event_reserve)(struct lib_ring_buffer_ctx *ctx);
        void (*event_commit)(struct lib_ring_buffer_ctx *ctx);
        void (*event_write)(struct lib_ring_buffer_ctx *ctx, const void *src,
                            size_t len);
@@ -475,6 +462,28 @@ struct lttng_channel_ops {
                        uint64_t *id);
 };
 
+struct lttng_counter_ops {
+       struct lib_counter *(*counter_create)(size_t nr_dimensions,
+                       const size_t *max_nr_elem,      /* for each dimension */
+                       int64_t global_sum_step);
+       void (*counter_destroy)(struct lib_counter *counter);
+       int (*counter_add)(struct lib_counter *counter, const size_t *dimension_indexes,
+                       int64_t v);
+       /*
+        * counter_read reads a specific cpu's counter if @cpu >= 0, or
+        * the global aggregation counter if @cpu == -1.
+        */
+       int (*counter_read)(struct lib_counter *counter, const size_t *dimension_indexes, int cpu,
+                        int64_t *value, bool *overflow, bool *underflow);
+       /*
+        * counter_aggregate returns the total sum of all per-cpu counters and
+        * the global aggregation counter.
+        */
+       int (*counter_aggregate)(struct lib_counter *counter, const size_t *dimension_indexes,
+                       int64_t *value, bool *overflow, bool *underflow);
+       int (*counter_clear)(struct lib_counter *counter, const size_t *dimension_indexes);
+};
+
 struct lttng_transport {
        char *name;
        struct module *owner;
@@ -482,6 +491,13 @@ struct lttng_transport {
        struct lttng_channel_ops ops;
 };
 
+struct lttng_counter_transport {
+       char *name;
+       struct module *owner;
+       struct list_head node;
+       struct lttng_counter_ops ops;
+};
+
 struct lttng_syscall_filter;
 
 #define LTTNG_EVENT_HT_BITS            12
@@ -502,7 +518,7 @@ struct lttng_channel {
        unsigned int id;
        struct channel *chan;           /* Channel buffers */
        int enabled;
-       struct lttng_ctx *ctx;
+       struct lttng_kernel_ctx *ctx;
        /* Event ID management */
        struct lttng_session *session;
        struct file *file;              /* File associated to channel */
@@ -510,18 +526,19 @@ struct lttng_channel {
        struct list_head list;          /* Channel list */
        struct lttng_channel_ops *ops;
        struct lttng_transport *transport;
-       struct lttng_event **sc_table;  /* for syscall tracing */
-       struct lttng_event **compat_sc_table;
-       struct lttng_event **sc_exit_table;     /* for syscall exit tracing */
-       struct lttng_event **compat_sc_exit_table;
-       struct lttng_event *sc_unknown; /* for unknown syscalls */
-       struct lttng_event *sc_compat_unknown;
-       struct lttng_event *sc_exit_unknown;
-       struct lttng_event *compat_sc_exit_unknown;
+       struct hlist_head *sc_table;    /* for syscall tracing */
+       struct hlist_head *compat_sc_table;
+       struct hlist_head *sc_exit_table;       /* for syscall exit tracing */
+       struct hlist_head *compat_sc_exit_table;
+       struct hlist_head sc_unknown;   /* for unknown syscalls */
+       struct hlist_head sc_compat_unknown;
+       struct hlist_head sc_exit_unknown;
+       struct hlist_head compat_sc_exit_unknown;
        struct lttng_syscall_filter *sc_filter;
        int header_type;                /* 0: unset, 1: compact, 2: large */
        enum channel_type channel_type;
-       int syscall_all;
+       int syscall_all_entry;
+       int syscall_all_exit;
        unsigned int metadata_dumped:1,
                sys_enter_registered:1,
                sys_exit_registered:1,
@@ -605,8 +622,16 @@ struct lttng_session {
        struct list_head enablers_head;
        /* Hash table of events */
        struct lttng_event_ht events_ht;
-       char name[LTTNG_KERNEL_SESSION_NAME_LEN];
-       char creation_time[LTTNG_KERNEL_SESSION_CREATION_TIME_ISO8601_LEN];
+       char name[LTTNG_KERNEL_ABI_SESSION_NAME_LEN];
+       char creation_time[LTTNG_KERNEL_ABI_SESSION_CREATION_TIME_ISO8601_LEN];
+};
+
+struct lttng_counter {
+       struct file *file;              /* File associated to counter. */
+       struct file *owner;
+       struct lttng_counter_transport *transport;
+       struct lib_counter *counter;
+       struct lttng_counter_ops *ops;
 };
 
 struct lttng_event_notifier_group {
@@ -616,13 +641,34 @@ struct lttng_event_notifier_group {
        struct list_head enablers_head; /* List of enablers */
        struct list_head event_notifiers_head; /* List of event notifier */
        struct lttng_event_notifier_ht event_notifiers_ht; /* Hash table of event notifiers */
-       struct lttng_ctx *ctx;          /* Contexts for filters. */
        struct lttng_channel_ops *ops;
        struct lttng_transport *transport;
        struct channel *chan;           /* Ring buffer channel for event notifier group. */
        struct lib_ring_buffer *buf;    /* Ring buffer for event notifier group. */
        wait_queue_head_t read_wait;
        struct irq_work wakeup_pending; /* Pending wakeup irq work. */
+       struct lttng_kernel_event_notifier *sc_unknown; /* for unknown syscalls */
+       struct lttng_kernel_event_notifier *sc_compat_unknown;
+
+       struct lttng_syscall_filter *sc_filter;
+
+       struct hlist_head *event_notifier_syscall_dispatch;
+       struct hlist_head *event_notifier_compat_syscall_dispatch;
+       struct hlist_head *event_notifier_exit_syscall_dispatch;
+       struct hlist_head *event_notifier_exit_compat_syscall_dispatch;
+
+       struct hlist_head event_notifier_unknown_syscall_dispatch;
+       struct hlist_head event_notifier_compat_unknown_syscall_dispatch;
+       struct hlist_head event_notifier_exit_unknown_syscall_dispatch;
+       struct hlist_head event_notifier_exit_compat_unknown_syscall_dispatch;
+
+       int syscall_all_entry;
+       int syscall_all_exit;
+
+       unsigned int sys_enter_registered:1, sys_exit_registered:1;
+
+       struct lttng_counter *error_counter;
+       size_t error_counter_len;
 };
 
 struct lttng_metadata_cache {
@@ -642,22 +688,6 @@ void lttng_unlock_sessions(void);
 
 struct list_head *lttng_get_probe_list_head(void);
 
-struct lttng_event_enabler *lttng_event_enabler_create(
-               enum lttng_enabler_format_type format_type,
-               struct lttng_kernel_event *event_param,
-               struct lttng_channel *chan);
-
-int lttng_event_enabler_enable(struct lttng_event_enabler *event_enabler);
-int lttng_event_enabler_disable(struct lttng_event_enabler *event_enabler);
-struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create(
-               struct lttng_event_notifier_group *event_notifier_group,
-               enum lttng_enabler_format_type format_type,
-               struct lttng_kernel_event_notifier *event_notifier_param);
-
-int lttng_event_notifier_enabler_enable(
-               struct lttng_event_notifier_enabler *event_notifier_enabler);
-int lttng_event_notifier_enabler_disable(
-               struct lttng_event_notifier_enabler *event_notifier_enabler);
 int lttng_fix_pending_events(void);
 int lttng_fix_pending_event_notifiers(void);
 int lttng_session_active(void);
@@ -671,7 +701,23 @@ int lttng_session_metadata_regenerate(struct lttng_session *session);
 int lttng_session_statedump(struct lttng_session *session);
 void metadata_cache_destroy(struct kref *kref);
 
+struct lttng_counter *lttng_kernel_counter_create(
+               const char *counter_transport_name, size_t number_dimensions,
+               const size_t *dimensions_sizes);
+int lttng_kernel_counter_read(struct lttng_counter *counter,
+               const size_t *dimension_indexes, int32_t cpu,
+               int64_t *val, bool *overflow, bool *underflow);
+int lttng_kernel_counter_aggregate(struct lttng_counter *counter,
+               const size_t *dimension_indexes, int64_t *val,
+               bool *overflow, bool *underflow);
+int lttng_kernel_counter_clear(struct lttng_counter *counter,
+               const size_t *dimension_indexes);
+
+
 struct lttng_event_notifier_group *lttng_event_notifier_group_create(void);
+int lttng_event_notifier_group_create_error_counter(
+               struct file *event_notifier_group_file,
+               const struct lttng_kernel_abi_counter_conf *error_counter_conf);
 void lttng_event_notifier_group_destroy(
                struct lttng_event_notifier_group *event_notifier_group);
 
@@ -689,57 +735,54 @@ struct lttng_channel *lttng_global_channel_create(struct lttng_session *session,
                                       unsigned int read_timer_interval);
 
 void lttng_metadata_channel_destroy(struct lttng_channel *chan);
-struct lttng_event *lttng_event_create(struct lttng_channel *chan,
-                               struct lttng_kernel_event *event_param,
-                               void *filter,
-                               const struct lttng_event_desc *event_desc,
-                               enum lttng_kernel_instrumentation itype);
-struct lttng_event *_lttng_event_create(struct lttng_channel *chan,
-                               struct lttng_kernel_event *event_param,
-                               void *filter,
-                               const struct lttng_event_desc *event_desc,
-                               enum lttng_kernel_instrumentation itype);
-struct lttng_event *lttng_event_compat_old_create(struct lttng_channel *chan,
-               struct lttng_kernel_old_event *old_event_param,
-               void *filter,
-               const struct lttng_event_desc *internal_desc);
-
-struct lttng_event_notifier *lttng_event_notifier_create(
-                               const struct lttng_event_desc *event_notifier_desc,
+struct lttng_kernel_event_recorder *lttng_kernel_event_recorder_create(struct lttng_channel *chan,
+                               struct lttng_kernel_abi_event *event_param,
+                               const struct lttng_kernel_event_desc *event_desc,
+                               enum lttng_kernel_abi_instrumentation itype);
+struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_channel *chan,
+                               struct lttng_kernel_abi_event *event_param,
+                               const struct lttng_kernel_event_desc *event_desc,
+                               enum lttng_kernel_abi_instrumentation itype);
+struct lttng_kernel_event_recorder *lttng_event_compat_old_create(struct lttng_channel *chan,
+               struct lttng_kernel_abi_old_event *old_event_param,
+               const struct lttng_kernel_event_desc *internal_desc);
+
+struct lttng_kernel_event_notifier *lttng_event_notifier_create(
+                               const struct lttng_kernel_event_desc *event_notifier_desc,
                                uint64_t id,
+                               uint64_t error_counter_idx,
                                struct lttng_event_notifier_group *event_notifier_group,
-                               struct lttng_kernel_event_notifier *event_notifier_param,
-                               void *filter,
-                               enum lttng_kernel_instrumentation itype);
-struct lttng_event_notifier *_lttng_event_notifier_create(
-                               const struct lttng_event_desc *event_notifier_desc,
+                               struct lttng_kernel_abi_event_notifier *event_notifier_param,
+                               enum lttng_kernel_abi_instrumentation itype);
+struct lttng_kernel_event_notifier *_lttng_event_notifier_create(
+                               const struct lttng_kernel_event_desc *event_notifier_desc,
                                uint64_t id,
+                               uint64_t error_counter_idx,
                                struct lttng_event_notifier_group *event_notifier_group,
-                               struct lttng_kernel_event_notifier *event_notifier_param,
-                               void *filter,
-                               enum lttng_kernel_instrumentation itype);
+                               struct lttng_kernel_abi_event_notifier *event_notifier_param,
+                               enum lttng_kernel_abi_instrumentation itype);
 
 int lttng_channel_enable(struct lttng_channel *channel);
 int lttng_channel_disable(struct lttng_channel *channel);
-int lttng_event_enable(struct lttng_event *event);
-int lttng_event_disable(struct lttng_event *event);
-
-int lttng_event_notifier_enable(struct lttng_event_notifier *event_notifier);
-int lttng_event_notifier_disable(struct lttng_event_notifier *event_notifier);
+int lttng_event_enable(struct lttng_kernel_event_common *event);
+int lttng_event_disable(struct lttng_kernel_event_common *event);
 
 void lttng_transport_register(struct lttng_transport *transport);
 void lttng_transport_unregister(struct lttng_transport *transport);
 
+void lttng_counter_transport_register(struct lttng_counter_transport *transport);
+void lttng_counter_transport_unregister(struct lttng_counter_transport *transport);
+
 void synchronize_trace(void);
 int lttng_abi_init(void);
 int lttng_abi_compat_old_init(void);
 void lttng_abi_exit(void);
 void lttng_abi_compat_old_exit(void);
 
-int lttng_probe_register(struct lttng_probe_desc *desc);
-void lttng_probe_unregister(struct lttng_probe_desc *desc);
-const struct lttng_event_desc *lttng_event_desc_get(const char *name);
-void lttng_event_desc_put(const struct lttng_event_desc *desc);
+int lttng_probe_register(struct lttng_kernel_probe_desc *desc);
+void lttng_probe_unregister(struct lttng_kernel_probe_desc *desc);
+const struct lttng_kernel_event_desc *lttng_event_desc_get(const char *name);
+void lttng_event_desc_put(const struct lttng_kernel_event_desc *desc);
 int lttng_probes_init(void);
 void lttng_probes_exit(void);
 
@@ -764,249 +807,10 @@ int lttng_session_list_tracker_ids(struct lttng_session *session,
 void lttng_clock_ref(void);
 void lttng_clock_unref(void);
 
-#if defined(CONFIG_HAVE_SYSCALL_TRACEPOINTS)
-int lttng_syscalls_register(struct lttng_channel *chan, void *filter);
-int lttng_syscalls_unregister(struct lttng_channel *chan);
-int lttng_syscalls_destroy(struct lttng_channel *chan);
-int lttng_syscall_filter_enable(struct lttng_channel *chan,
-               struct lttng_event *event);
-int lttng_syscall_filter_disable(struct lttng_channel *chan,
-               struct lttng_event *event);
-long lttng_channel_syscall_mask(struct lttng_channel *channel,
-               struct lttng_kernel_syscall_mask __user *usyscall_mask);
-#else
-static inline int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
-{
-       return -ENOSYS;
-}
-
-static inline int lttng_syscalls_unregister(struct lttng_channel *chan)
-{
-       return 0;
-}
-
-static inline int lttng_syscalls_destroy(struct lttng_channel *chan)
-{
-       return 0;
-}
-
-static inline int lttng_syscall_filter_enable(struct lttng_channel *chan,
-               struct lttng_event *event);
-{
-       return -ENOSYS;
-}
-
-static inline int lttng_syscall_filter_disable(struct lttng_channel *chan,
-               struct lttng_event *event);
-{
-       return -ENOSYS;
-}
-
-static inline long lttng_channel_syscall_mask(struct lttng_channel *channel,
-               struct lttng_kernel_syscall_mask __user *usyscall_mask)
-{
-       return -ENOSYS;
-}
-
-#endif
-
-void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime);
-int lttng_event_enabler_attach_bytecode(struct lttng_event_enabler *event_enabler,
-               struct lttng_kernel_filter_bytecode __user *bytecode);
-int lttng_event_notifier_enabler_attach_bytecode(
-               struct lttng_event_notifier_enabler *event_notifier_enabler,
-               struct lttng_kernel_filter_bytecode __user *bytecode);
-
-void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc,
-               struct lttng_ctx *ctx,
-               struct list_head *bytecode_runtime_head,
-               struct lttng_enabler *enabler);
+void lttng_free_event_filter_runtime(struct lttng_kernel_event_common *event);
 
 int lttng_probes_init(void);
 
-extern struct lttng_ctx *lttng_static_ctx;
-
-int lttng_context_init(void);
-void lttng_context_exit(void);
-struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx);
-ssize_t lttng_append_context_index(struct lttng_ctx **ctx_p);
-struct lttng_ctx_field *lttng_get_context_field_from_index(struct lttng_ctx *ctx,
-               size_t index);
-void lttng_context_update(struct lttng_ctx *ctx);
-int lttng_find_context(struct lttng_ctx *ctx, const char *name);
-int lttng_get_context_index(struct lttng_ctx *ctx, const char *name);
-void lttng_remove_context_field(struct lttng_ctx **ctx,
-                               struct lttng_ctx_field *field);
-void lttng_remove_context_field_index(struct lttng_ctx **ctx_p, size_t index);
-void lttng_destroy_context(struct lttng_ctx *ctx);
-int lttng_add_pid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_procname_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_prio_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_nice_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_tid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_vtid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_ppid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_vppid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_hostname_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_interruptible_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_need_reschedule_to_ctx(struct lttng_ctx **ctx);
-#if defined(CONFIG_PREEMPT_RT_FULL) || defined(CONFIG_PREEMPT)
-int lttng_add_preemptible_to_ctx(struct lttng_ctx **ctx);
-#else
-static inline
-int lttng_add_preemptible_to_ctx(struct lttng_ctx **ctx)
-{
-       return -ENOSYS;
-}
-#endif
-#ifdef CONFIG_PREEMPT_RT_FULL
-int lttng_add_migratable_to_ctx(struct lttng_ctx **ctx);
-#else
-static inline
-int lttng_add_migratable_to_ctx(struct lttng_ctx **ctx)
-{
-       return -ENOSYS;
-}
-#endif
-
-int lttng_add_callstack_to_ctx(struct lttng_ctx **ctx, int type);
-
-#if defined(CONFIG_CGROUPS) && \
-       ((LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) || \
-        LTTNG_UBUNTU_KERNEL_RANGE(4,4,0,0, 4,5,0,0))
-int lttng_add_cgroup_ns_to_ctx(struct lttng_ctx **ctx);
-#else
-static inline
-int lttng_add_cgroup_ns_to_ctx(struct lttng_ctx **ctx)
-{
-       return -ENOSYS;
-}
-#endif
-
-#if defined(CONFIG_IPC_NS) && \
-       (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx);
-#else
-static inline
-int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx)
-{
-       return -ENOSYS;
-}
-#endif
-
-#if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \
-       (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx);
-#else
-static inline
-int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx)
-{
-       return -ENOSYS;
-}
-#endif
-
-#if defined(CONFIG_NET_NS) && \
-       (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx);
-#else
-static inline
-int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx)
-{
-       return -ENOSYS;
-}
-#endif
-
-#if defined(CONFIG_PID_NS) && \
-       (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx);
-#else
-static inline
-int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx)
-{
-       return -ENOSYS;
-}
-#endif
-
-#if defined(CONFIG_USER_NS) && \
-       (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx);
-#else
-static inline
-int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx)
-{
-       return -ENOSYS;
-}
-#endif
-
-#if defined(CONFIG_UTS_NS) && \
-       (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx);
-#else
-static inline
-int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx)
-{
-       return -ENOSYS;
-}
-#endif
-
-#if defined(CONFIG_TIME_NS) && \
-       (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
-int lttng_add_time_ns_to_ctx(struct lttng_ctx **ctx);
-#else
-static inline
-int lttng_add_time_ns_to_ctx(struct lttng_ctx **ctx)
-{
-       return -ENOSYS;
-}
-#endif
-
-int lttng_add_uid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_euid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_suid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_gid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_egid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_sgid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_vuid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_veuid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_vsuid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_vgid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_vegid_to_ctx(struct lttng_ctx **ctx);
-int lttng_add_vsgid_to_ctx(struct lttng_ctx **ctx);
-
-#if defined(CONFIG_PERF_EVENTS)
-int lttng_add_perf_counter_to_ctx(uint32_t type,
-                                 uint64_t config,
-                                 const char *name,
-                                 struct lttng_ctx **ctx);
-int lttng_cpuhp_perf_counter_online(unsigned int cpu,
-               struct lttng_cpuhp_node *node);
-int lttng_cpuhp_perf_counter_dead(unsigned int cpu,
-               struct lttng_cpuhp_node *node);
-#else
-static inline
-int lttng_add_perf_counter_to_ctx(uint32_t type,
-                                 uint64_t config,
-                                 const char *name,
-                                 struct lttng_ctx **ctx)
-{
-       return -ENOSYS;
-}
-static inline
-int lttng_cpuhp_perf_counter_online(unsigned int cpu,
-               struct lttng_cpuhp_node *node)
-{
-       return 0;
-}
-static inline
-int lttng_cpuhp_perf_counter_dead(unsigned int cpu,
-               struct lttng_cpuhp_node *node)
-{
-       return 0;
-}
-#endif
-
 int lttng_logger_init(void);
 void lttng_logger_exit(void);
 
@@ -1017,33 +821,33 @@ int lttng_kprobes_register_event(const char *name,
                const char *symbol_name,
                uint64_t offset,
                uint64_t addr,
-               struct lttng_event *event);
-void lttng_kprobes_unregister_event(struct lttng_event *event);
-void lttng_kprobes_destroy_event_private(struct lttng_event *event);
+               struct lttng_kernel_event_recorder *event);
+void lttng_kprobes_unregister_event(struct lttng_kernel_event_recorder *event);
+void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_recorder *event);
 int lttng_kprobes_register_event_notifier(const char *symbol_name,
                uint64_t offset,
                uint64_t addr,
-               struct lttng_event_notifier *event_notifier);
-void lttng_kprobes_unregister_event_notifier(struct lttng_event_notifier *event_notifier);
-void lttng_kprobes_destroy_event_notifier_private(struct lttng_event_notifier *event_notifier);
+               struct lttng_kernel_event_notifier *event_notifier);
+void lttng_kprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier);
+void lttng_kprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier);
 #else
 static inline
 int lttng_kprobes_register_event(const char *name,
                const char *symbol_name,
                uint64_t offset,
                uint64_t addr,
-               struct lttng_event *event)
+               struct lttng_kernel_event_recorder *event)
 {
        return -ENOSYS;
 }
 
 static inline
-void lttng_kprobes_unregister_event(struct lttng_event *event)
+void lttng_kprobes_unregister_event(struct lttng_kernel_event_recorder *event)
 {
 }
 
 static inline
-void lttng_kprobes_destroy_event_private(struct lttng_event *event)
+void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_recorder *event)
 {
 }
 
@@ -1051,54 +855,75 @@ static inline
 int lttng_kprobes_register_event_notifier(const char *symbol_name,
                uint64_t offset,
                uint64_t addr,
-               struct lttng_event_notifier *event_notifier)
+               struct lttng_kernel_event_notifier *event_notifier)
 {
        return -ENOSYS;
 }
 
 static inline
-void lttng_kprobes_unregister_event_notifier(struct lttng_event_notifier *event_notifier)
+void lttng_kprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
 {
 }
 
 static inline
-void lttng_kprobes_destroy_event_notifier_private(struct lttng_event_notifier *event_notifier)
+void lttng_kprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier)
 {
 }
 #endif
 
-int lttng_event_add_callsite(struct lttng_event *event,
-       struct lttng_kernel_event_callsite *callsite);
+int lttng_event_add_callsite(struct lttng_kernel_event_common *event,
+       struct lttng_kernel_abi_event_callsite __user *callsite);
 
 #ifdef CONFIG_UPROBES
-int lttng_uprobes_register(const char *name,
-       int fd, struct lttng_event *event);
-int lttng_uprobes_add_callsite(struct lttng_event *event,
-       struct lttng_kernel_event_callsite *callsite);
-void lttng_uprobes_unregister(struct lttng_event *event);
-void lttng_uprobes_destroy_private(struct lttng_event *event);
+int lttng_uprobes_register_event(const char *name,
+       int fd, struct lttng_kernel_event_recorder *event);
+int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_common *event,
+       struct lttng_kernel_abi_event_callsite __user *callsite);
+void lttng_uprobes_unregister_event(struct lttng_kernel_event_recorder *event);
+void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_recorder *event);
+int lttng_uprobes_register_event_notifier(const char *name,
+       int fd, struct lttng_kernel_event_notifier *event_notifier);
+void lttng_uprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier);
+void lttng_uprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier);
 #else
 static inline
-int lttng_uprobes_register(const char *name,
-       int fd, struct lttng_event *event)
+int lttng_uprobes_register_event(const char *name,
+       int fd, struct lttng_kernel_event_recorder *event)
 {
        return -ENOSYS;
 }
 
 static inline
-int lttng_uprobes_add_callsite(struct lttng_event *event,
-       struct lttng_kernel_event_callsite *callsite)
+int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_common *event,
+       struct lttng_kernel_abi_event_callsite __user *callsite)
 {
        return -ENOSYS;
 }
 
 static inline
-void lttng_uprobes_unregister(struct lttng_event *event)
+void lttng_uprobes_unregister_event(struct lttng_kernel_event_recorder *event)
 {
 }
 
 static inline
-void lttng_uprobes_destroy_private(struct lttng_event *event)
+void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_recorder *event)
+{
+}
+
+static inline
+int lttng_uprobes_register_event_notifier(const char *name,
+       int fd, struct lttng_kernel_event_notifier *event_notifier)
+{
+       return -ENOSYS;
+}
+
+static inline
+void lttng_uprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
+{
+}
+
+static inline
+void lttng_uprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier)
 {
 }
 #endif
@@ -1108,11 +933,11 @@ int lttng_kretprobes_register(const char *name,
                const char *symbol_name,
                uint64_t offset,
                uint64_t addr,
-               struct lttng_event *event_entry,
-               struct lttng_event *event_exit);
-void lttng_kretprobes_unregister(struct lttng_event *event);
-void lttng_kretprobes_destroy_private(struct lttng_event *event);
-int lttng_kretprobes_event_enable_state(struct lttng_event *event,
+               struct lttng_kernel_event_recorder *event_entry,
+               struct lttng_kernel_event_recorder *event_exit);
+void lttng_kretprobes_unregister(struct lttng_kernel_event_recorder *event);
+void lttng_kretprobes_destroy_private(struct lttng_kernel_event_recorder *event);
+int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_common *event,
        int enable);
 #else
 static inline
@@ -1120,51 +945,33 @@ int lttng_kretprobes_register(const char *name,
                const char *symbol_name,
                uint64_t offset,
                uint64_t addr,
-               struct lttng_event *event_entry,
-               struct lttng_event *event_exit)
+               struct lttng_kernel_event_recorder *event_entry,
+               struct lttng_kernel_event_recorder *event_exit)
 {
        return -ENOSYS;
 }
 
 static inline
-void lttng_kretprobes_unregister(struct lttng_event *event)
+void lttng_kretprobes_unregister(struct lttng_kernel_event_recorder *event)
 {
 }
 
 static inline
-void lttng_kretprobes_destroy_private(struct lttng_event *event)
+void lttng_kretprobes_destroy_private(struct lttng_kernel_event_recorder *event)
 {
 }
 
 static inline
-int lttng_kretprobes_event_enable_state(struct lttng_event *event,
+int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_common *event,
        int enable)
 {
        return -ENOSYS;
 }
 #endif
 
-int lttng_calibrate(struct lttng_kernel_calibrate *calibrate);
+int lttng_calibrate(struct lttng_kernel_abi_calibrate *calibrate);
 
 extern const struct file_operations lttng_tracepoint_list_fops;
 extern const struct file_operations lttng_syscall_list_fops;
 
-#define TRACEPOINT_HAS_DATA_ARG
-
-static inline bool lttng_is_bytewise_integer(const struct lttng_type *type)
-{
-       if (type->atype != atype_integer)
-               return false;
-       switch (type->u.integer.size) {
-       case 8:         /* Fall-through. */
-       case 16:        /* Fall-through. */
-       case 32:        /* Fall-through. */
-       case 64:
-               break;
-       default:
-               return false;
-       }
-       return true;
-}
-
 #endif /* _LTTNG_EVENTS_H */
This page took 0.039922 seconds and 4 git commands to generate.