{
struct lttng_event_notifier *event_notifier =
container_of(p, struct lttng_event_notifier, u.kprobe.kp);
+ struct lttng_kernel_notifier_ctx notif_ctx;
if (unlikely(!READ_ONCE(event_notifier->enabled)))
return 0;
- event_notifier->send_notification(event_notifier);
+ notif_ctx.eval_capture = LTTNG_READ_ONCE(event_notifier->eval_capture);
+ event_notifier->send_notification(event_notifier, NULL, NULL, ¬if_ctx);
return 0;
}
+static const struct lttng_kernel_type_common *event_type =
+ lttng_kernel_static_type_integer_from_type(unsigned long, __BYTE_ORDER, 16);
+
/*
* Create event description
*/
static
int lttng_create_kprobe_event(const char *name, struct lttng_event *event)
{
- struct lttng_event_field *field;
- struct lttng_event_desc *desc;
+ 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(*event->desc), GFP_KERNEL);
+ desc = kzalloc(sizeof(*desc), GFP_KERNEL);
if (!desc)
return -ENOMEM;
- desc->name = kstrdup(name, GFP_KERNEL);
- if (!desc->name) {
+ desc->event_name = kstrdup(name, GFP_KERNEL);
+ if (!desc->event_name) {
ret = -ENOMEM;
goto error_str;
}
desc->nr_fields = 1;
- desc->fields = field =
- kzalloc(1 * sizeof(struct lttng_event_field), GFP_KERNEL);
+ 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.atype = atype_integer;
- field->type.u.integer.size = sizeof(unsigned long) * CHAR_BIT;
- field->type.u.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
- field->type.u.integer.signedness = lttng_is_signed_type(unsigned long);
- field->type.u.integer.reverse_byte_order = 0;
- field->type.u.integer.base = 16;
- field->type.u.integer.encoding = lttng_encode_none;
+ field->type = event_type;
desc->owner = THIS_MODULE;
event->desc = desc;
return 0;
error_field:
- kfree(desc->name);
+ kfree(fieldp_array);
+error_fieldp_array:
+ kfree(desc->event_name);
error_str:
kfree(desc);
return ret;
static
int lttng_create_kprobe_event_notifier(const char *name, struct lttng_event_notifier *event_notifier)
{
- struct lttng_event_desc *desc;
+ struct lttng_kernel_event_desc *desc;
int ret;
- desc = kzalloc(sizeof(*event_notifier->desc), GFP_KERNEL);
+ desc = kzalloc(sizeof(*desc), GFP_KERNEL);
if (!desc)
return -ENOMEM;
- desc->name = kstrdup(name, GFP_KERNEL);
- if (!desc->name) {
+ desc->event_name = kstrdup(name, GFP_KERNEL);
+ if (!desc->event_name) {
ret = -ENOMEM;
goto error_str;
}
if (symbol_name) {
lttng_kp->symbol_name =
- kzalloc(LTTNG_KERNEL_SYM_NAME_LEN * sizeof(char),
+ kzalloc(LTTNG_KERNEL_ABI_SYM_NAME_LEN * sizeof(char),
GFP_KERNEL);
if (!lttng_kp->symbol_name) {
ret = -ENOMEM;
goto name_error;
}
memcpy(lttng_kp->symbol_name, symbol_name,
- LTTNG_KERNEL_SYM_NAME_LEN * sizeof(char));
+ LTTNG_KERNEL_ABI_SYM_NAME_LEN * sizeof(char));
lttng_kp->kp.symbol_name = lttng_kp->symbol_name;
}
lttng_kp->kp.addr = (void *) (unsigned long) addr;
/*
- * Ensure the memory we just allocated don't event_notifier page faults.
+ * Ensure the memory we just allocated don't notify page faults.
* Well.. kprobes itself puts the page fault handler on the blacklist,
* but we can never be too careful.
*/
register_error:
kfree(event->desc->fields);
- kfree(event->desc->name);
+ kfree(event->desc->event_name);
kfree(event->desc);
error:
return ret;
return 0;
register_error:
- kfree(event_notifier->desc->name);
+ kfree(event_notifier->desc->event_name);
kfree(event_notifier->desc);
error:
return ret;
void lttng_kprobes_destroy_event_private(struct lttng_event *event)
{
kfree(event->u.kprobe.symbol_name);
+ kfree(event->desc->fields[0]);
kfree(event->desc->fields);
- kfree(event->desc->name);
+ kfree(event->desc->event_name);
kfree(event->desc);
}
EXPORT_SYMBOL_GPL(lttng_kprobes_destroy_event_private);
void lttng_kprobes_destroy_event_notifier_private(struct lttng_event_notifier *event_notifier)
{
kfree(event_notifier->u.kprobe.symbol_name);
- kfree(event_notifier->desc->name);
+ kfree(event_notifier->desc->event_name);
kfree(event_notifier->desc);
}
EXPORT_SYMBOL_GPL(lttng_kprobes_destroy_event_notifier_private);