X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-perf-counters.c;h=dff5329544e68e908e3d7ffeebf2939e550fb24a;hb=e2c05b25e4710e08ee72c2c18fa46790c9e7c22f;hp=8afc11f89019a9aea251c8b68cb2f39aa47b00da;hpb=ce4a2f0c273d4077c6eb9e6e0f28379ddaf61382;p=lttng-modules.git

diff --git a/lttng-context-perf-counters.c b/lttng-context-perf-counters.c
index 8afc11f8..dff53295 100644
--- a/lttng-context-perf-counters.c
+++ b/lttng-context-perf-counters.c
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
+ *
  * lttng-context-perf-counters.c
  *
  * LTTng performance monitoring counters (perf-counters) 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>
@@ -26,10 +13,9 @@
 #include <linux/list.h>
 #include <linux/string.h>
 #include <linux/cpu.h>
+#include <linux/mm.h>
 #include <lttng-events.h>
 #include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/vmalloc.h>
-#include <wrapper/perf.h>
 #include <lttng-tracer.h>
 
 static
@@ -72,21 +58,12 @@ void perf_counter_record(struct lttng_ctx_field *field,
 	chan->ops->event_write(ctx, &value, sizeof(value));
 }
 
-#if defined(CONFIG_PERF_EVENTS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,99))
 static
 void overflow_callback(struct perf_event *event,
 		       struct perf_sample_data *data,
 		       struct pt_regs *regs)
 {
 }
-#else
-static
-void overflow_callback(struct perf_event *event, int nmi,
-		       struct perf_sample_data *data,
-		       struct pt_regs *regs)
-{
-}
-#endif
 
 static
 void lttng_destroy_perf_counter_field(struct lttng_ctx_field *field)
@@ -119,7 +96,7 @@ void lttng_destroy_perf_counter_field(struct lttng_ctx_field *field)
 #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
 	kfree(field->event_field.name);
 	kfree(field->u.perf_counter->attr);
-	kfree(events);
+	kvfree(events);
 	kfree(field->u.perf_counter);
 }
 
@@ -135,8 +112,8 @@ int lttng_cpuhp_perf_counter_online(unsigned int cpu,
 	struct perf_event_attr *attr = perf_field->attr;
 	struct perf_event *pevent;
 
-	pevent = wrapper_perf_event_create_kernel_counter(attr,
-			cpu, NULL, overflow_callback);
+	pevent = perf_event_create_kernel_counter(attr,
+			cpu, NULL, overflow_callback, NULL);
 	if (!pevent || IS_ERR(pevent))
 		return -EINVAL;
 	if (pevent->state == PERF_EVENT_STATE_ERROR) {
@@ -197,8 +174,8 @@ int lttng_perf_counter_cpu_hp_callback(struct notifier_block *nb,
 	switch (action) {
 	case CPU_ONLINE:
 	case CPU_ONLINE_FROZEN:
-		pevent = wrapper_perf_event_create_kernel_counter(attr,
-				cpu, NULL, overflow_callback);
+		pevent = perf_event_create_kernel_counter(attr,
+				cpu, NULL, overflow_callback, NULL);
 		if (!pevent || IS_ERR(pevent))
 			return NOTIFY_BAD;
 		if (pevent->state == PERF_EVENT_STATE_ERROR) {
@@ -237,7 +214,7 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 	int ret;
 	char *name_alloc;
 
-	events = kzalloc(num_possible_cpus() * sizeof(*events), GFP_KERNEL);
+	events = kvzalloc(num_possible_cpus() * sizeof(*events), GFP_KERNEL);
 	if (!events)
 		return -ENOMEM;
 
@@ -303,8 +280,8 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 #endif
 		get_online_cpus();
 		for_each_online_cpu(cpu) {
-			events[cpu] = wrapper_perf_event_create_kernel_counter(attr,
-						cpu, NULL, overflow_callback);
+			events[cpu] = perf_event_create_kernel_counter(attr,
+						cpu, NULL, overflow_callback, NULL);
 			if (!events[cpu] || IS_ERR(events[cpu])) {
 				ret = -EINVAL;
 				goto counter_error;
@@ -323,18 +300,17 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 
 	field->event_field.name = name_alloc;
 	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.basic.integer.size = sizeof(uint64_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.alignment = lttng_alignof(uint64_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(uint64_t);
-	field->event_field.type.u.basic.integer.reverse_byte_order = 0;
-	field->event_field.type.u.basic.integer.base = 10;
-	field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
+	field->event_field.type.u.integer.size = sizeof(uint64_t) * CHAR_BIT;
+	field->event_field.type.u.integer.alignment = lttng_alignof(uint64_t) * CHAR_BIT;
+	field->event_field.type.u.integer.signedness = lttng_is_signed_type(uint64_t);
+	field->event_field.type.u.integer.reverse_byte_order = 0;
+	field->event_field.type.u.integer.base = 10;
+	field->event_field.type.u.integer.encoding = lttng_encode_none;
 	field->get_size = perf_counter_get_size;
 	field->record = perf_counter_record;
 	field->u.perf_counter = perf_field;
 	lttng_context_update(*ctx);
 
-	wrapper_vmalloc_sync_all();
 	return 0;
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
@@ -372,6 +348,6 @@ name_alloc_error:
 error_alloc_perf_field:
 	kfree(attr);
 error_attr:
-	kfree(events);
+	kvfree(events);
 	return ret;
 }