X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-events.h;h=f6026292656b05f55a812e92388b1ad042db5ba3;hb=62c3d34c566d1ec4fee6843950f078e7d79afbe9;hp=8b0803e40b4c22ebd6129c790596393af4629808;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;p=lttng-modules.git diff --git a/lttng-events.h b/lttng-events.h index 8b0803e4..f6026292 100644 --- a/lttng-events.h +++ b/lttng-events.h @@ -10,17 +10,18 @@ #ifndef _LTTNG_EVENTS_H #define _LTTNG_EVENTS_H -#include +#include #include #include #include #include -#include +#include +#include #include #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; @@ -174,7 +175,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 @@ -284,6 +285,23 @@ struct lttng_enabler_ref { struct lttng_enabler *ref; /* backward ref */ }; +struct lttng_uprobe_handler { + struct lttng_event *event; + loff_t offset; + struct uprobe_consumer up_consumer; + struct list_head node; +}; + +enum lttng_syscall_entryexit { + LTTNG_SYSCALL_ENTRY, + LTTNG_SYSCALL_EXIT, +}; + +enum lttng_syscall_abi { + LTTNG_SYSCALL_ABI_NATIVE, + LTTNG_SYSCALL_ABI_COMPAT, +}; + /* * lttng_event structure is referred to by the tracing fast path. It must be * kept small. @@ -307,8 +325,14 @@ struct lttng_event { char *symbol_name; } kretprobe; struct { - char *symbol_name; - } ftrace; + struct inode *inode; + struct list_head head; + } uprobe; + struct { + char *syscall_name; + enum lttng_syscall_entryexit entryexit; + enum lttng_syscall_abi abi; + } syscall; } u; struct list_head list; /* Event list in session */ unsigned int metadata_dumped:1; @@ -448,10 +472,10 @@ struct lttng_channel { struct lttng_syscall_filter *sc_filter; int header_type; /* 0: unset, 1: compact, 2: large */ enum channel_type channel_type; + int syscall_all; unsigned int metadata_dumped:1, sys_enter_registered:1, sys_exit_registered:1, - syscall_all:1, tstate:1; /* Transient enable state */ }; @@ -465,6 +489,7 @@ struct lttng_metadata_stream { 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 */ }; #define LTTNG_DYNAMIC_LEN_STACK_SIZE 128 @@ -509,12 +534,15 @@ struct lttng_session { struct list_head enablers_head; /* Hash table of events */ struct lttng_event_ht events_ht; + char name[LTTNG_KERNEL_SESSION_NAME_LEN]; + char creation_time[LTTNG_KERNEL_SESSION_CREATION_TIME_ISO8601_LEN]; }; struct lttng_metadata_cache { char *data; /* Metadata cache */ unsigned int cache_alloc; /* Metadata allocated size (bytes) */ unsigned int metadata_written; /* Number of bytes written in metadata cache */ + atomic_t producing; /* Metadata being produced (incomplete) */ struct kref refcount; /* Metadata cache usage */ struct list_head metadata_stream; /* Metadata stream list */ uuid_le uuid; /* Trace session unique ID (copy) */ @@ -595,7 +623,7 @@ int lttng_probes_init(void); void lttng_probes_exit(void); int lttng_metadata_output_channel(struct lttng_metadata_stream *stream, - struct channel *chan); + struct channel *chan, bool *coherent); int lttng_pid_tracker_get_node_pid(const struct lttng_pid_hash_node *node); struct lttng_pid_tracker *lttng_pid_tracker_create(void); @@ -615,10 +643,11 @@ void lttng_clock_unref(void); #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, - const char *name); + struct lttng_event *event); int lttng_syscall_filter_disable(struct lttng_channel *chan, - const char *name); + struct lttng_event *event); long lttng_channel_syscall_mask(struct lttng_channel *channel, struct lttng_kernel_syscall_mask __user *usyscall_mask); #else @@ -632,14 +661,19 @@ static inline int lttng_syscalls_unregister(struct lttng_channel *chan) return 0; } +static inline int lttng_syscalls_destroy(struct lttng_channel *chan) +{ + return 0; +} + static inline int lttng_syscall_filter_enable(struct lttng_channel *chan, - const char *name) + struct lttng_event *event); { return -ENOSYS; } static inline int lttng_syscall_filter_disable(struct lttng_channel *chan, - const char *name) + struct lttng_event *event); { return -ENOSYS; } @@ -656,6 +690,7 @@ int lttng_enabler_attach_bytecode(struct lttng_enabler *enabler, struct lttng_kernel_filter_bytecode __user *bytecode); void lttng_enabler_event_link_bytecode(struct lttng_event *event, struct lttng_enabler *enabler); +void lttng_free_event_filter_runtime(struct lttng_event *event); int lttng_probes_init(void); @@ -704,7 +739,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_PERF_EVENTS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) +#if defined(CONFIG_PERF_EVENTS) && (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,33)) int lttng_add_perf_counter_to_ctx(uint32_t type, uint64_t config, const char *name, @@ -771,6 +806,42 @@ void lttng_kprobes_destroy_private(struct lttng_event *event) } #endif +int lttng_event_add_callsite(struct lttng_event *event, + struct lttng_kernel_event_callsite *callsite); + +#ifdef CONFIG_UPROBES +int lttng_uprobes_register(const char *name, + int fd, struct lttng_event *event); +int lttng_uprobes_add_callsite(struct lttng_event *event, + struct lttng_kernel_event_callsite *callsite); +void lttng_uprobes_unregister(struct lttng_event *event); +void lttng_uprobes_destroy_private(struct lttng_event *event); +#else +static inline +int lttng_uprobes_register(const char *name, + int fd, struct lttng_event *event) +{ + return -ENOSYS; +} + +static inline +int lttng_uprobes_add_callsite(struct lttng_event *event, + struct lttng_kernel_event_callsite *callsite) +{ + return -ENOSYS; +} + +static inline +void lttng_uprobes_unregister(struct lttng_event *event) +{ +} + +static inline +void lttng_uprobes_destroy_private(struct lttng_event *event) +{ +} +#endif + #ifdef CONFIG_KRETPROBES int lttng_kretprobes_register(const char *name, const char *symbol_name, @@ -812,38 +883,12 @@ int lttng_kretprobes_event_enable_state(struct lttng_event *event, } #endif -#if defined(CONFIG_DYNAMIC_FTRACE) && !defined(LTTNG_FTRACE_MISSING_HEADER) -int lttng_ftrace_register(const char *name, - const char *symbol_name, - struct lttng_event *event); -void lttng_ftrace_unregister(struct lttng_event *event); -void lttng_ftrace_destroy_private(struct lttng_event *event); -#else -static inline -int lttng_ftrace_register(const char *name, - const char *symbol_name, - struct lttng_event *event) -{ - return -ENOSYS; -} - -static inline -void lttng_ftrace_unregister(struct lttng_event *event) -{ -} - -static inline -void lttng_ftrace_destroy_private(struct lttng_event *event) -{ -} -#endif - int lttng_calibrate(struct lttng_kernel_calibrate *calibrate); extern const struct file_operations lttng_tracepoint_list_fops; extern const struct file_operations lttng_syscall_list_fops; -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,35)) #define TRACEPOINT_HAS_DATA_ARG #endif