X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fprobes%2Flttng-uprobes.c;h=368828e350f79cddbb87dde44980457a792cdeff;hb=9de67196ec41ae39fd73e49259da50119c21bfcc;hp=c0f6e7c31c2a81c749735de4094637a75294b757;hpb=cfa6cc1d0f01c2cfcc1a679abf3a6572d411c309;p=deliverable%2Flttng-modules.git diff --git a/src/probes/lttng-uprobes.c b/src/probes/lttng-uprobes.c index c0f6e7c3..368828e3 100644 --- a/src/probes/lttng-uprobes.c +++ b/src/probes/lttng-uprobes.c @@ -23,11 +23,11 @@ #include static -int lttng_uprobes_handler_pre(struct uprobe_consumer *uc, struct pt_regs *regs) +int lttng_uprobes_event_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_event *event = uprobe_handler->event; + struct lttng_event *event = uprobe_handler->u.event; struct lttng_probe_ctx lttng_probe_ctx = { .event = event, .interruptible = !lttng_regs_irqs_disabled(regs), @@ -40,11 +40,11 @@ int lttng_uprobes_handler_pre(struct uprobe_consumer *uc, struct pt_regs *regs) unsigned long ip; } payload; - if (unlikely(!READ_ONCE(chan->session->active))) + if (unlikely(!LTTNG_READ_ONCE(chan->session->active))) return 0; - if (unlikely(!READ_ONCE(chan->enabled))) + if (unlikely(!LTTNG_READ_ONCE(chan->enabled))) return 0; - if (unlikely(!READ_ONCE(event->enabled))) + if (unlikely(!LTTNG_READ_ONCE(event->enabled))) return 0; lib_ring_buffer_ctx_init(&ctx, chan->chan, <tng_probe_ctx, @@ -63,6 +63,20 @@ int lttng_uprobes_handler_pre(struct uprobe_consumer *uc, struct pt_regs *regs) return 0; } +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_event_notifier *event_notifier = uprobe_handler->u.event_notifier; + + if (unlikely(!READ_ONCE(event_notifier->enabled))) + return 0; + + event_notifier->send_notification(event_notifier); + return 0; +} + /* * Create event description. */ @@ -111,6 +125,36 @@ error_str: return ret; } +/* + * Create event_notifier description. + */ +static +int lttng_create_uprobe_event_notifier(const char *name, struct lttng_event_notifier *event_notifier) +{ + struct lttng_event_desc *desc; + int ret; + + desc = kzalloc(sizeof(*event_notifier->desc), GFP_KERNEL); + if (!desc) + return -ENOMEM; + desc->name = kstrdup(name, GFP_KERNEL); + if (!desc->name) { + ret = -ENOMEM; + goto error_str; + } + + desc->nr_fields = 0; + + desc->owner = THIS_MODULE; + event_notifier->desc = desc; + + return 0; + +error_str: + kfree(desc); + return ret; +} + /* * Returns the inode struct from the current task and an fd. The inode is * grabbed by this function and must be put once we are done with it using @@ -128,7 +172,7 @@ static struct inode *get_inode_from_fd(int fd) */ file = fcheck(fd); if (file == NULL) { - printk(KERN_WARNING "Cannot access file backing the fd(%d)\n", fd); + printk(KERN_WARNING "LTTng: Cannot access file backing the fd(%d)\n", fd); inode = NULL; goto error; } @@ -136,52 +180,56 @@ static struct inode *get_inode_from_fd(int fd) /* Grab a reference on the inode. */ inode = igrab(file->f_path.dentry->d_inode); if (inode == NULL) - printk(KERN_WARNING "Cannot grab a reference on the inode.\n"); + printk(KERN_WARNING "LTTng: Cannot grab a reference on the inode.\n"); error: rcu_read_unlock(); return inode; } -int lttng_uprobes_add_callsite(struct lttng_event *event, - struct lttng_kernel_event_callsite __user *callsite) + +static +int lttng_uprobes_add_callsite(struct lttng_uprobe *uprobe, + struct lttng_kernel_event_callsite __user *callsite, + int (*handler)(struct uprobe_consumer *self, struct pt_regs *regs), + void *priv_data) { int ret = 0; struct lttng_uprobe_handler *uprobe_handler; - if (!event) { + if (!priv_data) { ret = -EINVAL; goto end; } uprobe_handler = kzalloc(sizeof(struct lttng_uprobe_handler), GFP_KERNEL); if (!uprobe_handler) { - printk(KERN_WARNING "Error allocating uprobe_uprobe_handlers"); + printk(KERN_WARNING "LTTng: Error allocating uprobe_handler"); ret = -ENOMEM; goto end; } - /* Ensure the memory we just allocated don't trigger page faults. */ + /* Ensure the memory we just allocated don't event_notifier page faults. */ wrapper_vmalloc_sync_mappings(); - uprobe_handler->event = event; - uprobe_handler->up_consumer.handler = lttng_uprobes_handler_pre; + uprobe_handler->u.event = priv_data; + uprobe_handler->up_consumer.handler = handler; ret = copy_from_user(&uprobe_handler->offset, &callsite->u.uprobe.offset, sizeof(uint64_t)); if (ret) { goto register_error; } - ret = wrapper_uprobe_register(event->u.uprobe.inode, + ret = wrapper_uprobe_register(uprobe->inode, uprobe_handler->offset, &uprobe_handler->up_consumer); if (ret) { - printk(KERN_WARNING "Error registering probe on inode %lu " - "and offset 0x%llx\n", event->u.uprobe.inode->i_ino, + printk(KERN_WARNING "LTTng: Error registering probe on inode %lu " + "and offset 0x%llx\n", uprobe->inode->i_ino, uprobe_handler->offset); ret = -1; goto register_error; } - list_add(&uprobe_handler->node, &event->u.uprobe.head); + list_add(&uprobe_handler->node, &uprobe->head); return ret; @@ -190,37 +238,89 @@ register_error: end: return ret; } -EXPORT_SYMBOL_GPL(lttng_uprobes_add_callsite); -int lttng_uprobes_register(const char *name, int fd, struct lttng_event *event) +int lttng_uprobes_event_add_callsite(struct lttng_event *event, + struct lttng_kernel_event_callsite __user *callsite) +{ + return lttng_uprobes_add_callsite(&event->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_event_notifier *event_notifier, + struct lttng_kernel_event_callsite __user *callsite) +{ + return lttng_uprobes_add_callsite(&event_notifier->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) { int ret = 0; struct inode *inode; - ret = lttng_create_uprobe_event(name, event); - if (ret) - goto error; - inode = get_inode_from_fd(fd); if (!inode) { - printk(KERN_WARNING "Cannot get inode from fd\n"); + printk(KERN_WARNING "LTTng: Cannot get inode from fd\n"); ret = -EBADF; goto inode_error; } - event->u.uprobe.inode = inode; - INIT_LIST_HEAD(&event->u.uprobe.head); + uprobe->inode = inode; + INIT_LIST_HEAD(&uprobe->head); + +inode_error: + return ret; +} + +int lttng_uprobes_register_event(const char *name, int fd, struct lttng_event *event) +{ + int ret = 0; + + ret = lttng_create_uprobe_event(name, event); + if (ret) + goto error; + + ret = lttng_uprobes_register(&event->u.uprobe, fd); + if (ret) + goto register_error; return 0; -inode_error: +register_error: kfree(event->desc->name); kfree(event->desc); error: return ret; } -EXPORT_SYMBOL_GPL(lttng_uprobes_register); +EXPORT_SYMBOL_GPL(lttng_uprobes_register_event); -void lttng_uprobes_unregister(struct lttng_event *event) +int lttng_uprobes_register_event_notifier(const char *name, int fd, + struct lttng_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->u.uprobe, fd); + if (ret) + goto register_error; + + return 0; + +register_error: + kfree(event_notifier->desc->name); + kfree(event_notifier->desc); +error: + return ret; +} +EXPORT_SYMBOL_GPL(lttng_uprobes_register_event_notifier); + +static +void lttng_uprobes_unregister(struct inode *inode, struct list_head *head) { struct lttng_uprobe_handler *iter, *tmp; @@ -228,22 +328,41 @@ void lttng_uprobes_unregister(struct lttng_event *event) * Iterate over the list of handler, remove each handler from the list * and free the struct. */ - list_for_each_entry_safe(iter, tmp, &event->u.uprobe.head, node) { - wrapper_uprobe_unregister(event->u.uprobe.inode, iter->offset, - &iter->up_consumer); + list_for_each_entry_safe(iter, tmp, head, node) { + wrapper_uprobe_unregister(inode, iter->offset, &iter->up_consumer); list_del(&iter->node); kfree(iter); } + +} + +void lttng_uprobes_unregister_event(struct lttng_event *event) +{ + lttng_uprobes_unregister(event->u.uprobe.inode, &event->u.uprobe.head); } -EXPORT_SYMBOL_GPL(lttng_uprobes_unregister); +EXPORT_SYMBOL_GPL(lttng_uprobes_unregister_event); -void lttng_uprobes_destroy_private(struct lttng_event *event) +void lttng_uprobes_unregister_event_notifier(struct lttng_event_notifier *event_notifier) +{ + lttng_uprobes_unregister(event_notifier->u.uprobe.inode, &event_notifier->u.uprobe.head); +} +EXPORT_SYMBOL_GPL(lttng_uprobes_unregister_event_notifier); + +void lttng_uprobes_destroy_event_private(struct lttng_event *event) { iput(event->u.uprobe.inode); kfree(event->desc->name); kfree(event->desc); } -EXPORT_SYMBOL_GPL(lttng_uprobes_destroy_private); +EXPORT_SYMBOL_GPL(lttng_uprobes_destroy_event_private); + +void lttng_uprobes_destroy_event_notifier_private(struct lttng_event_notifier *event_notifier) +{ + iput(event_notifier->u.uprobe.inode); + kfree(event_notifier->desc->name); + kfree(event_notifier->desc); +} +EXPORT_SYMBOL_GPL(lttng_uprobes_destroy_event_notifier_private); MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Yannick Brosseau");