wrapper: remove list wrapper

[lttng-modules.git] / lttng-context-perf-counters.c

diff --git a/lttng-context-perf-counters.c b/lttng-context-perf-counters.c
index 03de7b428e6b12658b437e01ef3132baa88fe329..096189e14d11ead2c08feaf1fbff4ba8dbfb3e67 100644 (file)
--- 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
@@ -106,7 +105,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 +121,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 +183,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 +223,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 +289,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;
@@ -310,18 +309,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))
@@ -359,6 +357,6 @@ name_alloc_error:
 error_alloc_perf_field:
        kfree(attr);
 error_attr:
-       lttng_kvfree(events);
+       kvfree(events);
        return ret;
 }