Handle refcount of modules having dynamically alloc event description

[lttng-modules.git] / probes / lttng-ftrace.c

diff --git a/probes/lttng-ftrace.c b/probes/lttng-ftrace.c
index 061da25a1475bceda81c48facd6570d27a37bdf1..c866876e6f07dcf5b4d7612d27d4d9e6de08f223 100644 (file)
--- a/probes/lttng-ftrace.c
+++ b/probes/lttng-ftrace.c
@@ -38,7 +38,7 @@ void lttng_ftrace_handler(unsigned long ip, unsigned long parent_ip, void **data
                return;
        lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL,
                                 sizeof(payload), ltt_alignof(payload), -1);
-       ret = chan->ops->event_reserve(&ctx);
+       ret = chan->ops->event_reserve(&ctx, event->id);
        if (ret < 0)
                return;
        payload.ip = ip;
@@ -76,8 +76,8 @@ int lttng_create_ftrace_event(const char *name, struct ltt_event *event)
        }
        fields[0].name = "ip";
        fields[0].type.atype = atype_integer;
-       fields[0].type.u.basic.integer.size = sizeof(unsigned long);
-       fields[0].type.u.basic.integer.alignment = ltt_alignof(unsigned long);
+       fields[0].type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
+       fields[0].type.u.basic.integer.alignment = ltt_alignof(unsigned long) * CHAR_BIT;
        fields[0].type.u.basic.integer.signedness = 0;
        fields[0].type.u.basic.integer.reverse_byte_order = 0;
        fields[0].type.u.basic.integer.base = 16;
@@ -85,13 +85,14 @@ int lttng_create_ftrace_event(const char *name, struct ltt_event *event)
 
        fields[1].name = "parent_ip";
        fields[1].type.atype = atype_integer;
-       fields[1].type.u.basic.integer.size = sizeof(unsigned long);
-       fields[1].type.u.basic.integer.alignment = ltt_alignof(unsigned long);
+       fields[1].type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
+       fields[1].type.u.basic.integer.alignment = ltt_alignof(unsigned long) * CHAR_BIT;
        fields[1].type.u.basic.integer.signedness = 0;
        fields[1].type.u.basic.integer.reverse_byte_order = 0;
        fields[1].type.u.basic.integer.base = 16;
        fields[1].type.u.basic.integer.encoding = lttng_encode_none;
 
+       desc->owner = THIS_MODULE;
        event->desc = desc;
 
        return 0;
@@ -118,7 +119,7 @@ int lttng_ftrace_register(const char *name,
        if (ret)
                goto error;
 
-       event->u.ftrace.symbol_name = kstrdup(name, GFP_KERNEL);
+       event->u.ftrace.symbol_name = kstrdup(symbol_name, GFP_KERNEL);
        if (!event->u.ftrace.symbol_name)
                goto name_error;
 
@@ -127,7 +128,7 @@ int lttng_ftrace_register(const char *name,
 
        ret = wrapper_register_ftrace_function_probe(event->u.ftrace.symbol_name,
                        &lttng_ftrace_ops, event);
-       if (ret)
+       if (ret < 0)
                goto register_error;
        return 0;
 
@@ -146,13 +147,12 @@ void lttng_ftrace_unregister(struct ltt_event *event)
        wrapper_unregister_ftrace_function_probe(event->u.ftrace.symbol_name,
                        &lttng_ftrace_ops, event);
        kfree(event->u.ftrace.symbol_name);
-       kfree(desc->fields);
+       kfree(event->desc->fields);
        kfree(event->desc->name);
        kfree(event->desc);
 }
 EXPORT_SYMBOL_GPL(lttng_ftrace_unregister);
 
-/* This module is permanent. */
 int lttng_ftrace_init(void)
 {
        wrapper_vmalloc_sync_all();
@@ -160,6 +160,15 @@ int lttng_ftrace_init(void)
 }
 module_init(lttng_ftrace_init)
 
+/*
+ * Ftrace takes care of waiting for a grace period (RCU sched) at probe
+ * unregistration, and disables preemption around probe call.
+ */
+void lttng_ftrace_exit(void)
+{
+}
+module_exit(lttng_ftrace_exit)
+
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Mathieu Desnoyers");
 MODULE_DESCRIPTION("Linux Trace Toolkit Ftrace Support");