Refactoring: type description structures
[lttng-modules.git] / src / probes / lttng-uprobes.c
index d23653202782318473508ec02e0f088861414d63..89b474d1d0e5ed19e93f69f6f6e11256dd19f2ed 100644 (file)
@@ -9,7 +9,7 @@
  *
  */
 
-#include <linux/fdtable.h>
+#include <wrapper/fdtable.h>
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/namei.h>
@@ -63,49 +63,98 @@ int lttng_uprobes_event_handler_pre(struct uprobe_consumer *uc, struct pt_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;
+       struct lttng_kernel_notifier_ctx notif_ctx;
+
+       if (unlikely(!READ_ONCE(event_notifier->enabled)))
+               return 0;
+
+       notif_ctx.eval_capture = LTTNG_READ_ONCE(event_notifier->eval_capture);
+       event_notifier->send_notification(event_notifier, NULL, NULL, &notif_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)
 {
-       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);
+       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->desc = desc;
 
-       if (!desc->fields) {
+       return 0;
+
+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)
+{
+       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_fields;
+               goto error_str;
        }
-       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->nr_fields = 0;
 
        desc->owner = THIS_MODULE;
-       event->desc = desc;
+       event_notifier->desc = desc;
 
        return 0;
 
-error_fields:
-       kfree(desc->name);
 error_str:
        kfree(desc);
        return ret;
@@ -126,7 +175,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 = fcheck(fd);
+       file = lttng_lookup_fd_rcu(fd);
        if (file == NULL) {
                printk(KERN_WARNING "LTTng: Cannot access file backing the fd(%d)\n", fd);
                inode = NULL;
@@ -164,7 +213,7 @@ int lttng_uprobes_add_callsite(struct lttng_uprobe *uprobe,
                goto end;
        }
 
-       /* Ensure the memory we just allocated don't trigger page faults. */
+       /* Ensure the memory we just allocated don't notify page faults. */
        wrapper_vmalloc_sync_mappings();
 
        uprobe_handler->u.event = priv_data;
@@ -203,6 +252,14 @@ int lttng_uprobes_event_add_callsite(struct lttng_event *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)
 {
@@ -237,14 +294,38 @@ int lttng_uprobes_register_event(const char *name, int fd, struct lttng_event *e
        return 0;
 
 register_error:
-       kfree(event->desc->name);
+       kfree(event->desc->event_name);
        kfree(event->desc);
 error:
        return ret;
 }
 EXPORT_SYMBOL_GPL(lttng_uprobes_register_event);
 
-void lttng_uprobes_unregister_event(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->event_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;
 
@@ -252,23 +333,44 @@ void lttng_uprobes_unregister_event(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_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->fields[0]);
+       kfree(event->desc->fields);
+       kfree(event->desc->event_name);
        kfree(event->desc);
 }
 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->event_name);
+       kfree(event_notifier->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");
This page took 0.026228 seconds and 4 git commands to generate.