X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=blobdiff_plain;f=probes%2Flttng-kprobes.c;h=6a1347321fed1f05d531b201b8ab1b3b3e010305;hp=daf14ceca9d42ac29e85edd279dbbaea59b0763a;hb=2459130397d7e7eecc44a5f06a39d65c78257eef;hpb=156a3977f8fa114924d7bbd2bd04c94fd2ac0649

diff --git a/probes/lttng-kprobes.c b/probes/lttng-kprobes.c
index daf14cec..6a134732 100644
--- a/probes/lttng-kprobes.c
+++ b/probes/lttng-kprobes.c
@@ -1,33 +1,21 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
+ *
  * probes/lttng-kprobes.c
  *
  * LTTng kprobes integration module.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <linux/module.h>
 #include <linux/kprobes.h>
 #include <linux/slab.h>
 #include <lttng-events.h>
-#include <wrapper/ringbuffer/frontend_types.h>
+#include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
 #include <wrapper/irqflags.h>
 #include <lttng-tracer.h>
+#include <blacklist/kprobes.h>
 
 static
 int lttng_kprobes_handler_pre(struct kprobe *p, struct pt_regs *regs)
@@ -43,11 +31,11 @@ int lttng_kprobes_handler_pre(struct kprobe *p, struct pt_regs *regs)
 	int ret;
 	unsigned long data = (unsigned long) p->addr;
 
-	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;
 
 	lib_ring_buffer_ctx_init(&ctx, chan->chan, &lttng_probe_ctx, sizeof(data),
@@ -88,12 +76,12 @@ int lttng_create_kprobe_event(const char *name, struct lttng_event *event)
 	}
 	field->name = "ip";
 	field->type.atype = atype_integer;
-	field->type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
-	field->type.u.basic.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
-	field->type.u.basic.integer.signedness = lttng_is_signed_type(unsigned long);
-	field->type.u.basic.integer.reverse_byte_order = 0;
-	field->type.u.basic.integer.base = 16;
-	field->type.u.basic.integer.encoding = lttng_encode_none;
+	field->type.u.integer.size = sizeof(unsigned long) * CHAR_BIT;
+	field->type.u.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
+	field->type.u.integer.signedness = lttng_is_signed_type(unsigned long);
+	field->type.u.integer.reverse_byte_order = 0;
+	field->type.u.integer.base = 16;
+	field->type.u.integer.encoding = lttng_encode_none;
 	desc->owner = THIS_MODULE;
 	event->desc = desc;
 
@@ -144,7 +132,7 @@ int lttng_kprobes_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_kprobe(&event->u.kprobe.kp);
 	if (ret)
@@ -178,8 +166,8 @@ void lttng_kprobes_destroy_private(struct lttng_event *event)
 EXPORT_SYMBOL_GPL(lttng_kprobes_destroy_private);
 
 MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit Kprobes Support");
+MODULE_AUTHOR("Mathieu Desnoyers <mathieu.desnoyers@efficios.com>");
+MODULE_DESCRIPTION("LTTng kprobes probes");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
 	__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)