Move alignment into event write callback

[lttng-modules.git] / src / probes / lttng-kprobes.c

diff --git a/src/probes/lttng-kprobes.c b/src/probes/lttng-kprobes.c
index 1db8be497557e9da6e9f850f919ba734dd2ef075..12de611a8004e968c58724273992313ed9977f2c 100644 (file)
--- a/src/probes/lttng-kprobes.c
+++ b/src/probes/lttng-kprobes.c
@@ -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,8 +88,16 @@ 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, false),
+};
+
+static const struct lttng_kernel_tracepoint_class tp_class = {
+       .nr_fields = ARRAY_SIZE(event_fields),
+       .fields = event_fields,
+};
 
 /*
  * Create event description
@@ -98,43 +105,23 @@ static const struct lttng_kernel_type_common *event_type =
 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->tp_class = &tp_class;
        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;
@@ -152,13 +139,12 @@ 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;
 
@@ -240,7 +226,6 @@ int lttng_kprobes_register_event(const char *name,
        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);
 error:
@@ -288,8 +273,6 @@ 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);
 }