Refactoring: type description structures
[lttng-modules.git] / src / probes / lttng-kprobes.c
index e127d72fa4fd654e7f1b34c0abcca16c398eb533..6e8cb20f2600380d197a52d8fcc9fe6dcb2a73b3 100644 (file)
@@ -18,7 +18,7 @@
 #include <blacklist/kprobes.h>
 
 static
-int lttng_kprobes_handler_pre(struct kprobe *p, struct pt_regs *regs)
+int lttng_kprobes_event_handler_pre(struct kprobe *p, struct pt_regs *regs)
 {
        struct lttng_event *event =
                container_of(p, struct lttng_event, u.kprobe.kp);
@@ -49,56 +49,108 @@ int lttng_kprobes_handler_pre(struct kprobe *p, struct pt_regs *regs)
        return 0;
 }
 
+static
+int lttng_kprobes_event_notifier_handler_pre(struct kprobe *p, struct pt_regs *regs)
+{
+       struct lttng_event_notifier *event_notifier =
+               container_of(p, struct lttng_event_notifier, u.kprobe.kp);
+       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_kprobe_event(const char *name, struct lttng_event *event)
 {
-       struct lttng_event_field *field;
-       struct lttng_event_desc *desc;
+       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 = field =
-               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.atype = atype_integer;
-       field->type.u.integer.size = sizeof(unsigned long) * CHAR_BIT;
-       field->type.u.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
-       field->type.u.integer.signedness = lttng_is_signed_type(unsigned long);
-       field->type.u.integer.reverse_byte_order = 0;
-       field->type.u.integer.base = 16;
-       field->type.u.integer.encoding = lttng_encode_none;
+       field->type = event_type;
        desc->owner = THIS_MODULE;
        event->desc = desc;
 
        return 0;
 
 error_field:
-       kfree(desc->name);
+       kfree(fieldp_array);
+error_fieldp_array:
+       kfree(desc->event_name);
 error_str:
        kfree(desc);
        return ret;
 }
 
-int lttng_kprobes_register(const char *name,
-                          const char *symbol_name,
+/*
+ * Create event_notifier description
+ */
+static
+int lttng_create_kprobe_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_str;
+       }
+       desc->nr_fields = 0;
+
+       desc->owner = THIS_MODULE;
+       event_notifier->desc = desc;
+
+       return 0;
+
+error_str:
+       kfree(desc);
+       return ret;
+}
+
+static
+int _lttng_kprobes_register(const char *symbol_name,
                           uint64_t offset,
                           uint64_t addr,
-                          struct lttng_event *event)
+                          struct lttng_kprobe *lttng_kp,
+                          kprobe_pre_handler_t pre_handler)
 {
        int ret;
 
@@ -106,64 +158,126 @@ int lttng_kprobes_register(const char *name,
        if (symbol_name[0] == '\0')
                symbol_name = NULL;
 
-       ret = lttng_create_kprobe_event(name, event);
-       if (ret)
-               goto error;
-       memset(&event->u.kprobe.kp, 0, sizeof(event->u.kprobe.kp));
-       event->u.kprobe.kp.pre_handler = lttng_kprobes_handler_pre;
+       memset(&lttng_kp->kp, 0, sizeof(lttng_kp->kp));
+       lttng_kp->kp.pre_handler = pre_handler;
+
        if (symbol_name) {
-               event->u.kprobe.symbol_name =
+               lttng_kp->symbol_name =
                        kzalloc(LTTNG_KERNEL_SYM_NAME_LEN * sizeof(char),
                                GFP_KERNEL);
-               if (!event->u.kprobe.symbol_name) {
+               if (!lttng_kp->symbol_name) {
                        ret = -ENOMEM;
                        goto name_error;
                }
-               memcpy(event->u.kprobe.symbol_name, symbol_name,
+               memcpy(lttng_kp->symbol_name, symbol_name,
                       LTTNG_KERNEL_SYM_NAME_LEN * sizeof(char));
-               event->u.kprobe.kp.symbol_name =
-                       event->u.kprobe.symbol_name;
+               lttng_kp->kp.symbol_name = lttng_kp->symbol_name;
        }
-       event->u.kprobe.kp.offset = offset;
-       event->u.kprobe.kp.addr = (void *) (unsigned long) addr;
+
+       lttng_kp->kp.offset = offset;
+       lttng_kp->kp.addr = (void *) (unsigned long) addr;
 
        /*
-        * Ensure the memory we just allocated don't trigger page faults.
+        * Ensure the memory we just allocated don't notify page faults.
         * Well.. kprobes itself puts the page fault handler on the blacklist,
         * but we can never be too careful.
         */
        wrapper_vmalloc_sync_mappings();
 
-       ret = register_kprobe(&event->u.kprobe.kp);
+       ret = register_kprobe(&lttng_kp->kp);
        if (ret)
                goto register_error;
+
        return 0;
 
 register_error:
-       kfree(event->u.kprobe.symbol_name);
+       kfree(lttng_kp->symbol_name);
 name_error:
+       return ret;
+}
+
+int lttng_kprobes_register_event(const char *name,
+                          const char *symbol_name,
+                          uint64_t offset,
+                          uint64_t addr,
+                          struct lttng_event *event)
+{
+       int ret;
+
+       ret = lttng_create_kprobe_event(name, event);
+       if (ret)
+               goto error;
+
+       ret = _lttng_kprobes_register(symbol_name, offset, addr,
+               &event->u.kprobe, lttng_kprobes_event_handler_pre);
+       if (ret)
+               goto register_error;
+
+       return 0;
+
+register_error:
        kfree(event->desc->fields);
-       kfree(event->desc->name);
+       kfree(event->desc->event_name);
        kfree(event->desc);
 error:
        return ret;
 }
-EXPORT_SYMBOL_GPL(lttng_kprobes_register);
+EXPORT_SYMBOL_GPL(lttng_kprobes_register_event);
 
-void lttng_kprobes_unregister(struct lttng_event *event)
+int lttng_kprobes_register_event_notifier(const char *symbol_name,
+                          uint64_t offset,
+                          uint64_t addr,
+                          struct lttng_event_notifier *event_notifier)
+{
+       int ret;
+       ret = lttng_create_kprobe_event_notifier(symbol_name, event_notifier);
+       if (ret)
+               goto error;
+
+       ret = _lttng_kprobes_register(symbol_name, offset, addr,
+               &event_notifier->u.kprobe, lttng_kprobes_event_notifier_handler_pre);
+       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_kprobes_register_event_notifier);
+
+void lttng_kprobes_unregister_event(struct lttng_event *event)
 {
        unregister_kprobe(&event->u.kprobe.kp);
 }
-EXPORT_SYMBOL_GPL(lttng_kprobes_unregister);
+EXPORT_SYMBOL_GPL(lttng_kprobes_unregister_event);
+
+void lttng_kprobes_unregister_event_notifier(struct lttng_event_notifier *event_notifier)
+{
+       unregister_kprobe(&event_notifier->u.kprobe.kp);
+}
+EXPORT_SYMBOL_GPL(lttng_kprobes_unregister_event_notifier);
 
-void lttng_kprobes_destroy_private(struct lttng_event *event)
+void lttng_kprobes_destroy_event_private(struct lttng_event *event)
 {
        kfree(event->u.kprobe.symbol_name);
+       kfree(event->desc->fields[0]);
        kfree(event->desc->fields);
-       kfree(event->desc->name);
+       kfree(event->desc->event_name);
        kfree(event->desc);
 }
-EXPORT_SYMBOL_GPL(lttng_kprobes_destroy_private);
+EXPORT_SYMBOL_GPL(lttng_kprobes_destroy_event_private);
+
+void lttng_kprobes_destroy_event_notifier_private(struct lttng_event_notifier *event_notifier)
+{
+       kfree(event_notifier->u.kprobe.symbol_name);
+       kfree(event_notifier->desc->event_name);
+       kfree(event_notifier->desc);
+}
+EXPORT_SYMBOL_GPL(lttng_kprobes_destroy_event_notifier_private);
 
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Mathieu Desnoyers <mathieu.desnoyers@efficios.com>");
This page took 0.026477 seconds and 4 git commands to generate.