X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Flttng%2Fevents.h;h=ebf981eb334c47aa084a198850ec973c4ffd5d00;hb=refs%2Fheads%2Fsow-2020-0002-rev3;hp=5393f196f18d63701fa72d46f7443a29d4bf1b88;hpb=0b365677b4b159fa9aa2b98eb19f10f4a762fbe8;p=deliverable%2Flttng-modules.git diff --git a/include/lttng/events.h b/include/lttng/events.h index 5393f196..ebf981eb 100644 --- a/include/lttng/events.h +++ b/include/lttng/events.h @@ -10,7 +10,7 @@ #ifndef _LTTNG_EVENTS_H #define _LTTNG_EVENTS_H -#include +#include #include #include #include @@ -157,7 +157,7 @@ union lttng_ctx_value { * lttng_ctx_field because cpu hotplug needs fixed-location addresses. */ struct lttng_perf_counter_field { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) struct lttng_cpuhp_node cpuhp_prepare; struct lttng_cpuhp_node cpuhp_online; #else @@ -208,7 +208,7 @@ struct lttng_ctx { struct lttng_event_desc { const char *name; /* lttng-modules name */ const char *kname; /* Linux kernel name (tracepoints) */ - void *probe_callback; + void *probe_callback; /* store-event and count-event probe */ const struct lttng_event_ctx *ctx; /* context */ const struct lttng_event_field *fields; /* event payload */ unsigned int nr_fields; @@ -234,6 +234,7 @@ enum lttng_event_type { enum lttng_bytecode_node_type { LTTNG_BYTECODE_NODE_TYPE_FILTER, + LTTNG_BYTECODE_NODE_TYPE_CAPTURE, }; struct lttng_bytecode_node { @@ -257,12 +258,20 @@ enum lttng_bytecode_interpreter_ret { /* Other bits are kept for future use. */ }; +struct lttng_interpreter_output; + struct lttng_bytecode_runtime { /* Associated bytecode */ struct lttng_bytecode_node *bc; - uint64_t (*filter)(void *filter_data, - struct lttng_probe_ctx *lttng_probe_ctx, - const char *filter_stack_data); + union { + uint64_t (*filter)(void *filter_data, + struct lttng_probe_ctx *lttng_probe_ctx, + const char *filter_stack_data); + uint64_t (*capture)(void *filter_data, + struct lttng_probe_ctx *lttng_probe_ctx, + const char *capture_stack_data, + struct lttng_interpreter_output *output); + } interpreter_funcs; int link_failed; struct list_head node; /* list of bytecode runtime in event */ struct lttng_ctx *ctx; @@ -289,11 +298,13 @@ struct lttng_uprobe_handler { struct lttng_kprobe { struct kprobe kp; char *symbol_name; + uint64_t user_token; }; struct lttng_uprobe { struct inode *inode; struct list_head head; + uint64_t user_token; }; enum lttng_syscall_entryexit { @@ -306,14 +317,47 @@ enum lttng_syscall_abi { LTTNG_SYSCALL_ABI_COMPAT, }; +struct lttng_syscall { + struct list_head node; /* chain registered syscall trigger */ + unsigned int syscall_id; + bool is_compat; +}; + +enum lttng_key_token_type { + LTTNG_KEY_TOKEN_STRING = 0, + LTTNG_KEY_TOKEN_EVENT_NAME = 1, +}; + +#define LTTNG_KEY_TOKEN_STRING_LEN_MAX LTTNG_KERNEL_KEY_TOKEN_STRING_LEN_MAX +struct lttng_key_token { + enum lttng_key_token_type type; + union { + char string[LTTNG_KEY_TOKEN_STRING_LEN_MAX]; + } arg; +}; + +#define LTTNG_NR_KEY_TOKEN LTTNG_KERNEL_NR_KEY_TOKEN +struct lttng_counter_key_dimension { + size_t nr_key_tokens; + struct lttng_key_token key_tokens[LTTNG_KERNEL_NR_KEY_TOKEN]; +}; + +#define LTTNG_COUNTER_DIMENSION_MAX LTTNG_KERNEL_COUNTER_DIMENSION_MAX +struct lttng_counter_key { + size_t nr_dimensions; + struct lttng_counter_key_dimension key_dimensions[LTTNG_COUNTER_DIMENSION_MAX]; +}; + +#define LTTNG_KEY_TOKEN_STRING_LEN_MAX LTTNG_KERNEL_KEY_TOKEN_STRING_LEN_MAX + /* * lttng_event structure is referred to by the tracing fast path. It must be * kept small. */ struct lttng_event { enum lttng_event_type evtype; /* First field. */ - unsigned int id; - struct lttng_channel *chan; + struct lttng_event_container *container; + size_t id; int enabled; const struct lttng_event_desc *desc; void *filter; @@ -324,11 +368,13 @@ struct lttng_event { struct { struct lttng_krp *lttng_krp; char *symbol_name; + uint64_t user_token; } kretprobe; struct lttng_uprobe uprobe; struct { enum lttng_syscall_entryexit entryexit; enum lttng_syscall_abi abi; + struct hlist_node node; /* chain registered syscall event */ } syscall; } u; struct list_head list; /* Event list in session */ @@ -336,17 +382,34 @@ struct lttng_event { /* Backward references: list of lttng_enabler_ref (ref to enablers) */ struct list_head enablers_ref_head; - struct hlist_node hlist; /* session ht of events */ + struct hlist_node name_hlist; /* session ht of events, per event name */ + struct hlist_node key_hlist; /* session ht of events, per key */ int registered; /* has reg'd tracepoint probe */ /* list of struct lttng_bytecode_runtime, sorted by seqnum */ struct list_head filter_bytecode_runtime_head; int has_enablers_without_bytecode; + + /* List node of actions to perform (for syscall events). */ + struct hlist_node action_list; + + char key[LTTNG_KEY_TOKEN_STRING_LEN_MAX]; + + /* + * For non-coalesce-hit event containers, each event is + * associated with a single event enabler user_token. + */ + uint64_t user_token; +}; + +struct lttng_kernel_notifier_ctx { + int eval_capture; }; // 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; + uint64_t error_counter_index; int enabled; int registered; /* has reg'd tracepoint probe */ const struct lttng_event_desc *desc; @@ -371,9 +434,15 @@ struct lttng_event_notifier { struct hlist_node hlist; /* session ht of event_notifiers */ /* list of struct lttng_bytecode_runtime, sorted by seqnum */ struct list_head filter_bytecode_runtime_head; + size_t num_captures; + struct list_head capture_bytecode_runtime_head; int has_enablers_without_bytecode; + int eval_capture; /* Should evaluate capture */ - void (*send_notification)(struct lttng_event_notifier *event_notifier); + void (*send_notification)(struct lttng_event_notifier *event_notifier, + struct lttng_probe_ctx *lttng_probe_ctx, + const char *interpreter_stack_data, + struct lttng_kernel_notifier_ctx *notif_ctx); struct lttng_event_notifier_group *group; /* Weak ref */ }; @@ -391,7 +460,7 @@ struct lttng_enabler { enum lttng_enabler_format_type format_type; - /* head list of struct lttng_ust_filter_bytecode_node */ + /* head list of struct lttng_bytecode_node */ struct list_head filter_bytecode_head; struct lttng_kernel_event event_param; @@ -403,7 +472,8 @@ struct lttng_enabler { struct lttng_event_enabler { struct lttng_enabler base; struct list_head node; /* per-session list of enablers */ - struct lttng_channel *chan; + struct lttng_event_container *container; + struct lttng_counter_key key; /* * Unused, but kept around to make it explicit that the tracer can do * it. @@ -413,10 +483,16 @@ struct lttng_event_enabler { struct lttng_event_notifier_enabler { struct lttng_enabler base; + uint64_t error_counter_index; struct list_head node; /* List of event_notifier enablers */ struct lttng_event_notifier_group *group; + + /* head list of struct lttng_bytecode_node */ + struct list_head capture_bytecode_head; + uint64_t num_captures; }; + static inline struct lttng_enabler *lttng_event_enabler_as_enabler( struct lttng_event_enabler *event_enabler) @@ -494,6 +570,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; @@ -501,6 +599,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 @@ -517,34 +622,60 @@ struct lttng_event_notifier_ht { struct hlist_head table[LTTNG_EVENT_NOTIFIER_HT_SIZE]; }; +enum lttng_event_container_type { + LTTNG_EVENT_CONTAINER_CHANNEL, + LTTNG_EVENT_CONTAINER_COUNTER, +}; + +/* + * An event can be contained within either a channel or a counter. + */ +struct lttng_event_container { + enum lttng_event_container_type type; + + struct file *file; /* File associated to event container */ + struct lttng_session *session; /* Session containing the container */ + int enabled; + 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; + + /* + * Combining all unknown syscall events works as long as they + * are only matched by "all" syscalls enablers, but will require + * a design change when we allow matching by syscall number, for + * instance by allocating sc_tables accomodating NR_syscalls + * entries. + */ + 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 syscall_all_entry; + int syscall_all_exit; + unsigned int sys_enter_registered:1, + sys_exit_registered:1, + tstate:1; /* Transient enable state */ + bool coalesce_hits; +}; + struct lttng_channel { unsigned int id; struct channel *chan; /* Channel buffers */ - int enabled; struct lttng_ctx *ctx; /* Event ID management */ - struct lttng_session *session; - struct file *file; /* File associated to channel */ unsigned int free_event_id; /* Next event ID to allocate */ 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 lttng_syscall_filter *sc_filter; int header_type; /* 0: unset, 1: compact, 2: large */ enum channel_type channel_type; - int syscall_all; - unsigned int metadata_dumped:1, - sys_enter_registered:1, - sys_exit_registered:1, - tstate:1; /* Transient enable state */ + unsigned int metadata_dumped:1; + + struct lttng_event_container parent; }; struct lttng_metadata_stream { @@ -608,6 +739,7 @@ struct lttng_session { struct file *file; /* File associated to session */ struct list_head chan; /* Channel list head */ struct list_head events; /* Event list head */ + struct list_head counters; /* Counters list head */ struct list_head list; /* Session list */ unsigned int free_chan_id; /* Next chan ID to allocate */ uuid_le uuid; /* Trace session unique ID */ @@ -622,12 +754,40 @@ struct lttng_session { tstate:1; /* Transient enable state */ /* List of event enablers */ struct list_head enablers_head; - /* Hash table of events */ - struct lttng_event_ht events_ht; + /* Hash table of events indexed by event name */ + struct lttng_event_ht events_name_ht; + /* Hash table of events indexed by key */ + struct lttng_event_ht events_key_ht; char name[LTTNG_KERNEL_SESSION_NAME_LEN]; char creation_time[LTTNG_KERNEL_SESSION_CREATION_TIME_ISO8601_LEN]; }; +struct lttng_counter_map_descriptor { + uint64_t user_token; + size_t array_index; + char key[LTTNG_KERNEL_COUNTER_KEY_LEN]; +}; + +struct lttng_counter_map { + struct lttng_counter_map_descriptor *descriptors; + size_t nr_descriptors; + size_t alloc_len; + struct mutex lock; /* counter map lock */ +}; + +struct lttng_counter { + struct file *owner; + struct lttng_counter_transport *transport; + struct lib_counter *counter; + struct lttng_counter_ops *ops; + struct list_head node; /* Counter list (in session) */ + + size_t free_index; /* Next index to allocate */ + struct lttng_counter_map map; + + struct lttng_event_container parent; +}; + struct lttng_event_notifier_group { struct file *file; /* File associated to event notifier group */ struct file *notif_file; /* File used to expose notifications to userspace. */ @@ -678,6 +838,34 @@ struct lttng_metadata_cache { uint64_t version; /* Current version of the metadata */ }; +static inline +struct lttng_event_container *lttng_channel_get_event_container(struct lttng_channel *channel) +{ + return &channel->parent; +} + +static inline +struct lttng_event_container *lttng_counter_get_event_container(struct lttng_counter *counter) +{ + return &counter->parent; +} + +static inline +struct lttng_channel *lttng_event_container_get_channel(struct lttng_event_container *container) +{ + if (container->type != LTTNG_EVENT_CONTAINER_CHANNEL) + return NULL; + return container_of(container, struct lttng_channel, parent); +} + +static inline +struct lttng_counter *lttng_event_container_get_counter(struct lttng_event_container *container) +{ + if (container->type != LTTNG_EVENT_CONTAINER_COUNTER) + return NULL; + return container_of(container, struct lttng_counter, parent); +} + void lttng_lock_sessions(void); void lttng_unlock_sessions(void); @@ -686,7 +874,8 @@ 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); + const struct lttng_counter_key *key, + struct lttng_event_container *container); int lttng_event_enabler_enable(struct lttng_event_enabler *event_enabler); int lttng_event_enabler_disable(struct lttng_event_enabler *event_enabler); @@ -712,9 +901,27 @@ int lttng_session_metadata_regenerate(struct lttng_session *session); int lttng_session_statedump(struct lttng_session *session); void metadata_cache_destroy(struct kref *kref); +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_counter_conf *error_counter_conf); + void lttng_event_notifier_group_destroy( struct lttng_event_notifier_group *event_notifier_group); +int lttng_event_notifier_group_set_error_counter( + struct lttng_event_notifier_group *event_notifier_group, + const char *counter_transport_name, + size_t counter_len); struct lttng_channel *lttng_channel_create(struct lttng_session *session, const char *transport_name, @@ -723,31 +930,32 @@ struct lttng_channel *lttng_channel_create(struct lttng_session *session, unsigned int switch_timer_interval, unsigned int read_timer_interval, enum channel_type channel_type); -struct lttng_channel *lttng_global_channel_create(struct lttng_session *session, - int overwrite, void *buf_addr, - size_t subbuf_size, size_t num_subbuf, - unsigned int switch_timer_interval, - 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_event *lttng_event_create(struct lttng_event_container *container, struct lttng_kernel_event *event_param, + const struct lttng_counter_key *key, void *filter, const struct lttng_event_desc *event_desc, - enum lttng_kernel_instrumentation itype); -struct lttng_event *_lttng_event_create(struct lttng_channel *chan, + enum lttng_kernel_instrumentation itype, + uint64_t user_token); +struct lttng_event *_lttng_event_create(struct lttng_event_container *container, struct lttng_kernel_event *event_param, + const struct lttng_counter_key *key, 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); + enum lttng_kernel_instrumentation itype, + uint64_t user_token); +struct lttng_counter *lttng_session_create_counter( + struct lttng_session *session, + const char *counter_transport_name, + size_t number_dimensions, const size_t *dimensions_sizes, + bool coalesce_hits); struct lttng_event_notifier *lttng_event_notifier_create( const struct lttng_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, @@ -755,13 +963,14 @@ struct lttng_event_notifier *lttng_event_notifier_create( struct lttng_event_notifier *_lttng_event_notifier_create( const struct lttng_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); -int lttng_channel_enable(struct lttng_channel *channel); -int lttng_channel_disable(struct lttng_channel *channel); +int lttng_event_container_enable(struct lttng_event_container *container); +int lttng_event_container_disable(struct lttng_event_container *container); int lttng_event_enable(struct lttng_event *event); int lttng_event_disable(struct lttng_event *event); @@ -771,6 +980,9 @@ int lttng_event_notifier_disable(struct lttng_event_notifier *event_notifier); 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); @@ -809,17 +1021,14 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc, struct lttng_enabler *enabler); #if defined(CONFIG_HAVE_SYSCALL_TRACEPOINTS) -int lttng_syscalls_register_event(struct lttng_channel *chan, void *filter); -int lttng_syscalls_unregister_event(struct lttng_channel *chan); -int lttng_syscalls_destroy_event(struct lttng_channel *chan); -int lttng_syscall_filter_enable_event( - struct lttng_channel *chan, +int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler, void *filter); +int lttng_syscalls_unregister_event_container(struct lttng_event_container *event_container); +int lttng_syscalls_destroy_event_container(struct lttng_event_container *container); +int lttng_syscall_filter_enable_event(struct lttng_event_container *container, struct lttng_event *event); -int lttng_syscall_filter_disable_event( - struct lttng_channel *chan, +int lttng_syscall_filter_disable_event(struct lttng_event_container *container, struct lttng_event *event); - -long lttng_channel_syscall_mask(struct lttng_channel *channel, +long lttng_event_container_syscall_mask(struct lttng_event_container *container, struct lttng_kernel_syscall_mask __user *usyscall_mask); int lttng_syscalls_register_event_notifier( @@ -827,39 +1036,39 @@ int lttng_syscalls_register_event_notifier( void *filter); int lttng_syscals_create_matching_event_notifiers( struct lttng_event_notifier_enabler *event_notifier_enabler, void *filter); -int lttng_syscalls_unregister_event_notifier(struct lttng_event_notifier_group *group); +int lttng_syscalls_unregister_event_notifier_group(struct lttng_event_notifier_group *group); int lttng_syscall_filter_enable_event_notifier(struct lttng_event_notifier *event_notifier); int lttng_syscall_filter_disable_event_notifier(struct lttng_event_notifier *event_notifier); #else static inline int lttng_syscalls_register_event( - struct lttng_channel *chan, void *filter) + struct lttng_event_enabler *event_enabler, void *filter) { return -ENOSYS; } -static inline int lttng_syscalls_unregister_event(struct lttng_channel *chan) +static inline int lttng_syscalls_unregister_event_container(struct lttng_event_container *event_container) { return 0; } -static inline int lttng_syscalls_destroy(struct lttng_channel *chan) +static inline int lttng_syscalls_destroy_event_container(struct lttng_event_container *event_container) { return 0; } -static inline int lttng_syscall_filter_enable_event(struct lttng_channel *chan, +static inline int lttng_syscall_filter_enable_event(struct lttng_event_container *event_container, struct lttng_event *event); { return -ENOSYS; } -static inline int lttng_syscall_filter_disable_event(struct lttng_channel *chan, +static inline int lttng_syscall_filter_disable_event(struct lttng_event_container *event_container, struct lttng_event *event); { return -ENOSYS; } -static inline long lttng_channel_syscall_mask(struct lttng_channel *channel, +static inline long lttng_channel_syscall_mask(struct lttng_event_container *event_container, struct lttng_kernel_syscall_mask __user *usyscall_mask) { return -ENOSYS; @@ -871,7 +1080,7 @@ static inline int lttng_syscalls_register_event_notifier( return -ENOSYS; } -static inline int lttng_syscalls_unregister_event_notifier( +static inline int lttng_syscalls_unregister_event_notifier_group( struct lttng_event_notifier_group *group) { return 0; @@ -898,11 +1107,16 @@ int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event int lttng_event_notifier_enabler_attach_filter_bytecode( struct lttng_event_notifier_enabler *event_notifier_enabler, struct lttng_kernel_filter_bytecode __user *bytecode); +int lttng_event_notifier_enabler_attach_capture_bytecode( + struct lttng_event_notifier_enabler *event_notifier_enabler, + struct lttng_kernel_capture_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); + struct list_head *instance_bytecode_runtime_head, + struct list_head *enabler_bytecode_runtime_head); +void lttng_free_event_filter_runtime(struct lttng_event *event); +void lttng_free_event_notifier_filter_runtime(struct lttng_event_notifier *event_notifier); int lttng_probes_init(void); @@ -956,7 +1170,7 @@ int lttng_add_migratable_to_ctx(struct lttng_ctx **ctx) 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_LINUX_VERSION_CODE >= LTTNG_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 @@ -968,7 +1182,7 @@ int lttng_add_cgroup_ns_to_ctx(struct lttng_ctx **ctx) #endif #if defined(CONFIG_IPC_NS) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) + (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx); #else static inline @@ -979,7 +1193,7 @@ int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx) #endif #if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) + (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx); #else static inline @@ -990,7 +1204,7 @@ int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx) #endif #if defined(CONFIG_NET_NS) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) + (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx); #else static inline @@ -1001,7 +1215,7 @@ int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx) #endif #if defined(CONFIG_PID_NS) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) + (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx); #else static inline @@ -1012,7 +1226,7 @@ int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx) #endif #if defined(CONFIG_USER_NS) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) + (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx); #else static inline @@ -1023,7 +1237,7 @@ int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx) #endif #if defined(CONFIG_UTS_NS) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) + (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx); #else static inline @@ -1034,7 +1248,7 @@ int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx) #endif #if defined(CONFIG_TIME_NS) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) + (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0)) int lttng_add_time_ns_to_ctx(struct lttng_ctx **ctx); #else static inline