X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fevents.h;h=5e456c52a38e3e3b3886fbfb7dff2b19637362b1;hb=28cbcb59855c099a89b02054b15b45ee3ad6a52a;hp=80de505056fe8a265d06c02f43717c92934fc0ea;hpb=99d223adfae9b68800e91bda470c92acb14efae6;p=lttng-modules.git diff --git a/include/lttng/events.h b/include/lttng/events.h index 80de5050..5e456c52 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 @@ -23,7 +23,7 @@ #include #include -#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_nestable, + lttng_kernel_type_array_nestable, + lttng_kernel_type_sequence_nestable, + lttng_kernel_type_struct_nestable, + lttng_kernel_type_variant_nestable, + 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 { @@ -74,7 +74,7 @@ struct lttng_enum_entry { #define __type_integer(_type, _size, _alignment, _signedness, \ _byte_order, _base, _encoding) \ { \ - .atype = atype_integer, \ + .type = lttng_kernel_type_integer, \ .u.integer = \ { \ .size = (_size) ? : sizeof(_type) * CHAR_BIT, \ @@ -82,7 +82,7 @@ struct lttng_enum_entry { .signedness = (_signedness) >= 0 ? (_signedness) : lttng_is_signed_type(_type), \ .reverse_byte_order = _byte_order != __BYTE_ORDER, \ .base = _base, \ - .encoding = lttng_encode_##_encoding, \ + .encoding = lttng_kernel_string_encoding_##_encoding, \ }, \ } \ @@ -92,15 +92,15 @@ struct lttng_integer_type { unsigned int signedness:1, reverse_byte_order:1; unsigned int base; /* 2, 8, 10, 16, for pretty print */ - enum lttng_string_encodings encoding; + enum lttng_kernel_string_encoding encoding; }; struct lttng_type { - enum abstract_types atype; + enum lttng_kernel_type type; union { struct lttng_integer_type integer; struct { - enum lttng_string_encodings encoding; + enum lttng_kernel_string_encoding encoding; } string; struct { const struct lttng_enum_desc *desc; /* Enumeration mapping */ @@ -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 @@ -338,6 +338,7 @@ struct lttng_event { 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 */ @@ -352,10 +353,15 @@ struct lttng_event { int has_enablers_without_bytecode; }; +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; @@ -383,10 +389,12 @@ struct lttng_event_notifier { 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, struct lttng_probe_ctx *lttng_probe_ctx, - const char *interpreter_stack_data); + const char *interpreter_stack_data, + struct lttng_kernel_notifier_ctx *notif_ctx); struct lttng_event_notifier_group *group; /* Weak ref */ }; @@ -426,6 +434,7 @@ 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; @@ -512,6 +521,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; @@ -519,6 +550,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 @@ -547,18 +585,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, @@ -646,6 +685,14 @@ struct lttng_session { char creation_time[LTTNG_KERNEL_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 { struct file *file; /* File associated to event notifier group */ struct file *notif_file; /* File used to expose notifications to userspace. */ @@ -730,7 +777,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_counter_conf *error_counter_conf); void lttng_event_notifier_group_destroy( struct lttng_event_notifier_group *event_notifier_group); @@ -766,6 +829,7 @@ struct lttng_event *lttng_event_compat_old_create(struct lttng_channel *chan, 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, @@ -773,6 +837,7 @@ 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, @@ -789,6 +854,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); @@ -827,8 +895,8 @@ 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_register_event(struct lttng_event_enabler *event_enabler, void *filter); +int lttng_syscalls_unregister_channel(struct lttng_channel *chan); int lttng_syscalls_destroy_event(struct lttng_channel *chan); int lttng_syscall_filter_enable_event( struct lttng_channel *chan, @@ -845,17 +913,17 @@ 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_channel(struct lttng_channel *chan) { return 0; } @@ -889,7 +957,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; @@ -924,6 +992,8 @@ void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc, struct lttng_ctx *ctx, 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); @@ -977,7 +1047,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 @@ -989,7 +1059,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 @@ -1000,7 +1070,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 @@ -1011,7 +1081,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 @@ -1022,7 +1092,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 @@ -1033,7 +1103,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 @@ -1044,7 +1114,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 @@ -1055,7 +1125,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 @@ -1289,7 +1359,7 @@ extern const struct file_operations lttng_syscall_list_fops; static inline bool lttng_is_bytewise_integer(const struct lttng_type *type) { - if (type->atype != atype_integer) + if (type->type != lttng_kernel_type_integer) return false; switch (type->u.integer.size) { case 8: /* Fall-through. */