X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=probes%2Flttng-kretprobes.c;h=2da3143cd0d4d081170e988273faf452cd0d4105;hb=e4169397bcabe72c5acabcd5e6a9bb84e4001db7;hp=84eca9b350ff86c1c643695d01f7fbe927270bae;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;p=lttng-modules.git

diff --git a/probes/lttng-kretprobes.c b/probes/lttng-kretprobes.c
index 84eca9b3..2da3143c 100644
--- 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>
@@ -16,6 +16,7 @@
 #include <wrapper/vmalloc.h>
 #include <wrapper/irqflags.h>
 #include <lttng-tracer.h>
+#include <blacklist/kprobes.h>
 
 enum lttng_kretprobe_type {
 	EVENT_ENTRY = 0,
@@ -35,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 = {
@@ -50,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),
@@ -220,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)