X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-context-perf-counters.c;h=9887c6d208a27917d6f467ec3234811722d8cba1;hb=173f7d83002d5e4b47f67c63ee0367011e80333c;hp=8afc11f89019a9aea251c8b68cb2f39aa47b00da;hpb=ce4a2f0c273d4077c6eb9e6e0f28379ddaf61382;p=lttng-modules.git diff --git a/lttng-context-perf-counters.c b/lttng-context-perf-counters.c index 8afc11f8..9887c6d2 100644 --- a/lttng-context-perf-counters.c +++ b/lttng-context-perf-counters.c @@ -1,23 +1,10 @@ -/* +/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1) + * * lttng-context-perf-counters.c * * LTTng performance monitoring counters (perf-counters) integration module. * * Copyright (C) 2009-2012 Mathieu Desnoyers - * - * 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 @@ -72,7 +59,7 @@ 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)) +#if defined(CONFIG_PERF_EVENTS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) static void overflow_callback(struct perf_event *event, struct perf_sample_data *data, @@ -119,7 +106,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); + lttng_kvfree(events); kfree(field->u.perf_counter); } @@ -237,7 +224,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 = lttng_kvzalloc(num_possible_cpus() * sizeof(*events), GFP_KERNEL); if (!events) return -ENOMEM; @@ -334,7 +321,7 @@ int lttng_add_perf_counter_to_ctx(uint32_t type, field->u.perf_counter = perf_field; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) @@ -372,6 +359,6 @@ name_alloc_error: error_alloc_perf_field: kfree(attr); error_attr: - kfree(events); + lttng_kvfree(events); return ret; }