X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fevents.h;h=e4d62adb8ad9fc3de9bc4395fd426648d6884a8f;hb=e97dc605fd2e9cc7245c563ac88fe7f6858aaa54;hp=b4c5372ae1f9266e9e851992f33059d7544bea90;hpb=99f52fcce5865809584c1e022bca1409702ea292;p=lttng-modules.git diff --git a/include/lttng/events.h b/include/lttng/events.h index b4c5372a..e4d62adb 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; @@ -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,6 +353,10 @@ 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. */ @@ -384,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 */ }; @@ -578,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, @@ -887,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, @@ -905,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; } @@ -949,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; @@ -984,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); @@ -1037,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 @@ -1049,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 @@ -1060,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 @@ -1071,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 @@ -1082,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 @@ -1093,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 @@ -1104,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 @@ -1115,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