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

diff --git a/include/lttng/events.h b/include/lttng/events.h
index 605a48a5..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 {
@@ -255,7 +258,7 @@ struct lttng_bytecode_runtime {
 			const char *filter_stack_data);
 	int link_failed;
 	struct list_head node;	/* list of bytecode runtime in event */
-	struct lttng_event *event;
+	struct lttng_ctx *ctx;
 };
 
 /*
@@ -267,12 +270,41 @@ 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,
+};
+
+enum lttng_syscall_abi {
+	LTTNG_SYSCALL_ABI_NATIVE,
+	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.
@@ -287,18 +319,17 @@ 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;
+			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;
@@ -312,9 +343,37 @@ struct lttng_event {
 	int has_enablers_without_bytecode;
 };
 
-enum lttng_enabler_type {
-	LTTNG_ENABLER_STAR_GLOB,
-	LTTNG_ENABLER_NAME,
+// FIXME: Really similar to lttng_event above. Could those be merged ?
+struct lttng_event_notifier {
+	enum lttng_event_type evtype;	/* First field. */
+	uint64_t user_token;
+	int enabled;
+	int registered;			/* has reg'd tracepoint probe */
+	const struct lttng_event_desc *desc;
+	void *filter;
+	struct list_head list;		/* event_notifier list in event_notifier group */
+
+	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) */
+	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;
+	int has_enablers_without_bytecode;
+
+	void (*send_notification)(struct lttng_event_notifier *event_notifier);
+	struct lttng_event_notifier_group *group; /* Weak ref */
+};
+
+enum lttng_enabler_format_type {
+	LTTNG_ENABLER_FORMAT_STAR_GLOB,
+	LTTNG_ENABLER_FORMAT_NAME,
 };
 
 /*
@@ -324,21 +383,51 @@ enum lttng_enabler_type {
 struct lttng_enabler {
 	enum lttng_event_type evtype;	/* First field. */
 
-	enum lttng_enabler_type type;
+	enum lttng_enabler_format_type format_type;
 
-	struct list_head node;	/* per-session list of enablers */
 	/* head list of struct lttng_ust_filter_bytecode_node */
 	struct list_head filter_bytecode_head;
 
 	struct lttng_kernel_event event_param;
+	unsigned int enabled:1;
+
+	uint64_t user_token;		/* User-provided token. */
+};
+
+struct lttng_event_enabler {
+	struct lttng_enabler base;
+	struct list_head node;	/* per-session list of enablers */
 	struct lttng_channel *chan;
+	/*
+	 * Unused, but kept around to make it explicit that the tracer can do
+	 * it.
+	 */
 	struct lttng_ctx *ctx;
-	unsigned int enabled:1;
 };
 
+struct lttng_event_notifier_enabler {
+	struct lttng_enabler base;
+	struct list_head node;	/* List of event_notifier enablers */
+	struct lttng_event_notifier_group *group;
+};
+
+static inline
+struct lttng_enabler *lttng_event_enabler_as_enabler(
+		struct lttng_event_enabler *event_enabler)
+{
+	return &event_enabler->base;
+}
+
+static inline
+struct lttng_enabler *lttng_event_notifier_enabler_as_enabler(
+		struct lttng_event_notifier_enabler *event_notifier_enabler)
+{
+	return &event_notifier_enabler->base;
+}
+
 struct lttng_channel_ops {
 	struct channel *(*channel_create)(const char *name,
-				struct lttng_channel *lttng_chan,
+				void *priv,
 				void *buf_addr,
 				size_t subbuf_size, size_t num_subbuf,
 				unsigned int switch_timer_interval,
@@ -415,6 +504,13 @@ struct lttng_event_ht {
 	struct hlist_head table[LTTNG_EVENT_HT_SIZE];
 };
 
+#define LTTNG_EVENT_NOTIFIER_HT_BITS		12
+#define LTTNG_EVENT_NOTIFIER_HT_SIZE		(1U << LTTNG_EVENT_NOTIFIER_HT_BITS)
+
+struct lttng_event_notifier_ht {
+	struct hlist_head table[LTTNG_EVENT_NOTIFIER_HT_SIZE];
+};
+
 struct lttng_channel {
 	unsigned int id;
 	struct channel *chan;		/* Channel buffers */
@@ -438,10 +534,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 */
 };
 
@@ -518,7 +614,7 @@ struct lttng_session {
 	struct lttng_id_tracker vgid_tracker;
 	unsigned int metadata_dumped:1,
 		tstate:1;		/* Transient enable state */
-	/* List of enablers */
+	/* List of event enablers */
 	struct list_head enablers_head;
 	/* Hash table of events */
 	struct lttng_event_ht events_ht;
@@ -526,11 +622,33 @@ struct lttng_session {
 	char creation_time[LTTNG_KERNEL_SESSION_CREATION_TIME_ISO8601_LEN];
 };
 
+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 */
+	struct lttng_event_notifier_ht event_notifiers_ht; /* Hash table of event notifiers */
+	struct lttng_ctx *ctx;		/* Contexts for filters. */
+	struct lttng_channel_ops *ops;
+	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 {
 	char *data;			/* Metadata cache */
 	unsigned int cache_alloc;	/* Metadata allocated size (bytes) */
 	unsigned int metadata_written;	/* Number of bytes written in metadata cache */
-	int producing;			/* Metadata being produced (incomplete) */
+	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) */
@@ -543,14 +661,26 @@ void lttng_unlock_sessions(void);
 
 struct list_head *lttng_get_probe_list_head(void);
 
-struct lttng_enabler *lttng_enabler_create(enum lttng_enabler_type type,
+struct lttng_event_enabler *lttng_event_enabler_create(
+		enum lttng_enabler_format_type format_type,
 		struct lttng_kernel_event *event_param,
 		struct lttng_channel *chan);
 
-int lttng_enabler_enable(struct lttng_enabler *enabler);
-int lttng_enabler_disable(struct lttng_enabler *enabler);
+int lttng_event_enabler_enable(struct lttng_event_enabler *event_enabler);
+int lttng_event_enabler_disable(struct lttng_event_enabler *event_enabler);
+struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create(
+		struct lttng_event_notifier_group *event_notifier_group,
+		enum lttng_enabler_format_type format_type,
+		struct lttng_kernel_event_notifier *event_notifier_param);
+
+int lttng_event_notifier_enabler_enable(
+		struct lttng_event_notifier_enabler *event_notifier_enabler);
+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);
@@ -560,6 +690,10 @@ int lttng_session_metadata_regenerate(struct lttng_session *session);
 int lttng_session_statedump(struct lttng_session *session);
 void metadata_cache_destroy(struct kref *kref);
 
+struct lttng_event_notifier_group *lttng_event_notifier_group_create(void);
+void lttng_event_notifier_group_destroy(
+		struct lttng_event_notifier_group *event_notifier_group);
+
 struct lttng_channel *lttng_channel_create(struct lttng_session *session,
 				       const char *transport_name,
 				       void *buf_addr,
@@ -589,11 +723,29 @@ struct lttng_event *lttng_event_compat_old_create(struct lttng_channel *chan,
 		void *filter,
 		const struct lttng_event_desc *internal_desc);
 
+struct lttng_event_notifier *lttng_event_notifier_create(
+				const struct lttng_event_desc *event_notifier_desc,
+				uint64_t id,
+				struct lttng_event_notifier_group *event_notifier_group,
+				struct lttng_kernel_event_notifier *event_notifier_param,
+				void *filter,
+				enum lttng_kernel_instrumentation itype);
+struct lttng_event_notifier *_lttng_event_notifier_create(
+				const struct lttng_event_desc *event_notifier_desc,
+				uint64_t id,
+				struct lttng_event_notifier_group *event_notifier_group,
+				struct lttng_kernel_event_notifier *event_notifier_param,
+				void *filter,
+				enum lttng_kernel_instrumentation itype);
+
 int lttng_channel_enable(struct lttng_channel *channel);
 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);
 
@@ -605,8 +757,8 @@ void lttng_abi_compat_old_exit(void);
 
 int lttng_probe_register(struct lttng_probe_desc *desc);
 void lttng_probe_unregister(struct lttng_probe_desc *desc);
-const struct lttng_event_desc *lttng_event_get(const char *name);
-void lttng_event_put(const struct lttng_event_desc *desc);
+const struct lttng_event_desc *lttng_event_desc_get(const char *name);
+void lttng_event_desc_put(const struct lttng_event_desc *desc);
 int lttng_probes_init(void);
 void lttng_probes_exit(void);
 
@@ -631,34 +783,53 @@ 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_syscall_filter_enable(struct lttng_channel *chan,
-		const char *name);
-int lttng_syscall_filter_disable(struct lttng_channel *chan,
-		const char *name);
+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_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;
 }
 
-static inline int lttng_syscall_filter_enable(struct lttng_channel *chan,
-		const char *name)
+static inline int lttng_syscalls_destroy(struct lttng_channel *chan)
+{
+	return 0;
+}
+
+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,
-		const char *name)
+static inline int lttng_syscall_filter_disable_event(struct lttng_channel *chan,
+		struct lttng_event *event);
 {
 	return -ENOSYS;
 }
@@ -668,12 +839,45 @@ 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_enabler_attach_bytecode(struct lttng_enabler *enabler,
+int lttng_event_enabler_attach_bytecode(struct lttng_event_enabler *event_enabler,
 		struct lttng_kernel_filter_bytecode __user *bytecode);
-void lttng_enabler_event_link_bytecode(struct lttng_event *event,
+int lttng_event_notifier_enabler_attach_bytecode(
+		struct lttng_event_notifier_enabler *event_notifier_enabler,
+		struct lttng_kernel_filter_bytecode __user *bytecode);
+
+void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc,
+		struct lttng_ctx *ctx,
+		struct list_head *bytecode_runtime_head,
 		struct lttng_enabler *enabler);
 
 int lttng_probes_init(void);
@@ -867,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,
@@ -886,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
@@ -899,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_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