X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fevents.h;h=517d689b049f05d679fa4a205da31d2b20cb1e10;hb=89ec2b91ca249747d87b59aea76e6e67cdf7f0bf;hp=37319ac92cc3288af78bc782a8b4566f793dd038;hpb=7fad9b39ca9e872aadd7df5bcb21db02fe46f70e;p=lttng-modules.git

diff --git a/include/lttng/events.h b/include/lttng/events.h
index 37319ac9..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 <linux/irq_work.h>
 #include <linux/version.h>
 #include <linux/list.h>
 #include <linux/kprobes.h>
 #include <linux/kref.h>
 #include <linux/uuid.h>
+#include <linux/irq_work.h>
 #include <wrapper/uprobes.h>
 #include <lttng/cpuhotplug.h>
 #include <lttng/tracer.h>
@@ -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 */
@@ -270,12 +277,25 @@ struct lttng_enabler_ref {
 };
 
 struct lttng_uprobe_handler {
-	struct lttng_event *event;
+	union {
+		struct lttng_event *event;
+		struct lttng_event_notifier *event_notifier;
+	} u;
 	loff_t offset;
 	struct uprobe_consumer up_consumer;
 	struct list_head node;
 };
 
+struct lttng_kprobe {
+	struct kprobe kp;
+	char *symbol_name;
+};
+
+struct lttng_uprobe {
+	struct inode *inode;
+	struct list_head head;
+};
+
 enum lttng_syscall_entryexit {
 	LTTNG_SYSCALL_ENTRY,
 	LTTNG_SYSCALL_EXIT,
@@ -300,20 +320,13 @@ struct lttng_event {
 	struct lttng_ctx *ctx;
 	enum lttng_kernel_instrumentation instrumentation;
 	union {
-		struct {
-			struct kprobe kp;
-			char *symbol_name;
-		} kprobe;
+		struct lttng_kprobe kprobe;
 		struct {
 			struct lttng_krp *lttng_krp;
 			char *symbol_name;
 		} kretprobe;
+		struct lttng_uprobe uprobe;
 		struct {
-			struct inode *inode;
-			struct list_head head;
-		} uprobe;
-		struct {
-			char *syscall_name;
 			enum lttng_syscall_entryexit entryexit;
 			enum lttng_syscall_abi abi;
 		} syscall;
@@ -326,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;
 };
 
@@ -342,13 +355,22 @@ struct lttng_event_notifier {
 
 	enum lttng_kernel_instrumentation instrumentation;
 	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);
@@ -620,6 +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;
+
+	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 {
@@ -656,7 +700,9 @@ int lttng_event_notifier_enabler_enable(
 int lttng_event_notifier_enabler_disable(
 		struct lttng_event_notifier_enabler *event_notifier_enabler);
 int lttng_fix_pending_events(void);
+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);
@@ -719,6 +765,9 @@ int lttng_channel_disable(struct lttng_channel *channel);
 int lttng_event_enable(struct lttng_event *event);
 int lttng_event_disable(struct lttng_event *event);
 
+int lttng_event_notifier_enable(struct lttng_event_notifier *event_notifier);
+int lttng_event_notifier_disable(struct lttng_event_notifier *event_notifier);
+
 void lttng_transport_register(struct lttng_transport *transport);
 void lttng_transport_unregister(struct lttng_transport *transport);
 
@@ -756,23 +805,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;
 }
@@ -782,13 +847,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;
@@ -800,12 +865,38 @@ 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);
 
@@ -1005,16 +1096,22 @@ void lttng_logger_exit(void);
 extern int lttng_statedump_start(struct lttng_session *session);
 
 #ifdef CONFIG_KPROBES
-int lttng_kprobes_register(const char *name,
+int lttng_kprobes_register_event(const char *name,
 		const char *symbol_name,
 		uint64_t offset,
 		uint64_t addr,
 		struct lttng_event *event);
-void lttng_kprobes_unregister(struct lttng_event *event);
-void lttng_kprobes_destroy_private(struct lttng_event *event);
+void lttng_kprobes_unregister_event(struct lttng_event *event);
+void lttng_kprobes_destroy_event_private(struct lttng_event *event);
+int lttng_kprobes_register_event_notifier(const char *symbol_name,
+		uint64_t offset,
+		uint64_t addr,
+		struct lttng_event_notifier *event_notifier);
+void lttng_kprobes_unregister_event_notifier(struct lttng_event_notifier *event_notifier);
+void lttng_kprobes_destroy_event_notifier_private(struct lttng_event_notifier *event_notifier);
 #else
 static inline
-int lttng_kprobes_register(const char *name,
+int lttng_kprobes_register_event(const char *name,
 		const char *symbol_name,
 		uint64_t offset,
 		uint64_t addr,
@@ -1024,12 +1121,31 @@ int lttng_kprobes_register(const char *name,
 }
 
 static inline
-void lttng_kprobes_unregister(struct lttng_event *event)
+void lttng_kprobes_unregister_event(struct lttng_event *event)
+{
+}
+
+static inline
+void lttng_kprobes_destroy_event_private(struct lttng_event *event)
+{
+}
+
+static inline
+int lttng_kprobes_register_event_notifier(const char *symbol_name,
+		uint64_t offset,
+		uint64_t addr,
+		struct lttng_event_notifier *event_notifier)
+{
+	return -ENOSYS;
+}
+
+static inline
+void lttng_kprobes_unregister_event_notifier(struct lttng_event_notifier *event_notifier)
 {
 }
 
 static inline
-void lttng_kprobes_destroy_private(struct lttng_event *event)
+void lttng_kprobes_destroy_event_notifier_private(struct lttng_event_notifier *event_notifier)
 {
 }
 #endif
@@ -1037,35 +1153,68 @@ void lttng_kprobes_destroy_private(struct lttng_event *event)
 int lttng_event_add_callsite(struct lttng_event *event,
 	struct lttng_kernel_event_callsite *callsite);
 
+int lttng_event_notifier_add_callsite(struct lttng_event_notifier *event_notifier,
+	struct lttng_kernel_event_callsite *callsite);
+
 #ifdef CONFIG_UPROBES
-int lttng_uprobes_register(const char *name,
+int lttng_uprobes_register_event(const char *name,
 	int fd, struct lttng_event *event);
-int lttng_uprobes_add_callsite(struct lttng_event *event,
+int lttng_uprobes_event_add_callsite(struct lttng_event *event,
+	struct lttng_kernel_event_callsite *callsite);
+void lttng_uprobes_unregister_event(struct lttng_event *event);
+void lttng_uprobes_destroy_event_private(struct lttng_event *event);
+int lttng_uprobes_register_event_notifier(const char *name,
+	int fd, struct lttng_event_notifier *event_notifier);
+int lttng_uprobes_event_notifier_add_callsite(struct lttng_event_notifier *event_notifier,
 	struct lttng_kernel_event_callsite *callsite);
-void lttng_uprobes_unregister(struct lttng_event *event);
-void lttng_uprobes_destroy_private(struct lttng_event *event);
+void lttng_uprobes_unregister_event_notifier(struct lttng_event_notifier *event_notifier);
+void lttng_uprobes_destroy_event_notifier_private(struct lttng_event_notifier *event_notifier);
 #else
 static inline
-int lttng_uprobes_register(const char *name,
+int lttng_uprobes_register_event(const char *name,
 	int fd, struct lttng_event *event)
 {
 	return -ENOSYS;
 }
 
 static inline
-int lttng_uprobes_add_callsite(struct lttng_event *event,
+int lttng_uprobes_event_add_callsite(struct lttng_event *event,
+	struct lttng_kernel_event_callsite *callsite)
+{
+	return -ENOSYS;
+}
+
+static inline
+void lttng_uprobes_unregister_event(struct lttng_event *event)
+{
+}
+
+static inline
+void lttng_uprobes_destroy_event_private(struct lttng_event *event)
+{
+}
+
+static inline
+int lttng_uprobes_register_event_notifier(const char *name,
+	int fd, struct lttng_event_notifier *event_notifier)
+{
+	return -ENOSYS;
+}
+
+static inline
+int lttng_uprobes_event_notifier_add_callsite(struct lttng_event_notifier *event_notifier,
 	struct lttng_kernel_event_callsite *callsite)
 {
 	return -ENOSYS;
 }
 
 static inline
-void lttng_uprobes_unregister(struct lttng_event *event)
+void lttng_uprobes_unregister_event_notifier(struct lttng_event_notifier *event_notifier)
 {
 }
 
 static inline
-void lttng_uprobes_destroy_private(struct lttng_event *event)
+void lttng_uprobes_destroy_event_notifier_private(struct lttng_event_notifier *event_notifier)
 {
 }
 #endif