Skip to content

Commit 22fe5a2

Browse files
namhyungacmel
authored andcommittedSep 15, 2020
perf test: Free aliases for PMU event map aliases test
The aliases were never released causing the following leaks: Indirect leak of 1224 byte(s) in 9 object(s) allocated from: #0 0x7feefb830628 in malloc (/lib/x86_64-linux-gnu/libasan.so.5+0x107628) #1 0x56332c8f1b62 in __perf_pmu__new_alias util/pmu.c:322 #2 0x56332c8f401f in pmu_add_cpu_aliases_map util/pmu.c:778 #3 0x56332c792ce9 in __test__pmu_event_aliases tests/pmu-events.c:295 #4 0x56332c792ce9 in test_aliases tests/pmu-events.c:367 #5 0x56332c76a09b in run_test tests/builtin-test.c:410 #6 0x56332c76a09b in test_and_print tests/builtin-test.c:440 #7 0x56332c76ce69 in __cmd_test tests/builtin-test.c:695 #8 0x56332c76ce69 in cmd_test tests/builtin-test.c:807 #9 0x56332c7d2214 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:312 #10 0x56332c6701a8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:364 #11 0x56332c6701a8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:408 #12 0x56332c6701a8 in main /home/namhyung/project/linux/tools/perf/perf.c:538 #13 0x7feefb359cc9 in __libc_start_main ../csu/libc-start.c:308 Fixes: 956a783 ("perf test: Test pmu-events aliases") Signed-off-by: Namhyung Kim <namhyung@kernel.org> Reviewed-by: John Garry <john.garry@huawei.com> Acked-by: Jiri Olsa <jolsa@redhat.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lore.kernel.org/lkml/20200915031819.386559-11-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 56f3a1c commit 22fe5a2

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed
 

‎tools/perf/tests/pmu-events.c

+5
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ static int __test__pmu_event_aliases(char *pmu_name, int *count)
274274
int res = 0;
275275
bool use_uncore_table;
276276
struct pmu_events_map *map = __test_pmu_get_events_map();
277+
struct perf_pmu_alias *a, *tmp;
277278

278279
if (!map)
279280
return -1;
@@ -347,6 +348,10 @@ static int __test__pmu_event_aliases(char *pmu_name, int *count)
347348
pmu_name, alias->name);
348349
}
349350

351+
list_for_each_entry_safe(a, tmp, &aliases, list) {
352+
list_del(&a->list);
353+
perf_pmu_free_alias(a);
354+
}
350355
free(pmu);
351356
return res;
352357
}

‎tools/perf/util/pmu.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ static void perf_pmu_update_alias(struct perf_pmu_alias *old,
274274
}
275275

276276
/* Delete an alias entry. */
277-
static void perf_pmu_free_alias(struct perf_pmu_alias *newalias)
277+
void perf_pmu_free_alias(struct perf_pmu_alias *newalias)
278278
{
279279
zfree(&newalias->name);
280280
zfree(&newalias->desc);

‎tools/perf/util/pmu.h

+1
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ void pmu_add_cpu_aliases_map(struct list_head *head, struct perf_pmu *pmu,
113113

114114
struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu);
115115
bool pmu_uncore_alias_match(const char *pmu_name, const char *name);
116+
void perf_pmu_free_alias(struct perf_pmu_alias *alias);
116117

117118
int perf_pmu__convert_scale(const char *scale, char **end, double *sval);
118119

0 commit comments

Comments
 (0)
Please sign in to comment.