Rename LTTNG_SYSCALL_MATCH_ -> LTTNG_KERNEL_SYSCALL_MATCH_

[deliverable/lttng-modules.git] / src / lttng-events.c

diff --git a/src/lttng-events.c b/src/lttng-events.c
index 0e11c5d86fce094ea0ce31c0c9c46f3e3cb11be8..91a0810030047d59ea281a8dced6d91dc49f5aca 100644 (file)
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -280,7 +280,7 @@ void lttng_session_destroy(struct lttng_session *session)
        mutex_lock(&sessions_mutex);
        WRITE_ONCE(session->active, 0);
        list_for_each_entry(chan, &session->chan, list) {
-               ret = lttng_syscalls_unregister(chan);
+               ret = lttng_syscalls_unregister_event(chan);
                WARN_ON(ret);
        }
        list_for_each_entry(event, &session->events, list) {
@@ -289,7 +289,7 @@ void lttng_session_destroy(struct lttng_session *session)
        }
        synchronize_trace();    /* Wait for in-flight events to complete */
        list_for_each_entry(chan, &session->chan, list) {
-               ret = lttng_syscalls_destroy(chan);
+               ret = lttng_syscalls_destroy_event(chan);
                WARN_ON(ret);
        }
        list_for_each_entry_safe(event_enabler, tmp_event_enabler,
@@ -615,11 +615,11 @@ int lttng_event_notifier_enable(struct lttng_event_notifier *event_notifier)
                ret = -EINVAL;
                break;
        case LTTNG_KERNEL_KPROBE:
+       case LTTNG_KERNEL_UPROBE:
                WRITE_ONCE(event_notifier->enabled, 1);
                break;
        case LTTNG_KERNEL_SYSCALL:
        case LTTNG_KERNEL_FUNCTION:
-       case LTTNG_KERNEL_UPROBE:
        case LTTNG_KERNEL_NOOP:
        case LTTNG_KERNEL_KRETPROBE:
        default:
@@ -645,11 +645,11 @@ int lttng_event_notifier_disable(struct lttng_event_notifier *event_notifier)
                ret = -EINVAL;
                break;
        case LTTNG_KERNEL_KPROBE:
+       case LTTNG_KERNEL_UPROBE:
                WRITE_ONCE(event_notifier->enabled, 0);
                break;
        case LTTNG_KERNEL_SYSCALL:
        case LTTNG_KERNEL_FUNCTION:
-       case LTTNG_KERNEL_UPROBE:
        case LTTNG_KERNEL_NOOP:
        case LTTNG_KERNEL_KRETPROBE:
        default:
@@ -1008,9 +1008,9 @@ struct lttng_event_notifier *_lttng_event_notifier_create(
                event_name = event_desc->name;
                break;
        case LTTNG_KERNEL_KPROBE:
+       case LTTNG_KERNEL_UPROBE:
                event_name = event_notifier_param->event.name;
                break;
-       case LTTNG_KERNEL_UPROBE:
        case LTTNG_KERNEL_KRETPROBE:
        case LTTNG_KERNEL_FUNCTION:
        case LTTNG_KERNEL_NOOP:
@@ -1087,6 +1087,28 @@ struct lttng_event_notifier *_lttng_event_notifier_create(
                WARN_ON_ONCE(!ret);
                break;
        case LTTNG_KERNEL_UPROBE:
+               /*
+                * Needs to be explicitly enabled after creation, since
+                * we may want to apply filters.
+                */
+               event_notifier->enabled = 0;
+               event_notifier->registered = 1;
+
+               /*
+                * Populate lttng_event_notifier structure before
+                * event_notifier registration.
+                */
+               smp_wmb();
+
+               ret = lttng_uprobes_register_event_notifier(
+                               event_notifier_param->event.name,
+                               event_notifier_param->event.u.uprobe.fd,
+                               event_notifier);
+               if (ret)
+                       goto register_error;
+               ret = try_module_get(event_notifier->desc->owner);
+               WARN_ON_ONCE(!ret);
+               break;
        case LTTNG_KERNEL_KRETPROBE:
        case LTTNG_KERNEL_FUNCTION:
        case LTTNG_KERNEL_NOOP:
@@ -1157,7 +1179,7 @@ void register_event(struct lttng_event *event)
                                                  event);
                break;
        case LTTNG_KERNEL_SYSCALL:
-               ret = lttng_syscall_filter_enable(event->chan, event);
+               ret = lttng_syscall_filter_enable_event(event->chan, event);
                break;
        case LTTNG_KERNEL_KPROBE:
        case LTTNG_KERNEL_UPROBE:
@@ -1200,7 +1222,7 @@ int _lttng_event_unregister(struct lttng_event *event)
                ret = 0;
                break;
        case LTTNG_KERNEL_SYSCALL:
-               ret = lttng_syscall_filter_disable(event->chan, event);
+               ret = lttng_syscall_filter_disable_event(event->chan, event);
                break;
        case LTTNG_KERNEL_NOOP:
                ret = 0;
@@ -1236,10 +1258,10 @@ void register_event_notifier(struct lttng_event_notifier *event_notifier)
                                                  event_notifier);
                break;
        case LTTNG_KERNEL_KPROBE:
+       case LTTNG_KERNEL_UPROBE:
                ret = 0;
                break;
        case LTTNG_KERNEL_SYSCALL:
-       case LTTNG_KERNEL_UPROBE:
        case LTTNG_KERNEL_KRETPROBE:
        case LTTNG_KERNEL_FUNCTION:
        case LTTNG_KERNEL_NOOP:
@@ -1271,11 +1293,14 @@ int _lttng_event_notifier_unregister(
                lttng_kprobes_unregister_event_notifier(event_notifier);
                ret = 0;
                break;
+       case LTTNG_KERNEL_UPROBE:
+               lttng_uprobes_unregister_event_notifier(event_notifier);
+               ret = 0;
+               break;
        case LTTNG_KERNEL_KRETPROBE:
        case LTTNG_KERNEL_FUNCTION:
        case LTTNG_KERNEL_SYSCALL:
        case LTTNG_KERNEL_NOOP:
-       case LTTNG_KERNEL_UPROBE:
        default:
                WARN_ON_ONCE(1);
        }
@@ -1332,11 +1357,14 @@ void _lttng_event_notifier_destroy(struct lttng_event_notifier *event_notifier)
                module_put(event_notifier->desc->owner);
                lttng_kprobes_destroy_event_notifier_private(event_notifier);
                break;
+       case LTTNG_KERNEL_UPROBE:
+               module_put(event_notifier->desc->owner);
+               lttng_uprobes_destroy_event_notifier_private(event_notifier);
+               break;
        case LTTNG_KERNEL_KRETPROBE:
        case LTTNG_KERNEL_FUNCTION:
        case LTTNG_KERNEL_NOOP:
        case LTTNG_KERNEL_SYSCALL:
-       case LTTNG_KERNEL_UPROBE:
        default:
                WARN_ON_ONCE(1);
        }
@@ -1685,7 +1713,7 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
                        return -EINVAL;
                }
                switch (enabler->event_param.u.syscall.match) {
-               case LTTNG_SYSCALL_MATCH_NAME:
+               case LTTNG_KERNEL_SYSCALL_MATCH_NAME:
                        switch (enabler->format_type) {
                        case LTTNG_ENABLER_FORMAT_STAR_GLOB:
                                return lttng_match_enabler_star_glob(desc_name, enabler_name);
@@ -1695,7 +1723,7 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
                                return -EINVAL;
                        }
                        break;
-               case LTTNG_SYSCALL_MATCH_NR:
+               case LTTNG_KERNEL_SYSCALL_MATCH_NR:
                        return -EINVAL; /* Not implemented. */
                default:
                        return -EINVAL;
@@ -1869,7 +1897,7 @@ void lttng_create_syscall_event_if_missing(struct lttng_event_enabler *event_ena
 {
        int ret;
 
-       ret = lttng_syscalls_register(event_enabler->chan, NULL);
+       ret = lttng_syscalls_register_event(event_enabler->chan, NULL);
        WARN_ON_ONCE(ret);
 }
 
@@ -1910,7 +1938,7 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
        if (base_enabler->event_param.instrumentation == LTTNG_KERNEL_SYSCALL &&
                        base_enabler->event_param.u.syscall.entryexit == LTTNG_KERNEL_SYSCALL_ENTRYEXIT &&
                        base_enabler->event_param.u.syscall.abi == LTTNG_KERNEL_SYSCALL_ABI_ALL &&
-                       base_enabler->event_param.u.syscall.match == LTTNG_SYSCALL_MATCH_NAME &&
+                       base_enabler->event_param.u.syscall.match == LTTNG_KERNEL_SYSCALL_MATCH_NAME &&
                        !strcmp(base_enabler->event_param.name, "*")) {
                if (base_enabler->enabled)
                        WRITE_ONCE(chan->syscall_all, 1);
@@ -2270,6 +2298,19 @@ error:
        return ret;
 }
 
+int lttng_event_notifier_add_callsite(struct lttng_event_notifier *event_notifier,
+               struct lttng_kernel_event_callsite __user *callsite)
+{
+
+       switch (event_notifier->instrumentation) {
+       case LTTNG_KERNEL_UPROBE:
+               return lttng_uprobes_event_notifier_add_callsite(event_notifier,
+                               callsite);
+       default:
+               return -EINVAL;
+       }
+}
+
 int lttng_event_notifier_enabler_attach_context(
                struct lttng_event_notifier_enabler *event_notifier_enabler,
                struct lttng_kernel_context *context_param)