X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=probes%2Flttng-kretprobes.c;h=307e67774cfa25d1c98679637ed20a3a6b5d8f1e;hb=99d62d55d8d587ade853db85a8dc1a7f01b4113e;hp=52b3f78138f94978427eedc8e197175527270274;hpb=a0493bef1367458230b0319401f8533b0400cea2;p=lttng-modules.git

diff --git a/probes/lttng-kretprobes.c b/probes/lttng-kretprobes.c
index 52b3f781..307e6777 100644
--- a/probes/lttng-kretprobes.c
+++ b/probes/lttng-kretprobes.c
@@ -1,5 +1,5 @@
 /*
- * probes/lttng-kretprobes.c
+* probes/lttng-kretprobes.c
  *
  * LTTng kretprobes integration module.
  *
@@ -24,10 +24,12 @@
 #include <linux/kprobes.h>
 #include <linux/slab.h>
 #include <linux/kref.h>
-#include "../lttng-events.h"
-#include "../wrapper/ringbuffer/frontend_types.h"
-#include "../wrapper/vmalloc.h"
-#include "../lttng-tracer.h"
+#include <lttng-events.h>
+#include <wrapper/ringbuffer/frontend_types.h>
+#include <wrapper/vmalloc.h>
+#include <wrapper/irqflags.h>
+#include <lttng-tracer.h>
+#include <blacklist/kprobes.h>
 
 enum lttng_kretprobe_type {
 	EVENT_ENTRY = 0,
@@ -50,6 +52,10 @@ int _lttng_kretprobes_handler(struct kretprobe_instance *krpi,
 		container_of(krpi->rp, struct lttng_krp, krp);
 	struct lttng_event *event =
 		lttng_krp->event[type];
+	struct lttng_probe_ctx lttng_probe_ctx = {
+		.event = event,
+		.interruptible = !lttng_regs_irqs_disabled(regs),
+	};
 	struct lttng_channel *chan = event->chan;
 	struct lib_ring_buffer_ctx ctx;
 	int ret;
@@ -58,17 +64,17 @@ 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;
 	payload.parent_ip = (unsigned long) krpi->ret_addr;
 
-	lib_ring_buffer_ctx_init(&ctx, chan->chan, event, sizeof(payload),
+	lib_ring_buffer_ctx_init(&ctx, chan->chan, &lttng_probe_ctx, sizeof(payload),
 				 lttng_alignof(payload), -1);
 	ret = chan->ops->event_reserve(&ctx, event->id);
 	if (ret < 0)
@@ -219,9 +225,9 @@ int lttng_kretprobes_register(const char *name,
 	 * unregistered. Same for memory allocation.
 	 */
 	kref_init(&lttng_krp->kref_alloc);
-	kref_get(&lttng_krp->kref_alloc);	/* inc refcount to 2 */
+	kref_get(&lttng_krp->kref_alloc);	/* inc refcount to 2, no overflow. */
 	kref_init(&lttng_krp->kref_register);
-	kref_get(&lttng_krp->kref_register);	/* inc refcount to 2 */
+	kref_get(&lttng_krp->kref_register);	/* inc refcount to 2, no overflow. */
 
 	/*
 	 * Ensure the memory we just allocated don't trigger page faults.
@@ -299,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);