X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fevents.h;h=61d37d70bdde54073ba5506f6bec36579733cb1e;hb=8ced8896fe832af52b749d429b8eceb872a83d1b;hp=e32480a98791286c5ad7f46d59f0b646746e8941;hpb=dffef45d53ab388fd08c19e8865b245b40ca9dff;p=lttng-modules.git

diff --git a/include/lttng/events.h b/include/lttng/events.h
index e32480a9..61d37d70 100644
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -10,6 +10,7 @@
 #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>
@@ -169,6 +170,7 @@ struct lttng_perf_counter_field {
 
 struct lttng_probe_ctx {
 	struct lttng_event *event;
+	struct lttng_event_notifier *event_notifier; // Not sure if we will ever need it.
 	uint8_t interruptible;
 };
 
@@ -211,6 +213,7 @@ struct lttng_event_desc {
 	const struct lttng_event_field *fields;	/* event payload */
 	unsigned int nr_fields;
 	struct module *owner;
+	void *event_notifier_callback;
 };
 
 struct lttng_probe_desc {
@@ -267,12 +270,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,
@@ -283,6 +299,12 @@ 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.
@@ -297,18 +319,12 @@ 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 {
-			struct inode *inode;
-			struct list_head head;
-		} uprobe;
+		struct lttng_uprobe uprobe;
 		struct {
 			char *syscall_name;
 			enum lttng_syscall_entryexit entryexit;
@@ -339,6 +355,9 @@ struct lttng_event_notifier {
 
 	enum lttng_kernel_instrumentation instrumentation;
 	union {
+		struct lttng_kprobe kprobe;
+		struct lttng_uprobe uprobe;
+		struct lttng_syscall syscall;
 	} u;
 
 	/* Backward references: list of lttng_enabler_ref (ref to enablers) */
@@ -348,6 +367,7 @@ struct lttng_event_notifier {
 	struct list_head bytecode_runtime_head;
 	int has_enablers_without_bytecode;
 
+	void (*send_notification)(struct lttng_event_notifier *event_notifier);
 	struct lttng_event_notifier_group *group; /* Weak ref */
 };
 
@@ -604,6 +624,7 @@ struct lttng_session {
 
 struct lttng_event_notifier_group {
 	struct file *file;		/* File associated to event notifier group */
+	struct file *notif_file;	/* File used to expose notifications to userspace. */
 	struct list_head node;		/* event notifier group list */
 	struct list_head enablers_head; /* List of enablers */
 	struct list_head event_notifiers_head; /* List of event notifier */
@@ -613,6 +634,14 @@ struct lttng_event_notifier_group {
 	struct lttng_transport *transport;
 	struct channel *chan;		/* Ring buffer channel for 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 list_head *event_notifier_syscall_dispatch;
+	struct list_head *event_notifier_compat_syscall_dispatch;
+
+	unsigned int syscall_all:1,
+		sys_enter_registered:1;
 };
 
 struct lttng_metadata_cache {
@@ -649,7 +678,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);
@@ -712,6 +743,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);
 
@@ -749,23 +783,36 @@ 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;
 }
@@ -775,13 +822,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;
@@ -793,6 +840,32 @@ 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);
@@ -998,16 +1071,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,
@@ -1017,12 +1096,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_private(struct lttng_event *event)
+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_event_notifier_private(struct lttng_event_notifier *event_notifier)
 {
 }
 #endif
@@ -1030,35 +1128,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(struct lttng_event *event);
-void lttng_uprobes_destroy_private(struct lttng_event *event);
+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_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