projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tracepoint list ABI: fix initialization of anonymous file
[lttng-modules.git]
/
probes
/
lttng-kprobes.c
diff --git
a/probes/lttng-kprobes.c
b/probes/lttng-kprobes.c
index 1cffe685bd834f7738020e4f36a4c13e7127245c..650144cbe0cdc4793c91bf46825f74a5f9ae042b 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 <linux/slab.h>
#include "../ltt-events.h"
#include "../wrapper/ringbuffer/frontend_types.h"
+#include "../wrapper/vmalloc.h"
#include "../ltt-tracer.h"
static
#include "../ltt-tracer.h"
static
@@
-28,7
+29,7
@@
int lttng_kprobes_handler_pre(struct kprobe *p, struct pt_regs *regs)
return 0;
lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, sizeof(data),
ltt_alignof(data), -1);
return 0;
lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, sizeof(data),
ltt_alignof(data), -1);
- ret = chan->ops->event_reserve(&ctx);
+ ret = chan->ops->event_reserve(&ctx
, event->id
);
if (ret < 0)
return 0;
lib_ring_buffer_align_ctx(&ctx, ltt_alignof(data));
if (ret < 0)
return 0;
lib_ring_buffer_align_ctx(&ctx, ltt_alignof(data));
@@
-58,16
+59,25
@@
int lttng_create_kprobe_event(const char *name, struct ltt_event *event)
desc->nr_fields = 1;
desc->fields = field =
kzalloc(1 * sizeof(struct lttng_event_field), GFP_KERNEL);
desc->nr_fields = 1;
desc->fields = field =
kzalloc(1 * sizeof(struct lttng_event_field), GFP_KERNEL);
+ if (!field) {
+ ret = -ENOMEM;
+ goto error_field;
+ }
field->name = "ip";
field->type.atype = atype_integer;
field->name = "ip";
field->type.atype = atype_integer;
- field->type.u.basic.integer.size = sizeof(unsigned long);
- field->type.u.basic.integer.alignment = ltt_alignof(unsigned long);
+ field->type.u.basic.integer.size = sizeof(unsigned long)
* CHAR_BIT
;
+ field->type.u.basic.integer.alignment = ltt_alignof(unsigned long)
* CHAR_BIT
;
field->type.u.basic.integer.signedness = 0;
field->type.u.basic.integer.reverse_byte_order = 0;
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;
+ desc->owner = THIS_MODULE;
event->desc = desc;
return 0;
event->desc = desc;
return 0;
+error_field:
+ kfree(desc->name);
error_str:
kfree(desc);
return ret;
error_str:
kfree(desc);
return ret;
@@
-87,18
+97,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 =
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,
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;
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;
ret = register_kprobe(&event->u.kprobe.kp);
if (ret)
goto register_error;
@@
-107,6
+125,7
@@
int lttng_kprobes_register(const char *name,
register_error:
kfree(event->u.kprobe.symbol_name);
name_error:
register_error:
kfree(event->u.kprobe.symbol_name);
name_error:
+ kfree(event->desc->fields);
kfree(event->desc->name);
kfree(event->desc);
error:
kfree(event->desc->name);
kfree(event->desc);
error:
@@
-118,6
+137,7
@@
void lttng_kprobes_unregister(struct ltt_event *event)
{
unregister_kprobe(&event->u.kprobe.kp);
kfree(event->u.kprobe.symbol_name);
{
unregister_kprobe(&event->u.kprobe.kp);
kfree(event->u.kprobe.symbol_name);
+ kfree(event->desc->fields);
kfree(event->desc->name);
kfree(event->desc);
}
kfree(event->desc->name);
kfree(event->desc);
}
This page took
0.023878 seconds
and
4
git commands to generate.