X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fevents-internal.h;h=3c741e66171ff3291f0835204c798ba46c2c4c8e;hb=19bef247a29761d0f9ecca993e7088b46456f199;hp=f0d0b0dabd30c3eb02014fd2ec4036e9e78e424f;hpb=8a20497ff97f1d3252c753f33c809ac6333589c8;p=lttng-modules.git diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h index f0d0b0da..3c741e66 100644 --- a/include/lttng/events-internal.h +++ b/include/lttng/events-internal.h @@ -8,19 +8,32 @@ #ifndef _LTTNG_EVENTS_INTERNAL_H #define _LTTNG_EVENTS_INTERNAL_H +#include + #include +struct lttng_syscall_filter; +struct lttng_metadata_cache; +struct perf_event; +struct perf_event_attr; +struct lttng_kernel_ring_buffer_config; + enum lttng_enabler_format_type { LTTNG_ENABLER_FORMAT_STAR_GLOB, LTTNG_ENABLER_FORMAT_NAME, }; +enum channel_type { + PER_CPU_CHANNEL, + METADATA_CHANNEL, +}; + /* * 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_event_enabler_common *ref; /* backward ref */ }; struct lttng_krp; /* Kretprobe handling */ @@ -64,6 +77,9 @@ struct lttng_kernel_event_common_private { int has_enablers_without_filter_bytecode; /* list of struct lttng_kernel_bytecode_runtime, sorted by seqnum */ struct list_head filter_bytecode_runtime_head; + + struct hlist_node hlist_node; /* node in events hash table */ + enum lttng_kernel_abi_instrumentation instrumentation; /* Selected by instrumentation */ union { @@ -87,7 +103,6 @@ struct lttng_kernel_event_recorder_private { struct lttng_kernel_event_recorder *pub; /* Public event interface */ struct list_head node; /* Event recorder list */ - struct hlist_node hlist; /* Hash table of event recorders */ struct lttng_kernel_ctx *ctx; unsigned int id; unsigned int metadata_dumped:1; @@ -101,9 +116,59 @@ struct lttng_kernel_event_notifier_private { size_t num_captures; /* Needed to allocate the msgpack array. */ uint64_t error_counter_index; struct list_head node; /* Event notifier list */ - struct hlist_node hlist; /* Hash table of event notifiers */ struct list_head capture_bytecode_runtime_head; +}; + +struct lttng_kernel_syscall_table { + unsigned int sys_enter_registered:1, + sys_exit_registered:1; + + struct hlist_head *syscall_dispatch; /* for syscall tracing */ + struct hlist_head *compat_syscall_dispatch; + struct hlist_head *syscall_exit_dispatch; /* for syscall exit tracing */ + struct hlist_head *compat_syscall_exit_dispatch; + + /* + * 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 unknown_syscall_dispatch; /* for unknown syscalls */ + struct hlist_head compat_unknown_syscall_dispatch; + struct hlist_head unknown_syscall_exit_dispatch; + struct hlist_head compat_unknown_syscall_exit_dispatch; + + struct lttng_syscall_filter *sc_filter; + int syscall_all_entry; + int syscall_all_exit; +}; + +struct lttng_kernel_channel_common_private { + struct lttng_kernel_channel_common *pub; + + struct file *file; /* File associated to channel */ + unsigned int tstate:1; /* Transient enable state */ + + struct lttng_kernel_syscall_table syscall_table; +}; + +struct lttng_kernel_channel_buffer_private { + struct lttng_kernel_channel_common_private parent; + struct lttng_kernel_channel_buffer *pub; + + unsigned int id; /* Channel ID */ + unsigned int free_event_id; /* Next event ID to allocate */ + int header_type; /* 0: unset, 1: compact, 2: large */ + + enum channel_type channel_type; + struct lttng_kernel_ctx *ctx; + struct lttng_kernel_ring_buffer_channel *rb_chan; /* Ring buffer channel */ + unsigned int metadata_dumped:1; + struct list_head node; /* Channel list in session */ + struct lttng_transport *transport; }; enum lttng_kernel_bytecode_interpreter_ret { @@ -127,10 +192,15 @@ enum lttng_kernel_bytecode_type { LTTNG_KERNEL_BYTECODE_TYPE_CAPTURE, }; +enum lttng_kernel_event_enabler_type { + LTTNG_EVENT_ENABLER_TYPE_RECORDER, + LTTNG_EVENT_ENABLER_TYPE_NOTIFIER, +}; + struct lttng_kernel_bytecode_node { enum lttng_kernel_bytecode_type type; struct list_head node; - struct lttng_enabler *enabler; + struct lttng_event_enabler_common *enabler; struct { uint32_t len; uint32_t reloc_offset; @@ -156,7 +226,8 @@ struct lttng_kernel_bytecode_runtime { * Enabler field, within whatever object is enabling an event. Target of * backward reference. */ -struct lttng_enabler { +struct lttng_event_enabler_common { + enum lttng_kernel_event_enabler_type enabler_type; enum lttng_enabler_format_type format_type; /* head list of struct lttng_kernel_bytecode_node */ @@ -168,16 +239,18 @@ struct lttng_enabler { 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_recorder_enabler { + struct lttng_event_enabler_common parent; + struct list_head node; /* per-session list of enablers */ + bool published; /* published in per-session list. */ + struct lttng_kernel_channel_buffer *chan; }; struct lttng_event_notifier_enabler { - struct lttng_enabler base; + struct lttng_event_enabler_common parent; uint64_t error_counter_index; struct list_head node; /* List of event_notifier enablers */ + bool published; /* published in group list. */ struct lttng_event_notifier_group *group; /* head list of struct lttng_kernel_bytecode_node */ @@ -216,8 +289,8 @@ struct lttng_kernel_ctx_field { size_t (*get_size)(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset); void (*record)(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, - struct lib_ring_buffer_ctx *ctx, - struct lttng_channel *chan); + struct lttng_kernel_ring_buffer_ctx *ctx, + struct lttng_kernel_channel_buffer *chan); void (*get_value)(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lttng_ctx_value *value); void (*destroy)(void *priv); @@ -243,6 +316,186 @@ struct lttng_metadata_cache { uint64_t version; /* Current version of the metadata */ }; +struct lttng_metadata_stream { + void *priv; /* Ring buffer private data */ + struct lttng_metadata_cache *metadata_cache; + unsigned int metadata_in; /* Bytes read from the cache */ + unsigned int metadata_out; /* Bytes consumed from stream */ + int finalized; /* Has channel been finalized */ + wait_queue_head_t read_wait; /* Reader buffer-level wait queue */ + struct list_head list; /* Stream list */ + struct lttng_transport *transport; + uint64_t version; /* Current version of the metadata cache */ + bool coherent; /* Stream in a coherent state */ +}; + +struct lttng_kernel_channel_buffer_ops_private { + struct lttng_kernel_channel_buffer_ops *pub; /* Public channel buffer ops interface */ + + struct lttng_kernel_ring_buffer_channel *(*channel_create)(const char *name, + void *priv, + void *buf_addr, + size_t subbuf_size, size_t num_subbuf, + unsigned int switch_timer_interval, + unsigned int read_timer_interval); + void (*channel_destroy)(struct lttng_kernel_ring_buffer_channel *chan); + struct lttng_kernel_ring_buffer *(*buffer_read_open)(struct lttng_kernel_ring_buffer_channel *chan); + int (*buffer_has_read_closed_stream)(struct lttng_kernel_ring_buffer_channel *chan); + void (*buffer_read_close)(struct lttng_kernel_ring_buffer *buf); + /* + * packet_avail_size returns the available size in the current + * packet. Note that the size returned is only a hint, since it + * may change due to concurrent writes. + */ + size_t (*packet_avail_size)(struct lttng_kernel_ring_buffer_channel *chan); + wait_queue_head_t *(*get_writer_buf_wait_queue)(struct lttng_kernel_ring_buffer_channel *chan, int cpu); + wait_queue_head_t *(*get_hp_wait_queue)(struct lttng_kernel_ring_buffer_channel *chan); + int (*is_finalized)(struct lttng_kernel_ring_buffer_channel *chan); + int (*is_disabled)(struct lttng_kernel_ring_buffer_channel *chan); + int (*timestamp_begin) (const struct lttng_kernel_ring_buffer_config *config, + struct lttng_kernel_ring_buffer *bufb, + uint64_t *timestamp_begin); + int (*timestamp_end) (const struct lttng_kernel_ring_buffer_config *config, + struct lttng_kernel_ring_buffer *bufb, + uint64_t *timestamp_end); + int (*events_discarded) (const struct lttng_kernel_ring_buffer_config *config, + struct lttng_kernel_ring_buffer *bufb, + uint64_t *events_discarded); + int (*content_size) (const struct lttng_kernel_ring_buffer_config *config, + struct lttng_kernel_ring_buffer *bufb, + uint64_t *content_size); + int (*packet_size) (const struct lttng_kernel_ring_buffer_config *config, + struct lttng_kernel_ring_buffer *bufb, + uint64_t *packet_size); + int (*stream_id) (const struct lttng_kernel_ring_buffer_config *config, + struct lttng_kernel_ring_buffer *bufb, + uint64_t *stream_id); + int (*current_timestamp) (const struct lttng_kernel_ring_buffer_config *config, + struct lttng_kernel_ring_buffer *bufb, + uint64_t *ts); + int (*sequence_number) (const struct lttng_kernel_ring_buffer_config *config, + struct lttng_kernel_ring_buffer *bufb, + uint64_t *seq); + int (*instance_id) (const struct lttng_kernel_ring_buffer_config *config, + struct lttng_kernel_ring_buffer *bufb, + 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_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; +}; + +#define LTTNG_EVENT_HT_BITS 12 +#define LTTNG_EVENT_HT_SIZE (1U << LTTNG_EVENT_HT_BITS) + +struct lttng_event_ht { + struct hlist_head table[LTTNG_EVENT_HT_SIZE]; +}; + +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. */ + struct list_head node; /* event notifier group list */ + struct list_head enablers_head; /* List of enablers */ + struct list_head event_notifiers_head; /* List of event notifier */ + struct lttng_event_ht events_ht; /* Hash table of event notifiers */ + struct lttng_kernel_channel_buffer_ops *ops; + struct lttng_transport *transport; + struct lttng_kernel_ring_buffer_channel *chan; /* Ring buffer channel for event notifier group. */ + struct lttng_kernel_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_syscall_table syscall_table; + + struct lttng_counter *error_counter; + size_t error_counter_len; +}; + +struct lttng_transport { + char *name; + struct module *owner; + struct list_head node; + struct lttng_kernel_channel_buffer_ops ops; +}; + +struct lttng_counter_transport { + char *name; + struct module *owner; + struct list_head node; + struct lttng_counter_ops ops; +}; + +struct lttng_kernel_session_private { + struct lttng_kernel_session *pub; /* Public session interface */ + + int been_active; /* Has trace session been active ? */ + struct file *file; /* File associated to session */ + struct list_head chan; /* Channel list head */ + struct list_head events; /* Event 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 */ + struct lttng_metadata_cache *metadata_cache; + unsigned int metadata_dumped:1, + tstate:1; /* Transient enable state */ + /* List of event enablers */ + struct list_head enablers_head; + /* Hash table of events */ + struct lttng_event_ht events_ht; + char name[LTTNG_KERNEL_ABI_SESSION_NAME_LEN]; + char creation_time[LTTNG_KERNEL_ABI_SESSION_CREATION_TIME_ISO8601_LEN]; +}; + +struct lttng_id_hash_node { + struct hlist_node hlist; + int id; +}; + +enum tracker_type { + TRACKER_PID, + TRACKER_VPID, + TRACKER_UID, + TRACKER_VUID, + TRACKER_GID, + TRACKER_VGID, + + TRACKER_UNKNOWN, +}; + +struct lttng_kernel_id_tracker_private { + struct lttng_kernel_id_tracker *pub; /* Public interface */ + + struct lttng_kernel_session *session; + enum tracker_type tracker_type; +}; + extern struct lttng_kernel_ctx *lttng_static_ctx; static inline @@ -308,9 +561,12 @@ static inline bool lttng_kernel_type_is_bytewise_integer(const struct lttng_kern if (!type_integer) return false; switch (type_integer->size) { - case 8: /* Fall-through. */ - case 16: /* Fall-through. */ - case 32: /* Fall-through. */ + case 8: + lttng_fallthrough; + case 16: + lttng_fallthrough; + case 32: + lttng_fallthrough; case 64: break; default: @@ -325,17 +581,17 @@ int lttng_kernel_interpret_event_filter(const struct lttng_kernel_event_common * void *event_filter_ctx); static inline -struct lttng_enabler *lttng_event_enabler_as_enabler( - struct lttng_event_enabler *event_enabler) +struct lttng_event_enabler_common *lttng_event_recorder_enabler_as_enabler( + struct lttng_event_recorder_enabler *event_recorder_enabler) { - return &event_enabler->base; + return &event_recorder_enabler->parent; } static inline -struct lttng_enabler *lttng_event_notifier_enabler_as_enabler( +struct lttng_event_enabler_common *lttng_event_notifier_enabler_as_enabler( struct lttng_event_notifier_enabler *event_notifier_enabler) { - return &event_notifier_enabler->base; + return &event_notifier_enabler->parent; } int lttng_context_init(void); @@ -461,7 +717,8 @@ int lttng_add_uts_ns_to_ctx(struct lttng_kernel_ctx **ctx) #endif #if defined(CONFIG_TIME_NS) && \ - (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0)) + (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0) || \ + LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0)) int lttng_add_time_ns_to_ctx(struct lttng_kernel_ctx **ctx); #else static inline @@ -516,34 +773,31 @@ int lttng_cpuhp_perf_counter_dead(unsigned int cpu, } #endif -struct lttng_event_enabler *lttng_event_enabler_create( +struct lttng_event_recorder_enabler *lttng_event_recorder_enabler_create( enum lttng_enabler_format_type format_type, struct lttng_kernel_abi_event *event_param, - struct lttng_channel *chan); + struct lttng_kernel_channel_buffer *chan); +void lttng_event_enabler_session_add(struct lttng_kernel_session *session, + struct lttng_event_recorder_enabler *event_enabler); -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_abi_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_kernel_abi_event_notifier *event_notifier_param, + struct lttng_event_notifier_group *event_notifier_group); +void lttng_event_notifier_enabler_group_add(struct lttng_event_notifier_group *event_notifier_group, struct lttng_event_notifier_enabler *event_notifier_enabler); - -int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event_enabler, - struct lttng_kernel_abi_filter_bytecode __user *bytecode); -int lttng_event_notifier_enabler_attach_filter_bytecode( - struct lttng_event_notifier_enabler *event_notifier_enabler, - struct lttng_kernel_abi_filter_bytecode __user *bytecode); int lttng_event_notifier_enabler_attach_capture_bytecode( struct lttng_event_notifier_enabler *event_notifier_enabler, struct lttng_kernel_abi_capture_bytecode __user *bytecode); +int lttng_event_enabler_enable(struct lttng_event_enabler_common *event_enabler); +int lttng_event_enabler_disable(struct lttng_event_enabler_common *event_enabler); +int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler_common *event_enabler, + struct lttng_kernel_abi_filter_bytecode __user *bytecode); +void lttng_event_enabler_destroy(struct lttng_event_enabler_common *event_enabler); + int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc, - struct lttng_enabler *enabler); + struct lttng_event_enabler_common *enabler); void lttng_enabler_link_bytecode(const struct lttng_kernel_event_desc *event_desc, struct lttng_kernel_ctx *ctx, @@ -551,83 +805,48 @@ void lttng_enabler_link_bytecode(const struct lttng_kernel_event_desc *event_des struct list_head *enabler_bytecode_runtime_head); #if defined(CONFIG_HAVE_SYSCALL_TRACEPOINTS) -int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler); -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, - struct lttng_kernel_event_recorder *event); -int lttng_syscall_filter_disable_event( - struct lttng_channel *chan, - struct lttng_kernel_event_recorder *event); - -long lttng_channel_syscall_mask(struct lttng_channel *channel, - struct lttng_kernel_abi_syscall_mask __user *usyscall_mask); - -int lttng_syscalls_register_event_notifier( - struct lttng_event_notifier_enabler *event_notifier_enabler); -int lttng_syscalls_create_matching_event_notifiers( - struct lttng_event_notifier_enabler *event_notifier_enabler); -int lttng_syscalls_unregister_event_notifier_group(struct lttng_event_notifier_group *group); -int lttng_syscall_filter_enable_event_notifier(struct lttng_kernel_event_notifier *event_notifier); -int lttng_syscall_filter_disable_event_notifier(struct lttng_kernel_event_notifier *event_notifier); -#else -static inline int lttng_syscalls_register_event( - struct lttng_event_enabler *event_enabler) -{ - return -ENOSYS; -} - -static inline int lttng_syscalls_unregister_channel(struct lttng_channel *chan) -{ - return 0; -} +int lttng_syscalls_register_event(struct lttng_event_enabler_common *event_enabler); +int lttng_syscall_filter_enable_event(struct lttng_kernel_event_common *event); +int lttng_syscall_filter_disable_event(struct lttng_kernel_event_common *event); -static inline int lttng_syscalls_destroy(struct lttng_channel *chan) -{ - return 0; -} +int lttng_syscalls_unregister_syscall_table(struct lttng_kernel_syscall_table *syscall_table); +int lttng_syscalls_destroy_syscall_table(struct lttng_kernel_syscall_table *syscall_table); -static inline int lttng_syscall_filter_enable_event(struct lttng_channel *chan, - struct lttng_kernel_event_recorder *event); +long lttng_syscall_table_get_active_mask(struct lttng_kernel_syscall_table *syscall_table, + struct lttng_kernel_abi_syscall_mask __user *usyscall_mask); +#else +static inline int lttng_syscalls_register_event(struct lttng_event_enabler_common *event_enabler) { return -ENOSYS; } -static inline int lttng_syscall_filter_disable_event(struct lttng_channel *chan, - struct lttng_kernel_event_recorder *event); +static inline int lttng_syscall_filter_enable_event(struct lttng_kernel_event_common *event) { return -ENOSYS; } -static inline long lttng_channel_syscall_mask(struct lttng_channel *channel, - struct lttng_kernel_syscall_mask __user *usyscall_mask) +static inline int lttng_syscall_filter_disable_event(struct lttng_kernel_event_common *event) { return -ENOSYS; } -static inline int lttng_syscalls_register_event_notifier( - struct lttng_event_notifier_group *group) +static inline int lttng_syscalls_unregister_syscall_table(struct lttng_kernel_syscall_table *syscall_table) { - return -ENOSYS; + return 0; } -static inline int lttng_syscalls_unregister_event_notifier_group( - struct lttng_event_notifier_group *group) +static inline int lttng_syscalls_destroy_syscall_table(struct lttng_kernel_syscall_table *syscall_table) { return 0; } -static inline int lttng_syscall_filter_enable_event_notifier( - struct lttng_event_notifier_group *group, - const char *name) +static inline long lttng_syscall_table_get_active_mask(struct lttng_kernel_syscall_table *syscall_table, + struct lttng_kernel_abi_syscall_mask __user *usyscall_mask) { return -ENOSYS; } -static inline int lttng_syscall_filter_disable_event_notifier( - struct lttng_event_notifier_group *group, - const char *name) +static inline int lttng_syscalls_create_matching_event_notifiers(struct lttng_event_notifier_enabler *event_notifier_enabler) { return -ENOSYS; } @@ -639,52 +858,27 @@ int lttng_kprobes_register_event(const char *name, const char *symbol_name, uint64_t offset, uint64_t addr, - 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_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); + struct lttng_kernel_event_common *event); +void lttng_kprobes_unregister_event(struct lttng_kernel_event_common *event); +void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_common *event); #else static inline int lttng_kprobes_register_event(const char *name, const char *symbol_name, uint64_t offset, uint64_t addr, - struct lttng_kernel_event_recorder *event) + struct lttng_kernel_event_common *event) { return -ENOSYS; } static inline -void lttng_kprobes_unregister_event(struct lttng_kernel_event_recorder *event) +void lttng_kprobes_unregister_event(struct lttng_kernel_event_common *event) { } static inline -void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_recorder *event) -{ -} - -static inline -int lttng_kprobes_register_event_notifier(const char *symbol_name, - uint64_t offset, - uint64_t addr, - struct lttng_kernel_event_notifier *event_notifier) -{ - return -ENOSYS; -} - -static inline -void lttng_kprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier) -{ -} - -static inline -void lttng_kprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier) +void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_common *event) { } #endif @@ -694,19 +888,15 @@ int lttng_event_add_callsite(struct lttng_kernel_event_common *event, #ifdef CONFIG_UPROBES int lttng_uprobes_register_event(const char *name, - int fd, struct lttng_kernel_event_recorder *event); + int fd, struct lttng_kernel_event_common *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); +void lttng_uprobes_unregister_event(struct lttng_kernel_event_common *event); +void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_common *event); #else static inline int lttng_uprobes_register_event(const char *name, - int fd, struct lttng_kernel_event_recorder *event) + int fd, struct lttng_kernel_event_common *event) { return -ENOSYS; } @@ -719,29 +909,12 @@ int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_common *event, } static inline -void lttng_uprobes_unregister_event(struct lttng_kernel_event_recorder *event) +void lttng_uprobes_unregister_event(struct lttng_kernel_event_common *event) { } static inline -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) +void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_common *event) { } #endif @@ -751,10 +924,10 @@ int lttng_kretprobes_register(const char *name, const char *symbol_name, uint64_t offset, uint64_t addr, - 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); + struct lttng_kernel_event_common *event_entry, + struct lttng_kernel_event_common *event_exit); +void lttng_kretprobes_unregister(struct lttng_kernel_event_common *event); +void lttng_kretprobes_destroy_private(struct lttng_kernel_event_common *event); int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_common *event, int enable); #else @@ -763,19 +936,19 @@ int lttng_kretprobes_register(const char *name, const char *symbol_name, uint64_t offset, uint64_t addr, - struct lttng_kernel_event_recorder *event_entry, - struct lttng_kernel_event_recorder *event_exit) + struct lttng_kernel_event_common *event_entry, + struct lttng_kernel_event_common *event_exit) { return -ENOSYS; } static inline -void lttng_kretprobes_unregister(struct lttng_kernel_event_recorder *event) +void lttng_kretprobes_unregister(struct lttng_kernel_event_common *event) { } static inline -void lttng_kretprobes_destroy_private(struct lttng_kernel_event_recorder *event) +void lttng_kretprobes_destroy_private(struct lttng_kernel_event_common *event) { } @@ -797,12 +970,12 @@ int lttng_fix_pending_event_notifiers(void); int lttng_session_active(void); bool lttng_event_notifier_active(void); -struct lttng_session *lttng_session_create(void); -int lttng_session_enable(struct lttng_session *session); -int lttng_session_disable(struct lttng_session *session); -void lttng_session_destroy(struct lttng_session *session); -int lttng_session_metadata_regenerate(struct lttng_session *session); -int lttng_session_statedump(struct lttng_session *session); +struct lttng_kernel_session *lttng_session_create(void); +int lttng_session_enable(struct lttng_kernel_session *session); +int lttng_session_disable(struct lttng_kernel_session *session); +void lttng_session_destroy(struct lttng_kernel_session *session); +int lttng_session_metadata_regenerate(struct lttng_kernel_session *session); +int lttng_session_statedump(struct lttng_kernel_session *session); void metadata_cache_destroy(struct kref *kref); struct lttng_counter *lttng_kernel_counter_create( @@ -823,49 +996,35 @@ int lttng_event_notifier_group_create_error_counter( void lttng_event_notifier_group_destroy( struct lttng_event_notifier_group *event_notifier_group); -struct lttng_channel *lttng_channel_create(struct lttng_session *session, +struct lttng_kernel_channel_buffer *lttng_channel_buffer_create(struct lttng_kernel_session *session, const char *transport_name, void *buf_addr, size_t subbuf_size, size_t num_subbuf, 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, +struct lttng_kernel_channel_buffer *lttng_global_channel_create(struct lttng_kernel_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_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, +void lttng_metadata_channel_destroy(struct lttng_kernel_channel_buffer *chan); +struct lttng_kernel_event_recorder *lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *event_enabler, + const struct lttng_kernel_event_desc *event_desc); +struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *event_enabler, + const struct lttng_kernel_event_desc *event_desc); +struct lttng_kernel_event_recorder *lttng_event_compat_old_create(struct lttng_kernel_channel_buffer *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_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_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); +struct lttng_kernel_event_notifier *lttng_event_notifier_create(struct lttng_event_notifier_enabler *event_enabler, + const struct lttng_kernel_event_desc *event_notifier_desc); +struct lttng_kernel_event_notifier *_lttng_event_notifier_create(struct lttng_event_notifier_enabler *event_enabler, + const struct lttng_kernel_event_desc *event_notifier_desc); + +int lttng_channel_enable(struct lttng_kernel_channel_common *channel); +int lttng_channel_disable(struct lttng_kernel_channel_common *channel); int lttng_event_enable(struct lttng_kernel_event_common *event); int lttng_event_disable(struct lttng_kernel_event_common *event); @@ -887,20 +1046,24 @@ int lttng_probes_init(void); void lttng_probes_exit(void); int lttng_metadata_output_channel(struct lttng_metadata_stream *stream, - struct channel *chan, bool *coherent); + struct lttng_kernel_ring_buffer_channel *chan, bool *coherent); int lttng_id_tracker_get_node_id(const struct lttng_id_hash_node *node); -int lttng_id_tracker_empty_set(struct lttng_id_tracker *lf); -void lttng_id_tracker_destroy(struct lttng_id_tracker *lf, bool rcu); -int lttng_id_tracker_add(struct lttng_id_tracker *lf, int id); -int lttng_id_tracker_del(struct lttng_id_tracker *lf, int id); - -int lttng_session_track_id(struct lttng_session *session, +int lttng_id_tracker_empty_set(struct lttng_kernel_id_tracker *lf); +int lttng_id_tracker_init(struct lttng_kernel_id_tracker *lf, + struct lttng_kernel_session *session, + enum tracker_type type); +void lttng_id_tracker_fini(struct lttng_kernel_id_tracker *lf); +void lttng_id_tracker_destroy(struct lttng_kernel_id_tracker *lf, bool rcu); +int lttng_id_tracker_add(struct lttng_kernel_id_tracker *lf, int id); +int lttng_id_tracker_del(struct lttng_kernel_id_tracker *lf, int id); + +int lttng_session_track_id(struct lttng_kernel_session *session, enum tracker_type tracker_type, int id); -int lttng_session_untrack_id(struct lttng_session *session, +int lttng_session_untrack_id(struct lttng_kernel_session *session, enum tracker_type tracker_type, int id); -int lttng_session_list_tracker_ids(struct lttng_session *session, +int lttng_session_list_tracker_ids(struct lttng_kernel_session *session, enum tracker_type tracker_type); void lttng_clock_ref(void); @@ -913,7 +1076,7 @@ int lttng_probes_init(void); int lttng_logger_init(void); void lttng_logger_exit(void); -extern int lttng_statedump_start(struct lttng_session *session); +extern int lttng_statedump_start(struct lttng_kernel_session *session); int lttng_calibrate(struct lttng_kernel_abi_calibrate *calibrate);