X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Flttng%2Fevents.h;h=517d689b049f05d679fa4a205da31d2b20cb1e10;hb=89ec2b91ca249747d87b59aea76e6e67cdf7f0bf;hp=61d37d70bdde54073ba5506f6bec36579733cb1e;hpb=8ced8896fe832af52b749d429b8eceb872a83d1b;p=lttng-modules.git diff --git a/include/lttng/events.h b/include/lttng/events.h index 61d37d70..517d689b 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,14 +232,20 @@ 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; }; /* @@ -253,8 +259,9 @@ enum lttng_filter_ret { 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, + struct lttng_bytecode_node *bc; + uint64_t (*filter)(void *filter_data, + struct lttng_probe_ctx *lttng_probe_ctx, const char *filter_stack_data); int link_failed; struct list_head node; /* list of bytecode runtime in event */ @@ -299,12 +306,6 @@ enum lttng_syscall_abi { LTTNG_SYSCALL_ABI_COMPAT, }; -struct lttng_syscall { - struct list_head node; /* chain registered syscall event_notifier */ - unsigned int syscall_id; - bool is_compat; -}; - /* * lttng_event structure is referred to by the tracing fast path. It must be * kept small. @@ -326,7 +327,6 @@ struct lttng_event { } kretprobe; struct lttng_uprobe uprobe; struct { - char *syscall_name; enum lttng_syscall_entryexit entryexit; enum lttng_syscall_abi abi; } syscall; @@ -339,7 +339,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; }; @@ -357,14 +357,20 @@ struct lttng_event_notifier { union { struct lttng_kprobe kprobe; struct lttng_uprobe uprobe; - struct lttng_syscall syscall; + 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); @@ -636,12 +642,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; - struct list_head *event_notifier_syscall_dispatch; - struct list_head *event_notifier_compat_syscall_dispatch; + int syscall_all_entry; + int syscall_all_exit; - unsigned int syscall_all:1, - sys_enter_registered:1; + unsigned int sys_enter_registered:1, sys_exit_registered:1; + + struct lttng_counter *error_counter; + size_t error_counter_len; }; struct lttng_metadata_cache { @@ -790,10 +812,13 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc, 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_syscall_filter_enable_event( + struct lttng_channel *chan, struct lttng_event *event); -int lttng_syscall_filter_disable_event(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); @@ -869,9 +894,9 @@ static inline int lttng_syscall_filter_disable_event_notifier( #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);