X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=blobdiff_plain;f=include%2Flttng%2Fevents.h;h=3abdb80570f3015fc065fcdc1ed3bf4143b2729e;hp=0e04b6ebd3f6e1fdc84ff6b42c9a91caafcc74fc;hb=608ab495d4e0beff75f47df2b3a19d7bced0c571;hpb=9de67196ec41ae39fd73e49259da50119c21bfcc diff --git a/include/lttng/events.h b/include/lttng/events.h index 0e04b6eb..3abdb805 100644 --- a/include/lttng/events.h +++ b/include/lttng/events.h @@ -10,12 +10,12 @@ #ifndef _LTTNG_EVENTS_H #define _LTTNG_EVENTS_H -#include #include #include #include #include #include +#include #include #include #include @@ -232,30 +232,39 @@ enum lttng_event_type { LTTNG_TYPE_ENABLER = 1, }; -struct lttng_filter_bytecode_node { +enum lttng_bytecode_node_type { + LTTNG_BYTECODE_NODE_TYPE_FILTER, +}; + +struct lttng_bytecode_node { + enum lttng_bytecode_node_type type; struct list_head node; struct lttng_enabler *enabler; - /* - * struct lttng_kernel_filter_bytecode has var. sized array, must be - * last field. - */ - struct lttng_kernel_filter_bytecode bc; + struct { + uint32_t len; + uint32_t reloc_offset; + uint64_t seqnum; + char data[]; + } bc; }; /* - * Filter return value masks. + * Bytecode interpreter return value masks. */ -enum lttng_filter_ret { - LTTNG_FILTER_DISCARD = 0, - LTTNG_FILTER_RECORD_FLAG = (1ULL << 0), +enum lttng_bytecode_interpreter_ret { + LTTNG_INTERPRETER_DISCARD = 0, + LTTNG_INTERPRETER_RECORD_FLAG = (1ULL << 0), /* Other bits are kept for future use. */ }; struct lttng_bytecode_runtime { /* Associated bytecode */ - struct lttng_filter_bytecode_node *bc; - uint64_t (*filter)(void *filter_data, struct lttng_probe_ctx *lttng_probe_ctx, - const char *filter_stack_data); + struct lttng_bytecode_node *bc; + union { + uint64_t (*filter)(void *filter_data, + struct lttng_probe_ctx *lttng_probe_ctx, + const char *filter_stack_data); + } interpreter_funcs; int link_failed; struct list_head node; /* list of bytecode runtime in event */ struct lttng_ctx *ctx; @@ -320,7 +329,6 @@ struct lttng_event { } kretprobe; struct lttng_uprobe uprobe; struct { - char *syscall_name; enum lttng_syscall_entryexit entryexit; enum lttng_syscall_abi abi; } syscall; @@ -333,7 +341,7 @@ struct lttng_event { struct hlist_node hlist; /* session ht of events */ int registered; /* has reg'd tracepoint probe */ /* list of struct lttng_bytecode_runtime, sorted by seqnum */ - struct list_head bytecode_runtime_head; + struct list_head filter_bytecode_runtime_head; int has_enablers_without_bytecode; }; @@ -351,13 +359,20 @@ struct lttng_event_notifier { union { struct lttng_kprobe kprobe; struct lttng_uprobe uprobe; + struct { + enum lttng_syscall_entryexit entryexit; + enum lttng_syscall_abi abi; + struct hlist_node node; /* chain registered syscall event_notifier */ + unsigned int syscall_id; + } syscall; + } u; /* Backward references: list of lttng_enabler_ref (ref to enablers) */ struct list_head enablers_ref_head; struct hlist_node hlist; /* session ht of event_notifiers */ /* list of struct lttng_bytecode_runtime, sorted by seqnum */ - struct list_head bytecode_runtime_head; + struct list_head filter_bytecode_runtime_head; int has_enablers_without_bytecode; void (*send_notification)(struct lttng_event_notifier *event_notifier); @@ -378,7 +393,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; @@ -629,6 +644,28 @@ struct lttng_event_notifier_group { struct lib_ring_buffer *buf; /* Ring buffer for event notifier group. */ wait_queue_head_t read_wait; struct irq_work wakeup_pending; /* Pending wakeup irq work. */ + struct lttng_event_notifier *sc_unknown; /* for unknown syscalls */ + struct lttng_event_notifier *sc_compat_unknown; + + struct lttng_syscall_filter *sc_filter; + + struct hlist_head *event_notifier_syscall_dispatch; + struct hlist_head *event_notifier_compat_syscall_dispatch; + struct hlist_head *event_notifier_exit_syscall_dispatch; + struct hlist_head *event_notifier_exit_compat_syscall_dispatch; + + struct hlist_head event_notifier_unknown_syscall_dispatch; + struct hlist_head event_notifier_compat_unknown_syscall_dispatch; + struct hlist_head event_notifier_exit_unknown_syscall_dispatch; + struct hlist_head event_notifier_exit_compat_unknown_syscall_dispatch; + + int syscall_all_entry; + int syscall_all_exit; + + unsigned int sys_enter_registered:1, sys_exit_registered:1; + + struct lttng_counter *error_counter; + size_t error_counter_len; }; struct lttng_metadata_cache { @@ -770,23 +807,39 @@ int lttng_session_list_tracker_ids(struct lttng_session *session, void lttng_clock_ref(void); void lttng_clock_unref(void); +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(struct lttng_channel *chan, void *filter); -int lttng_syscalls_unregister(struct lttng_channel *chan); -int lttng_syscalls_destroy(struct lttng_channel *chan); -int lttng_syscall_filter_enable(struct lttng_channel *chan, +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, struct lttng_event *event); -int lttng_syscall_filter_disable(struct lttng_channel *chan, +int lttng_syscall_filter_disable_event( + struct lttng_channel *chan, struct lttng_event *event); + long lttng_channel_syscall_mask(struct lttng_channel *channel, struct lttng_kernel_syscall_mask __user *usyscall_mask); + +int lttng_syscalls_register_event_notifier( + struct lttng_event_notifier_enabler *event_notifier_enabler, + 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_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(struct lttng_channel *chan, void *filter) +static inline int lttng_syscalls_register_event( + struct lttng_channel *chan, void *filter) { return -ENOSYS; } -static inline int lttng_syscalls_unregister(struct lttng_channel *chan) +static inline int lttng_syscalls_unregister_event(struct lttng_channel *chan) { return 0; } @@ -796,13 +849,13 @@ static inline int lttng_syscalls_destroy(struct lttng_channel *chan) return 0; } -static inline int lttng_syscall_filter_enable(struct lttng_channel *chan, +static inline int lttng_syscall_filter_enable_event(struct lttng_channel *chan, struct lttng_event *event); { return -ENOSYS; } -static inline int lttng_syscall_filter_disable(struct lttng_channel *chan, +static inline int lttng_syscall_filter_disable_event(struct lttng_channel *chan, struct lttng_event *event); { return -ENOSYS; @@ -814,19 +867,44 @@ static inline long lttng_channel_syscall_mask(struct lttng_channel *channel, return -ENOSYS; } +static inline int lttng_syscalls_register_event_notifier( + struct lttng_event_notifier_group *group, void *filter) +{ + return -ENOSYS; +} + +static inline int lttng_syscalls_unregister_event_notifier( + struct lttng_event_notifier_group *group) +{ + return 0; +} + +static inline int lttng_syscall_filter_enable_event_notifier( + struct lttng_event_notifier_group *group, + const char *name) +{ + return -ENOSYS; +} + +static inline int lttng_syscall_filter_disable_event_notifier( + struct lttng_event_notifier_group *group, + const char *name) +{ + return -ENOSYS; +} + #endif -void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime); -int lttng_event_enabler_attach_bytecode(struct lttng_event_enabler *event_enabler, +int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event_enabler, struct lttng_kernel_filter_bytecode __user *bytecode); -int lttng_event_notifier_enabler_attach_bytecode( +int lttng_event_notifier_enabler_attach_filter_bytecode( struct lttng_event_notifier_enabler *event_notifier_enabler, struct lttng_kernel_filter_bytecode __user *bytecode); void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc, struct lttng_ctx *ctx, - struct list_head *bytecode_runtime_head, - struct lttng_enabler *enabler); + struct list_head *instance_bytecode_runtime_head, + struct list_head *enabler_bytecode_runtime_head); int lttng_probes_init(void);