X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fprobes%2Flttng-kprobes.c;h=01bc16e4e534cf6c5f02544455252f3df192eb32;hb=d96a4a7a78319be3386b57d9068817e9ffac2a24;hp=3f9b02356740055f146fcadf6b77004c62e5a096;hpb=8bf17deb525927d1191c59a1765d5b11b37c4320;p=lttng-modules.git

diff --git a/src/probes/lttng-kprobes.c b/src/probes/lttng-kprobes.c
index 3f9b0235..01bc16e4 100644
--- a/src/probes/lttng-kprobes.c
+++ b/src/probes/lttng-kprobes.c
@@ -49,6 +49,22 @@ int lttng_kprobes_event_handler_pre(struct kprobe *p, struct pt_regs *regs)
 	return 0;
 }
 
+static
+int lttng_kprobes_event_notifier_handler_pre(struct kprobe *p, struct pt_regs *regs)
+{
+	struct lttng_event_notifier *event_notifier =
+		container_of(p, struct lttng_event_notifier, u.kprobe.kp);
+	struct lttng_kernel_notifier_ctx notif_ctx;
+
+	if (unlikely(!READ_ONCE(event_notifier->enabled)))
+		return 0;
+
+	notif_ctx.eval_capture = LTTNG_READ_ONCE(event_notifier->eval_capture);
+	event_notifier->send_notification(event_notifier, NULL, NULL, &notif_ctx);
+
+	return 0;
+}
+
 /*
  * Create event description
  */
@@ -75,13 +91,13 @@ int lttng_create_kprobe_event(const char *name, struct lttng_event *event)
 		goto error_field;
 	}
 	field->name = "ip";
-	field->type.atype = atype_integer;
+	field->type.type = lttng_kernel_type_integer;
 	field->type.u.integer.size = sizeof(unsigned long) * CHAR_BIT;
 	field->type.u.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
 	field->type.u.integer.signedness = lttng_is_signed_type(unsigned long);
 	field->type.u.integer.reverse_byte_order = 0;
 	field->type.u.integer.base = 16;
-	field->type.u.integer.encoding = lttng_encode_none;
+	field->type.u.integer.encoding = lttng_kernel_string_encoding_none;
 	desc->owner = THIS_MODULE;
 	event->desc = desc;
 
@@ -94,6 +110,35 @@ error_str:
 	return ret;
 }
 
+/*
+ * Create event_notifier description
+ */
+static
+int lttng_create_kprobe_event_notifier(const char *name, struct lttng_event_notifier *event_notifier)
+{
+	struct lttng_event_desc *desc;
+	int ret;
+
+	desc = kzalloc(sizeof(*event_notifier->desc), GFP_KERNEL);
+	if (!desc)
+		return -ENOMEM;
+	desc->name = kstrdup(name, GFP_KERNEL);
+	if (!desc->name) {
+		ret = -ENOMEM;
+		goto error_str;
+	}
+	desc->nr_fields = 0;
+
+	desc->owner = THIS_MODULE;
+	event_notifier->desc = desc;
+
+	return 0;
+
+error_str:
+	kfree(desc);
+	return ret;
+}
+
 static
 int _lttng_kprobes_register(const char *symbol_name,
 			   uint64_t offset,
@@ -127,7 +172,7 @@ int _lttng_kprobes_register(const char *symbol_name,
 	lttng_kp->kp.addr = (void *) (unsigned long) addr;
 
 	/*
-	 * Ensure the memory we just allocated don't trigger page faults.
+	 * Ensure the memory we just allocated don't notify page faults.
 	 * Well.. kprobes itself puts the page fault handler on the blacklist,
 	 * but we can never be too careful.
 	 */
@@ -173,12 +218,43 @@ error:
 }
 EXPORT_SYMBOL_GPL(lttng_kprobes_register_event);
 
+int lttng_kprobes_register_event_notifier(const char *symbol_name,
+			   uint64_t offset,
+			   uint64_t addr,
+			   struct lttng_event_notifier *event_notifier)
+{
+	int ret;
+	ret = lttng_create_kprobe_event_notifier(symbol_name, event_notifier);
+	if (ret)
+		goto error;
+
+	ret = _lttng_kprobes_register(symbol_name, offset, addr,
+		&event_notifier->u.kprobe, lttng_kprobes_event_notifier_handler_pre);
+	if (ret)
+		goto register_error;
+
+	return 0;
+
+register_error:
+	kfree(event_notifier->desc->name);
+	kfree(event_notifier->desc);
+error:
+	return ret;
+}
+EXPORT_SYMBOL_GPL(lttng_kprobes_register_event_notifier);
+
 void lttng_kprobes_unregister_event(struct lttng_event *event)
 {
 	unregister_kprobe(&event->u.kprobe.kp);
 }
 EXPORT_SYMBOL_GPL(lttng_kprobes_unregister_event);
 
+void lttng_kprobes_unregister_event_notifier(struct lttng_event_notifier *event_notifier)
+{
+	unregister_kprobe(&event_notifier->u.kprobe.kp);
+}
+EXPORT_SYMBOL_GPL(lttng_kprobes_unregister_event_notifier);
+
 void lttng_kprobes_destroy_event_private(struct lttng_event *event)
 {
 	kfree(event->u.kprobe.symbol_name);
@@ -188,6 +264,14 @@ void lttng_kprobes_destroy_event_private(struct lttng_event *event)
 }
 EXPORT_SYMBOL_GPL(lttng_kprobes_destroy_event_private);
 
+void lttng_kprobes_destroy_event_notifier_private(struct lttng_event_notifier *event_notifier)
+{
+	kfree(event_notifier->u.kprobe.symbol_name);
+	kfree(event_notifier->desc->name);
+	kfree(event_notifier->desc);
+}
+EXPORT_SYMBOL_GPL(lttng_kprobes_destroy_event_notifier_private);
+
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Mathieu Desnoyers <mathieu.desnoyers@efficios.com>");
 MODULE_DESCRIPTION("LTTng kprobes probes");