{
struct lttng_uprobe_handler *uprobe_handler =
container_of(uc, struct lttng_uprobe_handler, up_consumer);
- struct lttng_kernel_event_recorder *event_recorder = uprobe_handler->u.event;
- struct lttng_probe_ctx lttng_probe_ctx = {
- .event = event_recorder,
+ struct lttng_kernel_event_common *event = uprobe_handler->event;
+ struct lttng_kernel_probe_ctx lttng_probe_ctx = {
+ .event = event,
.interruptible = !lttng_regs_irqs_disabled(regs),
};
- struct lttng_channel *chan = event_recorder->chan;
- struct lib_ring_buffer_ctx ctx;
- int ret;
-
struct {
unsigned long ip;
} payload;
- if (unlikely(!LTTNG_READ_ONCE(chan->session->active)))
- return 0;
- if (unlikely(!LTTNG_READ_ONCE(chan->enabled)))
- return 0;
- 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);
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ {
+ struct lttng_kernel_event_recorder *event_recorder =
+ container_of(event, struct lttng_kernel_event_recorder, parent);
+ struct lttng_kernel_channel_buffer *chan = event_recorder->chan;
+
+ if (unlikely(!LTTNG_READ_ONCE(chan->parent.session->active)))
+ return 0;
+ if (unlikely(!LTTNG_READ_ONCE(chan->parent.enabled)))
+ return 0;
+ break;
+ }
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ break;
+ default:
+ WARN_ON_ONCE(1);
+ }
- ret = chan->ops->event_reserve(&ctx, event_recorder->priv->id);
- if (ret < 0)
+ if (unlikely(!LTTNG_READ_ONCE(event->enabled)))
return 0;
- /* Event payload. */
- payload.ip = (unsigned long)instruction_pointer(regs);
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ {
+ struct lttng_kernel_event_recorder *event_recorder =
+ container_of(event, struct lttng_kernel_event_recorder, parent);
+ struct lttng_kernel_channel_buffer *chan = event_recorder->chan;
+ struct lttng_kernel_ring_buffer_ctx ctx;
+ int ret;
- lib_ring_buffer_align_ctx(&ctx, lttng_alignof(payload));
- chan->ops->event_write(&ctx, &payload, sizeof(payload));
- chan->ops->event_commit(&ctx);
- return 0;
-}
+ lib_ring_buffer_ctx_init(&ctx, event_recorder,
+ sizeof(payload), lttng_alignof(payload), <tng_probe_ctx);
-static
-int lttng_uprobes_event_notifier_handler_pre(struct uprobe_consumer *uc, struct pt_regs *regs)
-{
- struct lttng_uprobe_handler *uprobe_handler =
- container_of(uc, struct lttng_uprobe_handler, up_consumer);
- 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->parent.enabled)))
- return 0;
-
- notif_ctx.eval_capture = LTTNG_READ_ONCE(event_notifier->eval_capture);
- event_notifier->notification_send(event_notifier, NULL, NULL, ¬if_ctx);
- return 0;
-}
+ ret = chan->ops->event_reserve(&ctx);
+ if (ret < 0)
+ return 0;
-static const struct lttng_kernel_type_common *event_type =
- lttng_kernel_static_type_integer_from_type(unsigned long, __BYTE_ORDER, 16);
+ /* Event payload. */
+ payload.ip = (unsigned long)instruction_pointer(regs);
-/*
- * Create event description.
- */
-static
-int lttng_create_uprobe_event(const char *name, struct lttng_kernel_event_recorder *event_recorder)
-{
- 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(*desc), GFP_KERNEL);
- if (!desc)
- return -ENOMEM;
- desc->event_name = kstrdup(name, GFP_KERNEL);
- if (!desc->event_name) {
- ret = -ENOMEM;
- goto error_str;
+ chan->ops->event_write(&ctx, &payload, sizeof(payload), lttng_alignof(payload));
+ chan->ops->event_commit(&ctx);
+ break;
}
- desc->nr_fields = 1;
- fieldp_array = kzalloc(1 * sizeof(struct lttng_kernel_event_field *), GFP_KERNEL);
- if (!fieldp_array) {
- ret = -ENOMEM;
- goto error_fieldp_array;
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ {
+ struct lttng_kernel_event_notifier *event_notifier =
+ container_of(event, struct lttng_kernel_event_notifier, parent);
+ struct lttng_kernel_notification_ctx notif_ctx;
+
+ notif_ctx.eval_capture = LTTNG_READ_ONCE(event_notifier->eval_capture);
+ event_notifier->notification_send(event_notifier, NULL, NULL, ¬if_ctx);
+ break;
}
- desc->fields = fieldp_array;
- desc->fields[0] = field =
- kzalloc(sizeof(struct lttng_kernel_event_field), GFP_KERNEL);
- if (!field) {
- ret = -ENOMEM;
- goto error_field;
+ default:
+ WARN_ON_ONCE(1);
}
- field->name = "ip";
- field->type = event_type;
- desc->owner = THIS_MODULE;
- event_recorder->priv->parent.desc = desc;
-
return 0;
-
-error_field:
- kfree(fieldp_array);
-error_fieldp_array:
- kfree(desc->event_name);
-error_str:
- kfree(desc);
- return ret;
}
+static const struct lttng_kernel_event_field *event_fields[] = {
+ lttng_kernel_static_event_field("ip",
+ lttng_kernel_static_type_integer_from_type(unsigned long, __BYTE_ORDER, 16),
+ false, false, false),
+};
+
+static const struct lttng_kernel_tracepoint_class tp_class = {
+ .nr_fields = ARRAY_SIZE(event_fields),
+ .fields = event_fields,
+};
+
/*
- * Create event_notifier description.
+ * Create event description.
*/
static
-int lttng_create_uprobe_event_notifier(const char *name, struct lttng_kernel_event_notifier *event_notifier)
+int lttng_create_uprobe_event(const char *name, struct lttng_kernel_event_common *event)
{
struct lttng_kernel_event_desc *desc;
int ret;
desc = kzalloc(sizeof(*desc), GFP_KERNEL);
if (!desc)
return -ENOMEM;
+ desc->tp_class = &tp_class;
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->priv->parent.desc = desc;
+ event->priv->desc = desc;
return 0;
/* Ensure the memory we just allocated don't notify page faults. */
wrapper_vmalloc_sync_mappings();
- uprobe_handler->u.event = priv_data;
+ uprobe_handler->event = priv_data;
uprobe_handler->up_consumer.handler = handler;
ret = copy_from_user(&uprobe_handler->offset, &callsite->u.uprobe.offset, sizeof(uint64_t));
return ret;
}
-int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_recorder *event_recorder,
+int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_common *event,
struct lttng_kernel_abi_event_callsite __user *callsite)
{
- return lttng_uprobes_add_callsite(&event_recorder->priv->parent.u.uprobe, callsite,
- lttng_uprobes_event_handler_pre, event_recorder);
+ return lttng_uprobes_add_callsite(&event->priv->u.uprobe, callsite,
+ lttng_uprobes_event_handler_pre, event);
}
EXPORT_SYMBOL_GPL(lttng_uprobes_event_add_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->priv->parent.u.uprobe, callsite,
- lttng_uprobes_event_notifier_handler_pre, event_notifier);
-}
-EXPORT_SYMBOL_GPL(lttng_uprobes_event_notifier_add_callsite);
-
static
int lttng_uprobes_register(struct lttng_uprobe *uprobe, int fd)
{
return ret;
}
-int lttng_uprobes_register_event(const char *name, int fd, struct lttng_kernel_event_recorder *event_recorder)
+int lttng_uprobes_register_event(const char *name, int fd, struct lttng_kernel_event_common *event)
{
int ret = 0;
- ret = lttng_create_uprobe_event(name, event_recorder);
+ ret = lttng_create_uprobe_event(name, event);
if (ret)
goto error;
- ret = lttng_uprobes_register(&event_recorder->priv->parent.u.uprobe, fd);
+ ret = lttng_uprobes_register(&event->priv->u.uprobe, fd);
if (ret)
goto register_error;
return 0;
register_error:
- kfree(event_recorder->priv->parent.desc->event_name);
- kfree(event_recorder->priv->parent.desc);
+ kfree(event->priv->desc->event_name);
+ kfree(event->priv->desc);
error:
return ret;
}
EXPORT_SYMBOL_GPL(lttng_uprobes_register_event);
-int lttng_uprobes_register_event_notifier(const char *name, int fd,
- struct lttng_kernel_event_notifier *event_notifier)
-{
- int ret = 0;
-
- ret = lttng_create_uprobe_event_notifier(name, event_notifier);
- if (ret)
- goto error;
-
- ret = lttng_uprobes_register(&event_notifier->priv->parent.u.uprobe, fd);
- if (ret)
- goto register_error;
-
- return 0;
-
-register_error:
- kfree(event_notifier->priv->parent.desc->event_name);
- kfree(event_notifier->priv->parent.desc);
-error:
- return ret;
-}
-EXPORT_SYMBOL_GPL(lttng_uprobes_register_event_notifier);
-
static
void lttng_uprobes_unregister(struct inode *inode, struct list_head *head)
{
list_del(&iter->node);
kfree(iter);
}
-
}
-void lttng_uprobes_unregister_event(struct lttng_kernel_event_recorder *event_recorder)
+void lttng_uprobes_unregister_event(struct lttng_kernel_event_common *event)
{
- lttng_uprobes_unregister(event_recorder->priv->parent.u.uprobe.inode, &event_recorder->priv->parent.u.uprobe.head);
+ lttng_uprobes_unregister(event->priv->u.uprobe.inode, &event->priv->u.uprobe.head);
}
EXPORT_SYMBOL_GPL(lttng_uprobes_unregister_event);
-void lttng_uprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
-{
- 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_kernel_event_recorder *event_recorder)
+void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_common *event)
{
- 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);
+ iput(event->priv->u.uprobe.inode);
+ kfree(event->priv->desc->event_name);
+ kfree(event->priv->desc);
}
EXPORT_SYMBOL_GPL(lttng_uprobes_destroy_event_private);
projects / lttng-modules.git / blobdiff