Fix !CONFIG_KPROBES config

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

diff --git a/probes/lttng-kprobes.c b/probes/lttng-kprobes.c
index 1cffe685bd834f7738020e4f36a4c13e7127245c..daef3600feefd580bb0db79357d09428f8eb21eb 100644 (file)
--- a/probes/lttng-kprobes.c
+++ b/probes/lttng-kprobes.c
@@ -12,6 +12,7 @@
 #include <linux/slab.h>
 #include "../ltt-events.h"
 #include "../wrapper/ringbuffer/frontend_types.h"
+#include "../wrapper/vmalloc.h"
 #include "../ltt-tracer.h"
 
 static
@@ -64,6 +65,8 @@ int lttng_create_kprobe_event(const char *name, struct ltt_event *event)
        field->type.u.basic.integer.alignment = ltt_alignof(unsigned long);
        field->type.u.basic.integer.signedness = 0;
        field->type.u.basic.integer.reverse_byte_order = 0;
+       field->type.u.basic.integer.base = 16;
+       field->type.u.basic.integer.encoding = lttng_encode_none;
        event->desc = desc;
 
        return 0;
@@ -87,18 +90,26 @@ int lttng_kprobes_register(const char *name,
        memset(&event->u.kprobe.kp, 0, sizeof(event->u.kprobe.kp));
        event->u.kprobe.kp.pre_handler = lttng_kprobes_handler_pre;
        event->u.kprobe.symbol_name =
-               kzalloc(LTTNG_KPROBE_SYM_NAME_LEN * sizeof(char),
+               kzalloc(LTTNG_SYM_NAME_LEN * sizeof(char),
                        GFP_KERNEL);
        if (!event->u.kprobe.symbol_name) {
                ret = -ENOMEM;
                goto name_error;
        }
        memcpy(event->u.kprobe.symbol_name, symbol_name,
-              LTTNG_KPROBE_SYM_NAME_LEN * sizeof(char));
+              LTTNG_SYM_NAME_LEN * sizeof(char));
        event->u.kprobe.kp.symbol_name =
                event->u.kprobe.symbol_name;
        event->u.kprobe.kp.offset = offset;
        event->u.kprobe.kp.addr = (void *) addr;
+
+       /*
+        * Ensure the memory we just allocated don't trigger page faults.
+        * Well.. kprobes itself puts the page fault handler on the blacklist,
+        * but we can never be too careful.
+        */
+       wrapper_vmalloc_sync_all();
+
        ret = register_kprobe(&event->u.kprobe.kp);
        if (ret)
                goto register_error;