fix: kprobes: Remove kretprobe hash (v5.11)

[lttng-modules.git] / probes / lttng-kretprobes.c

diff --git a/probes/lttng-kretprobes.c b/probes/lttng-kretprobes.c
index 4b18d46077df8749c7c01dfea52c67384b3f0406..2da3143cd0d4d081170e988273faf452cd0d4105 100644 (file)
--- a/probes/lttng-kretprobes.c
+++ b/probes/lttng-kretprobes.c
@@ -8,7 +8,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/kprobes.h>
+#include <wrapper/kprobes.h>
 #include <linux/slab.h>
 #include <linux/kref.h>
 #include <lttng-events.h>
@@ -36,7 +36,7 @@ int _lttng_kretprobes_handler(struct kretprobe_instance *krpi,
                              enum lttng_kretprobe_type type)
 {
        struct lttng_krp *lttng_krp =
-               container_of(krpi->rp, struct lttng_krp, krp);
+               container_of(lttng_get_kretprobe(krpi), struct lttng_krp, krp);
        struct lttng_event *event =
                lttng_krp->event[type];
        struct lttng_probe_ctx lttng_probe_ctx = {
@@ -51,14 +51,14 @@ int _lttng_kretprobes_handler(struct kretprobe_instance *krpi,
                unsigned long parent_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;
 
-       payload.ip = (unsigned long) krpi->rp->kp.addr;
+       payload.ip = (unsigned long) lttng_get_kretprobe(krpi)->kp.addr;
        payload.parent_ip = (unsigned long) krpi->ret_addr;
 
        lib_ring_buffer_ctx_init(&ctx, chan->chan, &lttng_probe_ctx, sizeof(payload),
@@ -221,7 +221,7 @@ int lttng_kretprobes_register(const char *name,
         * Well.. kprobes itself puts the page fault handler on the blacklist,
         * but we can never be too careful.
         */
-       wrapper_vmalloc_sync_all();
+       wrapper_vmalloc_sync_mappings();
 
        ret = register_kretprobe(&lttng_krp->krp);
        if (ret)