104 lines
4.1 KiB
Diff
104 lines
4.1 KiB
Diff
From 9dee26683020e4eb40070d3a6bbf09e06d9e1690 Mon Sep 17 00:00:00 2001
|
|
From: Namhyung Kim <namhyung@kernel.org>
|
|
Date: Tue, 15 Sep 2020 12:18:18 +0900
|
|
Subject: [PATCH 134/201] perf test: Free aliases for PMU event map aliases
|
|
test
|
|
|
|
mainline inclusion
|
|
from mainline-v5.9-rc6
|
|
commit 22fe5a25b5d8c4f8008dc4a8738d6d8a5f5ddbe9
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=22fe5a25b5d8c4f8008dc4a8738d6d8a5f5ddbe9
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
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: 956a78356c24c ("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>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/tests/pmu-events.c | 5 +++++
|
|
tools/perf/util/pmu.c | 2 +-
|
|
tools/perf/util/pmu.h | 1 +
|
|
3 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c
|
|
index 7a3cad2ac94e..83712bde93f4 100644
|
|
--- a/tools/perf/tests/pmu-events.c
|
|
+++ b/tools/perf/tests/pmu-events.c
|
|
@@ -274,6 +274,7 @@ static int __test__pmu_event_aliases(char *pmu_name, int *count)
|
|
int res = 0;
|
|
bool use_uncore_table;
|
|
struct pmu_events_map *map = __test_pmu_get_events_map();
|
|
+ struct perf_pmu_alias *a, *tmp;
|
|
|
|
if (!map)
|
|
return -1;
|
|
@@ -347,6 +348,10 @@ static int __test__pmu_event_aliases(char *pmu_name, int *count)
|
|
pmu_name, alias->name);
|
|
}
|
|
|
|
+ list_for_each_entry_safe(a, tmp, &aliases, list) {
|
|
+ list_del(&a->list);
|
|
+ perf_pmu_free_alias(a);
|
|
+ }
|
|
free(pmu);
|
|
return res;
|
|
}
|
|
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
|
|
index 713d1c6204a2..cce165d80146 100644
|
|
--- a/tools/perf/util/pmu.c
|
|
+++ b/tools/perf/util/pmu.c
|
|
@@ -272,7 +272,7 @@ static void perf_pmu_update_alias(struct perf_pmu_alias *old,
|
|
}
|
|
|
|
/* Delete an alias entry. */
|
|
-static void perf_pmu_free_alias(struct perf_pmu_alias *newalias)
|
|
+void perf_pmu_free_alias(struct perf_pmu_alias *newalias)
|
|
{
|
|
zfree(&newalias->name);
|
|
zfree(&newalias->desc);
|
|
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
|
|
index c44c4a701bf4..555a917406e6 100644
|
|
--- a/tools/perf/util/pmu.h
|
|
+++ b/tools/perf/util/pmu.h
|
|
@@ -102,6 +102,7 @@ void pmu_add_cpu_aliases_map(struct list_head *head, struct perf_pmu *pmu,
|
|
|
|
struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu);
|
|
bool pmu_uncore_alias_match(const char *pmu_name, const char *name);
|
|
+void perf_pmu_free_alias(struct perf_pmu_alias *alias);
|
|
|
|
int perf_pmu__convert_scale(const char *scale, char **end, double *sval);
|
|
|
|
--
|
|
2.27.0
|
|
|