X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fprobes%2Flttng-kprobes.c;h=e127d72fa4fd654e7f1b34c0abcca16c398eb533;hb=HEAD;hp=e3fa493f8a93f7170afd65f2637dd95d25a38578;hpb=c2fb9c1c4f890840c02ad4b66a7cf69ae5dca6f7;p=lttng-modules.git

diff --git a/src/probes/lttng-kprobes.c b/src/probes/lttng-kprobes.c
index e3fa493f..27d2898f 100644
--- a/src/probes/lttng-kprobes.c
+++ b/src/probes/lttng-kprobes.c
@@ -24,7 +24,7 @@ int lttng_kprobes_event_handler_pre(struct kprobe *p, struct pt_regs *regs)
 	struct lttng_kernel_event_common_private *event_priv =
 		container_of(p, struct lttng_kernel_event_common_private, u.kprobe.kp);
 	struct lttng_kernel_event_common *event = event_priv->pub;
-	struct lttng_probe_ctx lttng_probe_ctx = {
+	struct lttng_kernel_probe_ctx lttng_probe_ctx = {
 		.event = event,
 		.interruptible = !lttng_regs_irqs_disabled(regs),
 	};
@@ -37,11 +37,11 @@ int lttng_kprobes_event_handler_pre(struct kprobe *p, struct pt_regs *regs)
 			container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
 		struct lttng_kernel_event_recorder *event_recorder =
 			event_recorder_priv->pub;
-		struct lttng_channel *chan = event_recorder->chan;
+		struct lttng_kernel_channel_buffer *chan = event_recorder->chan;
 
-		if (unlikely(!LTTNG_READ_ONCE(chan->session->active)))
+		if (unlikely(!LTTNG_READ_ONCE(chan->parent.session->active)))
 			return 0;
-		if (unlikely(!LTTNG_READ_ONCE(chan->enabled)))
+		if (unlikely(!LTTNG_READ_ONCE(chan->parent.enabled)))
 			return 0;
 		break;
 	}
@@ -59,8 +59,8 @@ int lttng_kprobes_event_handler_pre(struct kprobe *p, struct pt_regs *regs)
 	{
 		struct lttng_kernel_event_recorder *event_recorder =
 			container_of(event, struct lttng_kernel_event_recorder, parent);
-		struct lttng_channel *chan = event_recorder->chan;
-		struct lib_ring_buffer_ctx ctx;
+		struct lttng_kernel_channel_buffer *chan = event_recorder->chan;
+		struct lttng_kernel_ring_buffer_ctx ctx;
 		int ret;
 
 		lib_ring_buffer_ctx_init(&ctx, event_recorder, sizeof(data),
@@ -68,8 +68,7 @@ int lttng_kprobes_event_handler_pre(struct kprobe *p, struct pt_regs *regs)
 		ret = chan->ops->event_reserve(&ctx);
 		if (ret < 0)
 			return 0;
-		lib_ring_buffer_align_ctx(&ctx, lttng_alignof(data));
-		chan->ops->event_write(&ctx, &data, sizeof(data));
+		chan->ops->event_write(&ctx, &data, sizeof(data), lttng_alignof(data));
 		chan->ops->event_commit(&ctx);
 		break;
 	}
@@ -89,62 +88,22 @@ int lttng_kprobes_event_handler_pre(struct kprobe *p, struct pt_regs *regs)
 	return 0;
 }
 
-static const struct lttng_kernel_type_common *event_type =
-	lttng_kernel_static_type_integer_from_type(unsigned long, __BYTE_ORDER, 16);
+static const struct lttng_kernel_event_field *event_fields[] = {
+	lttng_kernel_static_event_field("ip",
+		lttng_kernel_static_type_integer_from_type(unsigned long, __BYTE_ORDER, 16),
+		false, false),
+};
 
-/*
- * Create event description
- */
-static
-int lttng_create_kprobe_event(const char *name, struct lttng_kernel_event_recorder *event_recorder)
-{
-	const struct lttng_kernel_event_field **fieldp_array;
-	struct lttng_kernel_event_field *field;
-	struct lttng_kernel_event_desc *desc;
-	int ret;
-
-	desc = kzalloc(sizeof(*desc), GFP_KERNEL);
-	if (!desc)
-		return -ENOMEM;
-	desc->event_name = kstrdup(name, GFP_KERNEL);
-	if (!desc->event_name) {
-		ret = -ENOMEM;
-		goto error_str;
-	}
-	desc->nr_fields = 1;
-	fieldp_array = kzalloc(1 * sizeof(struct lttng_kernel_event_field *), GFP_KERNEL);
-	if (!fieldp_array) {
-		ret = -ENOMEM;
-		goto error_fieldp_array;
-	}
-	desc->fields = fieldp_array;
-	desc->fields[0] = field =
-		kzalloc(sizeof(struct lttng_kernel_event_field), GFP_KERNEL);
-	if (!field) {
-		ret = -ENOMEM;
-		goto error_field;
-	}
-	field->name = "ip";
-	field->type = event_type;
-	desc->owner = THIS_MODULE;
-	event_recorder->priv->parent.desc = desc;
-
-	return 0;
-
-error_field:
-	kfree(fieldp_array);
-error_fieldp_array:
-	kfree(desc->event_name);
-error_str:
-	kfree(desc);
-	return ret;
-}
+static const struct lttng_kernel_tracepoint_class tp_class = {
+	.nr_fields = ARRAY_SIZE(event_fields),
+	.fields = event_fields,
+};
 
 /*
- * Create event_notifier description
+ * Create event description
  */
 static
-int lttng_create_kprobe_event_notifier(const char *name, struct lttng_kernel_event_notifier *event_notifier)
+int lttng_create_kprobe_event(const char *name, struct lttng_kernel_event_common *event)
 {
 	struct lttng_kernel_event_desc *desc;
 	int ret;
@@ -152,15 +111,14 @@ int lttng_create_kprobe_event_notifier(const char *name, struct lttng_kernel_eve
 	desc = kzalloc(sizeof(*desc), GFP_KERNEL);
 	if (!desc)
 		return -ENOMEM;
+	desc->tp_class = &tp_class;
 	desc->event_name = kstrdup(name, GFP_KERNEL);
 	if (!desc->event_name) {
 		ret = -ENOMEM;
 		goto error_str;
 	}
-	desc->nr_fields = 0;
-
 	desc->owner = THIS_MODULE;
-	event_notifier->priv->parent.desc = desc;
+	event->priv->desc = desc;
 
 	return 0;
 
@@ -224,85 +182,43 @@ int lttng_kprobes_register_event(const char *name,
 			   const char *symbol_name,
 			   uint64_t offset,
 			   uint64_t addr,
-			   struct lttng_kernel_event_recorder *event_recorder)
+			   struct lttng_kernel_event_common *event)
 {
 	int ret;
 
-	ret = lttng_create_kprobe_event(name, event_recorder);
+	ret = lttng_create_kprobe_event(name, event);
 	if (ret)
 		goto error;
 
 	ret = _lttng_kprobes_register(symbol_name, offset, addr,
-		&event_recorder->priv->parent.u.kprobe, lttng_kprobes_event_handler_pre);
+		&event->priv->u.kprobe, lttng_kprobes_event_handler_pre);
 	if (ret)
 		goto register_error;
 
 	return 0;
 
 register_error:
-	kfree(event_recorder->priv->parent.desc->fields);
-	kfree(event_recorder->priv->parent.desc->event_name);
-	kfree(event_recorder->priv->parent.desc);
+	kfree(event->priv->desc->event_name);
+	kfree(event->priv->desc);
 error:
 	return ret;
 }
 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_kernel_event_notifier *event_notifier)
+void lttng_kprobes_unregister_event(struct lttng_kernel_event_common *event)
 {
-	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->priv->parent.u.kprobe, lttng_kprobes_event_handler_pre);
-	if (ret)
-		goto register_error;
-
-	return 0;
-
-register_error:
-	kfree(event_notifier->priv->parent.desc->event_name);
-	kfree(event_notifier->priv->parent.desc);
-error:
-	return ret;
-}
-EXPORT_SYMBOL_GPL(lttng_kprobes_register_event_notifier);
-
-void lttng_kprobes_unregister_event(struct lttng_kernel_event_recorder *event_recorder)
-{
-	unregister_kprobe(&event_recorder->priv->parent.u.kprobe.kp);
+	unregister_kprobe(&event->priv->u.kprobe.kp);
 }
 EXPORT_SYMBOL_GPL(lttng_kprobes_unregister_event);
 
-void lttng_kprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
+void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_common *event)
 {
-	unregister_kprobe(&event_notifier->priv->parent.u.kprobe.kp);
-}
-EXPORT_SYMBOL_GPL(lttng_kprobes_unregister_event_notifier);
-
-void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_recorder *event_recorder)
-{
-	kfree(event_recorder->priv->parent.u.kprobe.symbol_name);
-	kfree(event_recorder->priv->parent.desc->fields[0]);
-	kfree(event_recorder->priv->parent.desc->fields);
-	kfree(event_recorder->priv->parent.desc->event_name);
-	kfree(event_recorder->priv->parent.desc);
+	kfree(event->priv->u.kprobe.symbol_name);
+	kfree(event->priv->desc->event_name);
+	kfree(event->priv->desc);
 }
 EXPORT_SYMBOL_GPL(lttng_kprobes_destroy_event_private);
 
-void lttng_kprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier)
-{
-	kfree(event_notifier->priv->parent.u.kprobe.symbol_name);
-	kfree(event_notifier->priv->parent.desc->event_name);
-	kfree(event_notifier->priv->parent.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");