X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fprobes%2Flttng-uprobes.c;h=435ff5aca0f125bec9846b67c0b211a3b8431ab5;hb=HEAD;hp=2507f43418c1cae6fcd1f75a10b7eb9c0ca84ae5;hpb=e2d5dbc7d09c7aa4f7c391fcdd4dfc95ba1ed326;p=lttng-modules.git diff --git a/src/probes/lttng-uprobes.c b/src/probes/lttng-uprobes.c index 2507f434..5463251a 100644 --- a/src/probes/lttng-uprobes.c +++ b/src/probes/lttng-uprobes.c @@ -10,17 +10,19 @@ */ #include +#include #include #include #include #include #include +#include + #include #include #include #include #include -#include #include static @@ -29,7 +31,7 @@ int lttng_uprobes_event_handler_pre(struct uprobe_consumer *uc, struct pt_regs * struct lttng_uprobe_handler *uprobe_handler = container_of(uc, struct lttng_uprobe_handler, up_consumer); struct lttng_kernel_event_common *event = uprobe_handler->event; - struct lttng_probe_ctx lttng_probe_ctx = { + struct lttng_kernel_probe_ctx lttng_probe_ctx = { .event = event, .interruptible = !lttng_regs_irqs_disabled(regs), }; @@ -42,11 +44,11 @@ int lttng_uprobes_event_handler_pre(struct uprobe_consumer *uc, struct pt_regs * { struct lttng_kernel_event_recorder *event_recorder = container_of(event, struct lttng_kernel_event_recorder, parent); - struct lttng_channel *chan = event_recorder->chan; + struct lttng_kernel_channel_buffer *chan = event_recorder->chan; - if (unlikely(!LTTNG_READ_ONCE(chan->session->active))) + if (unlikely(!LTTNG_READ_ONCE(chan->parent.session->active))) return 0; - if (unlikely(!LTTNG_READ_ONCE(chan->enabled))) + if (unlikely(!LTTNG_READ_ONCE(chan->parent.enabled))) return 0; break; } @@ -64,22 +66,21 @@ int lttng_uprobes_event_handler_pre(struct uprobe_consumer *uc, struct pt_regs * { struct lttng_kernel_event_recorder *event_recorder = container_of(event, struct lttng_kernel_event_recorder, parent); - struct lttng_channel *chan = event_recorder->chan; - struct lib_ring_buffer_ctx ctx; + struct lttng_kernel_channel_buffer *chan = event_recorder->chan; + struct lttng_kernel_ring_buffer_ctx ctx; int ret; - lib_ring_buffer_ctx_init(&ctx, chan->chan, <tng_probe_ctx, - sizeof(payload), lttng_alignof(payload), -1); + lib_ring_buffer_ctx_init(&ctx, event_recorder, + sizeof(payload), lttng_alignof(payload), <tng_probe_ctx); - ret = chan->ops->event_reserve(&ctx, event_recorder->priv->id); + ret = chan->ops->event_reserve(&ctx); if (ret < 0) return 0; /* Event payload. */ payload.ip = (unsigned long)instruction_pointer(regs); - lib_ring_buffer_align_ctx(&ctx, lttng_alignof(payload)); - chan->ops->event_write(&ctx, &payload, sizeof(payload)); + chan->ops->event_write(&ctx, &payload, sizeof(payload), lttng_alignof(payload)); chan->ops->event_commit(&ctx); break; } @@ -99,62 +100,22 @@ int lttng_uprobes_event_handler_pre(struct uprobe_consumer *uc, struct pt_regs * 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_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; - } - 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; - } - 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_recorder->priv->parent.desc = desc; +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), +}; - 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_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; @@ -162,16 +123,14 @@ int lttng_create_uprobe_event_notifier(const char *name, struct lttng_kernel_eve 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; @@ -195,7 +154,7 @@ static struct inode *get_inode_from_fd(int fd) * Returns the file backing the given fd. Needs to be done inside an RCU * critical section. */ - file = lttng_lookup_fd_rcu(fd); + file = lttng_lookup_fdget_rcu(fd); if (file == NULL) { printk(KERN_WARNING "LTTng: Cannot access file backing the fd(%d)\n", fd); inode = NULL; @@ -206,8 +165,11 @@ static struct inode *get_inode_from_fd(int fd) inode = igrab(file->f_path.dentry->d_inode); if (inode == NULL) printk(KERN_WARNING "LTTng: Cannot grab a reference on the inode.\n"); + error: rcu_read_unlock(); + if (file) + fput(file); return inode; } @@ -244,7 +206,7 @@ int lttng_uprobes_add_callsite(struct lttng_uprobe *uprobe, goto register_error; } - ret = wrapper_uprobe_register(uprobe->inode, + ret = uprobe_register(uprobe->inode, uprobe_handler->offset, &uprobe_handler->up_consumer); if (ret) { printk(KERN_WARNING "LTTng: Error registering probe on inode %lu " @@ -291,51 +253,28 @@ inode_error: 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) { @@ -346,42 +285,26 @@ void lttng_uprobes_unregister(struct inode *inode, struct list_head *head) * and free the struct. */ list_for_each_entry_safe(iter, tmp, head, node) { - wrapper_uprobe_unregister(inode, iter->offset, &iter->up_consumer); + uprobe_unregister(inode, iter->offset, &iter->up_consumer); 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) +void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_common *event) { - 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) -{ - 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); -void lttng_uprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier) -{ - 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); - MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Yannick Brosseau"); MODULE_DESCRIPTION("Linux Trace Toolkit Uprobes Support");