X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fevents.h;h=122ebc9608e082baaeb08d5efe75e8fc4b965f79;hb=7207017d9b15dafec4ea157ab751b24aaee6cdfe;hp=ee16fc2fc97cb37fd2f5bd8f604d4cc1199cd71a;hpb=0648898e20d4fa769d5e7abd2591dab218888868;p=lttng-modules.git diff --git a/include/lttng/events.h b/include/lttng/events.h index ee16fc2f..122ebc96 100644 --- a/include/lttng/events.h +++ b/include/lttng/events.h @@ -109,7 +109,7 @@ struct lttng_kernel_type_array { struct lttng_kernel_type_sequence { struct lttng_kernel_type_common parent; - const char *length_name; /* Length field name. */ + 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; @@ -124,7 +124,7 @@ struct lttng_kernel_type_struct { struct lttng_kernel_type_variant { struct lttng_kernel_type_common parent; - const char *tag_name; + 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; @@ -246,17 +246,6 @@ struct lttng_kernel_event_field { _fields \ ) -#define lttng_kernel_static_ctx_field(_event_field, _get_size, _get_size_arg, _record, _get_value, _destroy, _priv) \ - __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_ctx_field, { \ - .event_field = (_event_field), \ - .get_size = (_get_size), \ - .get_size_arg = (_get_size_arg), \ - .record = (_record), \ - .get_value = (_get_value), \ - .destroy = (_destroy), \ - .priv = (_priv), \ - }) - #define lttng_kernel_static_enum_entry_value(_string, _value) \ __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_enum_entry, { \ .start = { \ @@ -303,59 +292,11 @@ struct lttng_kernel_event_field { } \ }), -union lttng_ctx_value { - int64_t s64; - const char *str; - double d; -}; - -/* - * We need to keep this perf counter field separately from struct - * lttng_kernel_ctx_field because cpu hotplug needs fixed-location addresses. - */ -struct lttng_perf_counter_field { -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_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 */ - char *name; - struct lttng_kernel_event_field *event_field; -}; - struct lttng_probe_ctx { - struct lttng_kernel_event_recorder *event; - struct lttng_kernel_event_notifier *event_notifier; // Not sure if we will ever need it. + struct lttng_kernel_event_common *event; uint8_t interruptible; }; -struct lttng_kernel_ctx_field { - const struct lttng_kernel_event_field *event_field; - size_t (*get_size)(size_t offset); - size_t (*get_size_arg)(size_t offset, struct lttng_kernel_ctx_field *field, - struct lib_ring_buffer_ctx *ctx, - struct lttng_channel *chan); - void (*record)(struct lttng_kernel_ctx_field *field, - struct lib_ring_buffer_ctx *ctx, - struct lttng_channel *chan); - void (*get_value)(struct lttng_kernel_ctx_field *field, - struct lttng_probe_ctx *lttng_probe_ctx, - union lttng_ctx_value *value); - void (*destroy)(struct lttng_kernel_ctx_field *field); - void *priv; -}; - -struct lttng_kernel_ctx { - struct lttng_kernel_ctx_field *fields; - unsigned int nr_fields; - unsigned int allocated_fields; - size_t largest_align; /* in bytes */ -}; - struct lttng_kernel_event_desc { const char *event_name; /* lttng-modules name */ const char *event_kname; /* Linux kernel name (tracepoints) */ @@ -364,7 +305,6 @@ struct lttng_kernel_event_desc { const struct lttng_kernel_event_field **fields; /* event payload */ unsigned int nr_fields; struct module *owner; - void *event_notifier_callback; }; struct lttng_kernel_probe_desc { @@ -378,13 +318,13 @@ struct lttng_kernel_probe_desc { struct lttng_krp; /* Kretprobe handling */ -enum lttng_bytecode_node_type { - LTTNG_BYTECODE_NODE_TYPE_FILTER, - LTTNG_BYTECODE_NODE_TYPE_CAPTURE, +enum lttng_kernel_bytecode_type { + LTTNG_KERNEL_BYTECODE_TYPE_FILTER, + LTTNG_KERNEL_BYTECODE_TYPE_CAPTURE, }; struct lttng_bytecode_node { - enum lttng_bytecode_node_type type; + enum lttng_kernel_bytecode_type type; struct list_head node; struct lttng_enabler *enabler; struct { @@ -395,29 +335,16 @@ struct lttng_bytecode_node { } bc; }; -/* - * Bytecode interpreter return value masks. - */ -enum lttng_bytecode_interpreter_ret { - LTTNG_INTERPRETER_DISCARD = 0, - LTTNG_INTERPRETER_RECORD_FLAG = (1ULL << 0), - /* Other bits are kept for future use. */ -}; - struct lttng_interpreter_output; struct lttng_bytecode_runtime { /* Associated bytecode */ + enum lttng_kernel_bytecode_type type; struct lttng_bytecode_node *bc; - 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, + int (*interpreter_func)(struct lttng_bytecode_runtime *kernel_bytecode, + const char *interpreter_stack_data, struct lttng_probe_ctx *lttng_probe_ctx, - const char *capture_stack_data, - struct lttng_interpreter_output *output); - } interpreter_funcs; + void *caller_ctx); int link_failed; struct list_head node; /* list of bytecode runtime in event */ struct lttng_kernel_ctx *ctx; @@ -432,10 +359,7 @@ struct lttng_enabler_ref { }; struct lttng_uprobe_handler { - union { - struct lttng_kernel_event_recorder *event; - struct lttng_kernel_event_notifier *event_notifier; - } u; + struct lttng_kernel_event_common *event; loff_t offset; struct uprobe_consumer up_consumer; struct list_head node; @@ -461,6 +385,14 @@ enum lttng_syscall_abi { LTTNG_SYSCALL_ABI_COMPAT, }; +/* + * Result of the run_filter() callback. + */ +enum lttng_kernel_event_filter_result { + LTTNG_KERNEL_EVENT_FILTER_ACCEPT = 0, + LTTNG_KERNEL_EVENT_FILTER_REJECT = 1, +}; + struct lttng_kernel_event_common_private; enum lttng_kernel_event_type { @@ -476,8 +408,9 @@ struct lttng_kernel_event_common { int enabled; int eval_filter; /* Need to evaluate filters */ - int (*run_filter)(struct lttng_kernel_event_common *event, + int (*run_filter)(const struct lttng_kernel_event_common *event, const char *stack_data, + struct lttng_probe_ctx *probe_ctx, void *filter_ctx); }; @@ -502,8 +435,8 @@ struct lttng_kernel_event_notifier { int eval_capture; /* Need to evaluate capture */ void (*notification_send)(struct lttng_kernel_event_notifier *event_notifier, - struct lttng_probe_ctx *probe_ctx, const char *stack_data, + struct lttng_probe_ctx *probe_ctx, struct lttng_kernel_notification_ctx *notif_ctx); }; @@ -512,54 +445,6 @@ enum lttng_enabler_format_type { LTTNG_ENABLER_FORMAT_NAME, }; -/* - * Enabler field, within whatever object is enabling an event. Target of - * backward reference. - */ -struct lttng_enabler { - enum lttng_enabler_format_type format_type; - - /* head list of struct lttng_bytecode_node */ - struct list_head filter_bytecode_head; - - struct lttng_kernel_abi_event event_param; - unsigned int enabled:1; - - uint64_t user_token; /* User-provided token. */ -}; - -struct lttng_event_enabler { - struct lttng_enabler base; - struct list_head node; /* per-session list of enablers */ - struct lttng_channel *chan; -}; - -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) -{ - return &event_enabler->base; -} - -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_channel_ops { struct channel *(*channel_create)(const char *name, void *priv, @@ -571,8 +456,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); @@ -941,11 +825,8 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create( int lttng_channel_enable(struct lttng_channel *channel); int lttng_channel_disable(struct lttng_channel *channel); -int lttng_event_enable(struct lttng_kernel_event_recorder *event); -int lttng_event_disable(struct lttng_kernel_event_recorder *event); - -int lttng_event_notifier_enable(struct lttng_kernel_event_notifier *event_notifier); -int lttng_event_notifier_disable(struct lttng_kernel_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); @@ -1091,186 +972,6 @@ void lttng_free_event_filter_runtime(struct lttng_kernel_event_common *event); int lttng_probes_init(void); -extern struct lttng_kernel_ctx *lttng_static_ctx; - -int lttng_context_init(void); -void lttng_context_exit(void); -int lttng_kernel_context_append(struct lttng_kernel_ctx **ctx_p, - const struct lttng_kernel_ctx_field *f); -void lttng_kernel_context_remove_last(struct lttng_kernel_ctx **ctx_p); -struct lttng_kernel_ctx_field *lttng_kernel_get_context_field_from_index(struct lttng_kernel_ctx *ctx, - size_t index); -int lttng_kernel_find_context(struct lttng_kernel_ctx *ctx, const char *name); -int lttng_kernel_get_context_index(struct lttng_kernel_ctx *ctx, const char *name); -void lttng_kernel_destroy_context(struct lttng_kernel_ctx *ctx); -int lttng_add_pid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_cpu_id_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_procname_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_prio_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_nice_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_vpid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_tid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_vtid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_ppid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_vppid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_hostname_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_interruptible_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_need_reschedule_to_ctx(struct lttng_kernel_ctx **ctx); -#if defined(CONFIG_PREEMPT_RT_FULL) || defined(CONFIG_PREEMPT) -int lttng_add_preemptible_to_ctx(struct lttng_kernel_ctx **ctx); -#else -static inline -int lttng_add_preemptible_to_ctx(struct lttng_kernel_ctx **ctx) -{ - return -ENOSYS; -} -#endif -#ifdef CONFIG_PREEMPT_RT_FULL -int lttng_add_migratable_to_ctx(struct lttng_kernel_ctx **ctx); -#else -static inline -int lttng_add_migratable_to_ctx(struct lttng_kernel_ctx **ctx) -{ - return -ENOSYS; -} -#endif - -int lttng_add_callstack_to_ctx(struct lttng_kernel_ctx **ctx, int type); - -#if defined(CONFIG_CGROUPS) && \ - ((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_kernel_ctx **ctx); -#else -static inline -int lttng_add_cgroup_ns_to_ctx(struct lttng_kernel_ctx **ctx) -{ - return -ENOSYS; -} -#endif - -#if defined(CONFIG_IPC_NS) && \ - (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) -int lttng_add_ipc_ns_to_ctx(struct lttng_kernel_ctx **ctx); -#else -static inline -int lttng_add_ipc_ns_to_ctx(struct lttng_kernel_ctx **ctx) -{ - return -ENOSYS; -} -#endif - -#if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \ - (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) -int lttng_add_mnt_ns_to_ctx(struct lttng_kernel_ctx **ctx); -#else -static inline -int lttng_add_mnt_ns_to_ctx(struct lttng_kernel_ctx **ctx) -{ - return -ENOSYS; -} -#endif - -#if defined(CONFIG_NET_NS) && \ - (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) -int lttng_add_net_ns_to_ctx(struct lttng_kernel_ctx **ctx); -#else -static inline -int lttng_add_net_ns_to_ctx(struct lttng_kernel_ctx **ctx) -{ - return -ENOSYS; -} -#endif - -#if defined(CONFIG_PID_NS) && \ - (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) -int lttng_add_pid_ns_to_ctx(struct lttng_kernel_ctx **ctx); -#else -static inline -int lttng_add_pid_ns_to_ctx(struct lttng_kernel_ctx **ctx) -{ - return -ENOSYS; -} -#endif - -#if defined(CONFIG_USER_NS) && \ - (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) -int lttng_add_user_ns_to_ctx(struct lttng_kernel_ctx **ctx); -#else -static inline -int lttng_add_user_ns_to_ctx(struct lttng_kernel_ctx **ctx) -{ - return -ENOSYS; -} -#endif - -#if defined(CONFIG_UTS_NS) && \ - (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) -int lttng_add_uts_ns_to_ctx(struct lttng_kernel_ctx **ctx); -#else -static inline -int lttng_add_uts_ns_to_ctx(struct lttng_kernel_ctx **ctx) -{ - return -ENOSYS; -} -#endif - -#if defined(CONFIG_TIME_NS) && \ - (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0)) -int lttng_add_time_ns_to_ctx(struct lttng_kernel_ctx **ctx); -#else -static inline -int lttng_add_time_ns_to_ctx(struct lttng_kernel_ctx **ctx) -{ - return -ENOSYS; -} -#endif - -int lttng_add_uid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_euid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_suid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_gid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_egid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_sgid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_vuid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_veuid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_vsuid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_vgid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_vegid_to_ctx(struct lttng_kernel_ctx **ctx); -int lttng_add_vsgid_to_ctx(struct lttng_kernel_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_kernel_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_kernel_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); @@ -1331,23 +1032,18 @@ void lttng_kprobes_destroy_event_notifier_private(struct lttng_kernel_event_noti } #endif -int lttng_event_add_callsite(struct lttng_kernel_event_recorder *event, - struct lttng_kernel_abi_event_callsite __user *callsite); - -int lttng_event_notifier_add_callsite(struct lttng_kernel_event_notifier *event_notifier, +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_event(const char *name, int fd, struct lttng_kernel_event_recorder *event); -int lttng_uprobes_event_add_callsite(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); -int lttng_uprobes_event_notifier_add_callsite(struct lttng_kernel_event_notifier *event_notifier, - struct lttng_kernel_abi_event_callsite __user *callsite); 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 @@ -1359,7 +1055,7 @@ int lttng_uprobes_register_event(const char *name, } static inline -int lttng_uprobes_event_add_callsite(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) { return -ENOSYS; @@ -1382,13 +1078,6 @@ int lttng_uprobes_register_event_notifier(const char *name, return -ENOSYS; } -static inline -int lttng_uprobes_event_notifier_add_callsite(struct lttng_kernel_event_notifier *event_notifier, - struct lttng_kernel_abi_event_callsite __user *callsite) -{ - return -ENOSYS; -} - static inline void lttng_uprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier) { @@ -1409,7 +1098,7 @@ int lttng_kretprobes_register(const char *name, 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_recorder *event, +int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_common *event, int enable); #else static inline @@ -1434,7 +1123,7 @@ void lttng_kretprobes_destroy_private(struct lttng_kernel_event_recorder *event) } static inline -int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_recorder *event, +int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_common *event, int enable) { return -ENOSYS;