#include "../ltt-events.h"
#include "../wrapper/ringbuffer/frontend_types.h"
#include "../wrapper/ftrace.h"
+#include "../wrapper/vmalloc.h"
#include "../ltt-tracer.h"
static
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;
desc->nr_fields = 2;
desc->fields = fields =
kzalloc(2 * sizeof(struct lttng_event_field), GFP_KERNEL);
+ if (!desc->fields) {
+ ret = -ENOMEM;
+ goto error_fields;
+ }
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;
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;
return 0;
+error_fields:
+ kfree(desc->name);
error_str:
kfree(desc);
return ret;
if (!event->u.ftrace.symbol_name)
goto name_error;
+ /* Ensure the memory we just allocated don't trigger page faults */
+ wrapper_vmalloc_sync_all();
+
ret = wrapper_register_ftrace_function_probe(event->u.ftrace.symbol_name,
<tng_ftrace_ops, event);
if (ret)
wrapper_unregister_ftrace_function_probe(event->u.ftrace.symbol_name,
<tng_ftrace_ops, event);
kfree(event->u.ftrace.symbol_name);
+ kfree(event->desc->fields);
kfree(event->desc->name);
kfree(event->desc);
}
/* This module is permanent. */
int lttng_ftrace_init(void)
{
+ wrapper_vmalloc_sync_all();
return 0;
}
module_init(lttng_ftrace_init)