X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-perf-counters.c;h=dff5329544e68e908e3d7ffeebf2939e550fb24a;hb=9598166dce563b1287e05f0b1af96f9329e102c4;hp=1c5ab9fbc99e67b6a455aad9c1cf19693b3eadde;hpb=ceabb767180e064629b5a9ab4ed14449da864763;p=lttng-modules.git

diff --git a/lttng-context-perf-counters.c b/lttng-context-perf-counters.c
index 1c5ab9fb..dff53295 100644
--- a/lttng-context-perf-counters.c
+++ b/lttng-context-perf-counters.c
@@ -13,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
@@ -59,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)
@@ -106,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);
-	lttng_kvfree(events);
+	kvfree(events);
 	kfree(field->u.perf_counter);
 }
 
@@ -122,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) {
@@ -184,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) {
@@ -224,7 +214,7 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 	int ret;
 	char *name_alloc;
 
-	events = lttng_kvzalloc(num_possible_cpus() * sizeof(*events), GFP_KERNEL);
+	events = kvzalloc(num_possible_cpus() * sizeof(*events), GFP_KERNEL);
 	if (!events)
 		return -ENOMEM;
 
@@ -290,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;
@@ -321,7 +311,6 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 	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))
@@ -359,6 +348,6 @@ name_alloc_error:
 error_alloc_perf_field:
 	kfree(attr);
 error_attr:
-	lttng_kvfree(events);
+	kvfree(events);
 	return ret;
 }