| From 7e934c4ff7acf9c91e5291049f04ec89b2990e60 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 15 Jul 2021 18:07:12 +0200 |
| Subject: perf test maps__merge_in: Fix memory leak of maps |
| |
| From: Riccardo Mancini <rickyman7@gmail.com> |
| |
| [ Upstream commit 244d1797c8c8e850b8de7992af713aa5c70d5650 ] |
| |
| ASan reports a memory leak when running: |
| |
| # perf test "65: maps__merge_in" |
| |
| This is the second and final patch addressing these memory leaks. |
| |
| This time, the problem is simply that the maps object is never |
| destructed. |
| |
| This patch adds the missing maps__exit call. |
| |
| Signed-off-by: Riccardo Mancini <rickyman7@gmail.com> |
| Fixes: 79b6bb73f888933c ("perf maps: Merge 'struct maps' with 'struct map_groups'") |
| Cc: Ian Rogers <irogers@google.com> |
| Cc: Jiri Olsa <jolsa@redhat.com> |
| Cc: Mark Rutland <mark.rutland@arm.com> |
| Cc: Namhyung Kim <namhyung@kernel.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Link: http://lore.kernel.org/lkml/a1a29b97a58738987d150e94d4ebfad0282fb038.1626343282.git.rickyman7@gmail.com |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/perf/tests/maps.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/tools/perf/tests/maps.c b/tools/perf/tests/maps.c |
| index edcbc70ff9d6..1ac72919fa35 100644 |
| --- a/tools/perf/tests/maps.c |
| +++ b/tools/perf/tests/maps.c |
| @@ -116,5 +116,7 @@ int test__maps__merge_in(struct test *t __maybe_unused, int subtest __maybe_unus |
| |
| ret = check_maps(merged3, ARRAY_SIZE(merged3), &maps); |
| TEST_ASSERT_VAL("merge check failed", !ret); |
| + |
| + maps__exit(&maps); |
| return TEST_OK; |
| } |
| -- |
| 2.30.2 |
| |