#include <linux/slab.h>
#include <linux/uaccess.h>
#include <lttng/events.h>
+#include <lttng/events-internal.h>
#include <lttng/tracer.h>
#include <wrapper/irqflags.h>
#include <ringbuffer/frontend_types.h>
{
struct lttng_uprobe_handler *uprobe_handler =
container_of(uc, struct lttng_uprobe_handler, up_consumer);
- struct lttng_event *event = uprobe_handler->u.event;
+ struct lttng_kernel_event_recorder *event_recorder = uprobe_handler->u.event;
struct lttng_probe_ctx lttng_probe_ctx = {
- .event = event,
+ .event = event_recorder,
.interruptible = !lttng_regs_irqs_disabled(regs),
};
- struct lttng_channel *chan = event->chan;
+ struct lttng_channel *chan = event_recorder->chan;
struct lib_ring_buffer_ctx ctx;
int ret;
return 0;
if (unlikely(!LTTNG_READ_ONCE(chan->enabled)))
return 0;
- if (unlikely(!LTTNG_READ_ONCE(event->enabled)))
+ if (unlikely(!LTTNG_READ_ONCE(event_recorder->parent.enabled)))
return 0;
lib_ring_buffer_ctx_init(&ctx, chan->chan, <tng_probe_ctx,
sizeof(payload), lttng_alignof(payload), -1);
- ret = chan->ops->event_reserve(&ctx, event->id);
+ ret = chan->ops->event_reserve(&ctx, event_recorder->priv->id);
if (ret < 0)
return 0;
{
struct lttng_uprobe_handler *uprobe_handler =
container_of(uc, struct lttng_uprobe_handler, up_consumer);
- struct lttng_event_notifier *event_notifier = uprobe_handler->u.event_notifier;
+ struct lttng_kernel_event_notifier *event_notifier = uprobe_handler->u.event_notifier;
+ struct lttng_kernel_notification_ctx notif_ctx;
- if (unlikely(!READ_ONCE(event_notifier->enabled)))
+ if (unlikely(!READ_ONCE(event_notifier->parent.enabled)))
return 0;
- event_notifier->send_notification(event_notifier, NULL, NULL);
+ notif_ctx.eval_capture = LTTNG_READ_ONCE(event_notifier->eval_capture);
+ event_notifier->notification_send(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_uprobe_event(const char *name, struct lttng_event *event)
+int lttng_create_uprobe_event(const char *name, struct lttng_kernel_event_recorder *event_recorder)
{
- struct lttng_event_desc *desc;
- struct lttng_event_field *fields;
+ 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 = fields =
- kzalloc(1 * sizeof(struct lttng_event_field), GFP_KERNEL);
-
- if (!desc->fields) {
+ fieldp_array = kzalloc(1 * sizeof(struct lttng_kernel_event_field *), GFP_KERNEL);
+ if (!fieldp_array) {
ret = -ENOMEM;
- goto error_fields;
+ goto error_fieldp_array;
}
- fields[0].name = "ip";
- fields[0].type.atype = atype_integer;
- fields[0].type.u.integer.size = sizeof(unsigned long) * CHAR_BIT;
- fields[0].type.u.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
- fields[0].type.u.integer.signedness = lttng_is_signed_type(unsigned long);
- fields[0].type.u.integer.reverse_byte_order = 0;
- fields[0].type.u.integer.base = 16;
- fields[0].type.u.integer.encoding = lttng_encode_none;
-
+ 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 = event_type;
desc->owner = THIS_MODULE;
- event->desc = desc;
+ event_recorder->priv->parent.desc = desc;
return 0;
-error_fields:
- kfree(desc->name);
+error_field:
+ kfree(fieldp_array);
+error_fieldp_array:
+ kfree(desc->event_name);
error_str:
kfree(desc);
return ret;
* Create event_notifier description.
*/
static
-int lttng_create_uprobe_event_notifier(const char *name, struct lttng_event_notifier *event_notifier)
+int lttng_create_uprobe_event_notifier(const char *name, struct lttng_kernel_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;
}
desc->nr_fields = 0;
desc->owner = THIS_MODULE;
- event_notifier->desc = desc;
+ event_notifier->priv->parent.desc = desc;
return 0;
static
int lttng_uprobes_add_callsite(struct lttng_uprobe *uprobe,
- struct lttng_kernel_event_callsite __user *callsite,
+ struct lttng_kernel_abi_event_callsite __user *callsite,
int (*handler)(struct uprobe_consumer *self, struct pt_regs *regs),
void *priv_data)
{
goto end;
}
- /* Ensure the memory we just allocated don't event_notifier page faults. */
+ /* Ensure the memory we just allocated don't notify page faults. */
wrapper_vmalloc_sync_mappings();
uprobe_handler->u.event = priv_data;
return ret;
}
-int lttng_uprobes_event_add_callsite(struct lttng_event *event,
- struct lttng_kernel_event_callsite __user *callsite)
+int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_recorder *event_recorder,
+ struct lttng_kernel_abi_event_callsite __user *callsite)
{
- return lttng_uprobes_add_callsite(&event->u.uprobe, callsite,
- lttng_uprobes_event_handler_pre, event);
+ return lttng_uprobes_add_callsite(&event_recorder->priv->parent.u.uprobe, callsite,
+ lttng_uprobes_event_handler_pre, event_recorder);
}
EXPORT_SYMBOL_GPL(lttng_uprobes_event_add_callsite);
-int lttng_uprobes_event_notifier_add_callsite(struct lttng_event_notifier *event_notifier,
- struct lttng_kernel_event_callsite __user *callsite)
+int lttng_uprobes_event_notifier_add_callsite(struct lttng_kernel_event_notifier *event_notifier,
+ struct lttng_kernel_abi_event_callsite __user *callsite)
{
- return lttng_uprobes_add_callsite(&event_notifier->u.uprobe, callsite,
+ return lttng_uprobes_add_callsite(&event_notifier->priv->parent.u.uprobe, callsite,
lttng_uprobes_event_notifier_handler_pre, event_notifier);
}
EXPORT_SYMBOL_GPL(lttng_uprobes_event_notifier_add_callsite);
return ret;
}
-int lttng_uprobes_register_event(const char *name, int fd, struct lttng_event *event)
+int lttng_uprobes_register_event(const char *name, int fd, struct lttng_kernel_event_recorder *event_recorder)
{
int ret = 0;
- ret = lttng_create_uprobe_event(name, event);
+ ret = lttng_create_uprobe_event(name, event_recorder);
if (ret)
goto error;
- ret = lttng_uprobes_register(&event->u.uprobe, fd);
+ ret = lttng_uprobes_register(&event_recorder->priv->parent.u.uprobe, fd);
if (ret)
goto register_error;
return 0;
register_error:
- kfree(event->desc->name);
- kfree(event->desc);
+ kfree(event_recorder->priv->parent.desc->event_name);
+ kfree(event_recorder->priv->parent.desc);
error:
return ret;
}
EXPORT_SYMBOL_GPL(lttng_uprobes_register_event);
int lttng_uprobes_register_event_notifier(const char *name, int fd,
- struct lttng_event_notifier *event_notifier)
+ struct lttng_kernel_event_notifier *event_notifier)
{
int ret = 0;
if (ret)
goto error;
- ret = lttng_uprobes_register(&event_notifier->u.uprobe, fd);
+ ret = lttng_uprobes_register(&event_notifier->priv->parent.u.uprobe, fd);
if (ret)
goto register_error;
return 0;
register_error:
- kfree(event_notifier->desc->name);
- kfree(event_notifier->desc);
+ kfree(event_notifier->priv->parent.desc->event_name);
+ kfree(event_notifier->priv->parent.desc);
error:
return ret;
}
}
-void lttng_uprobes_unregister_event(struct lttng_event *event)
+void lttng_uprobes_unregister_event(struct lttng_kernel_event_recorder *event_recorder)
{
- lttng_uprobes_unregister(event->u.uprobe.inode, &event->u.uprobe.head);
+ lttng_uprobes_unregister(event_recorder->priv->parent.u.uprobe.inode, &event_recorder->priv->parent.u.uprobe.head);
}
EXPORT_SYMBOL_GPL(lttng_uprobes_unregister_event);
-void lttng_uprobes_unregister_event_notifier(struct lttng_event_notifier *event_notifier)
+void lttng_uprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
{
- lttng_uprobes_unregister(event_notifier->u.uprobe.inode, &event_notifier->u.uprobe.head);
+ lttng_uprobes_unregister(event_notifier->priv->parent.u.uprobe.inode, &event_notifier->priv->parent.u.uprobe.head);
}
EXPORT_SYMBOL_GPL(lttng_uprobes_unregister_event_notifier);
-void lttng_uprobes_destroy_event_private(struct lttng_event *event)
+void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_recorder *event_recorder)
{
- iput(event->u.uprobe.inode);
- kfree(event->desc->name);
- kfree(event->desc);
+ iput(event_recorder->priv->parent.u.uprobe.inode);
+ kfree(event_recorder->priv->parent.desc->fields[0]);
+ kfree(event_recorder->priv->parent.desc->fields);
+ kfree(event_recorder->priv->parent.desc->event_name);
+ kfree(event_recorder->priv->parent.desc);
}
EXPORT_SYMBOL_GPL(lttng_uprobes_destroy_event_private);
-void lttng_uprobes_destroy_event_notifier_private(struct lttng_event_notifier *event_notifier)
+void lttng_uprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier)
{
- iput(event_notifier->u.uprobe.inode);
- kfree(event_notifier->desc->name);
- kfree(event_notifier->desc);
+ iput(event_notifier->priv->parent.u.uprobe.inode);
+ kfree(event_notifier->priv->parent.desc->event_name);
+ kfree(event_notifier->priv->parent.desc);
}
EXPORT_SYMBOL_GPL(lttng_uprobes_destroy_event_notifier_private);
projects / lttng-modules.git / blobdiff