Version 2.9.15

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

diff --git a/probes/lttng-kretprobes.c b/probes/lttng-kretprobes.c
index 498df620fa3a29d29147f1a5dc386695c3620f9c..307e67774cfa25d1c98679637ed20a3a6b5d8f1e 100644 (file)
--- a/probes/lttng-kretprobes.c
+++ b/probes/lttng-kretprobes.c
@@ -29,6 +29,7 @@
 #include <wrapper/vmalloc.h>
 #include <wrapper/irqflags.h>
 #include <lttng-tracer.h>
+#include <blacklist/kprobes.h>
 
 enum lttng_kretprobe_type {
        EVENT_ENTRY = 0,
@@ -63,11 +64,11 @@ int _lttng_kretprobes_handler(struct kretprobe_instance *krpi,
                unsigned long parent_ip;
        } payload;
 
-       if (unlikely(!ACCESS_ONCE(chan->session->active)))
+       if (unlikely(!READ_ONCE(chan->session->active)))
                return 0;
-       if (unlikely(!ACCESS_ONCE(chan->enabled)))
+       if (unlikely(!READ_ONCE(chan->enabled)))
                return 0;
-       if (unlikely(!ACCESS_ONCE(event->enabled)))
+       if (unlikely(!READ_ONCE(event->enabled)))
                return 0;
 
        payload.ip = (unsigned long) krpi->rp->kp.addr;
@@ -304,8 +305,8 @@ int lttng_kretprobes_event_enable_state(struct lttng_event *event,
        }
        lttng_krp = event->u.kretprobe.lttng_krp;
        event_return = lttng_krp->event[EVENT_RETURN];
-       ACCESS_ONCE(event->enabled) = enable;
-       ACCESS_ONCE(event_return->enabled) = enable;
+       WRITE_ONCE(event->enabled, enable);
+       WRITE_ONCE(event_return->enabled, enable);
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_kretprobes_event_enable_state);