From: John Garry <john.garry@huawei.com>
To: Namhyung Kim <namhyung@kernel.org>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Jiri Olsa <jolsa@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Stephane Eranian <eranian@google.com>,
LKML <linux-kernel@vger.kernel.org>,
Andi Kleen <ak@linux.intel.com>, Ian Rogers <irogers@google.com>
Subject: Re: [PATCH 10/11] perf test: Free aliases for PMU event map aliases test
Date: Tue, 15 Sep 2020 08:37:15 +0100 [thread overview]
Message-ID: <d1704e16-0561-8bd7-02bb-dbef0233e395@huawei.com> (raw)
In-Reply-To: <20200915031819.386559-11-namhyung@kernel.org>
On 15/09/2020 04:18, Namhyung Kim wrote:
> 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
>
> Cc: John Garry <john.garry@huawei.com>
> Acked-by: Jiri Olsa <jolsa@redhat.com>
Just a minor comment below, either way:
Reviewed-by: John Garry <john.garry@huawei.com>
Thanks
> Fixes: 956a78356c24c ("perf test: Test pmu-events aliases")
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
> 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 eb19f9a0bc15..d3517a74d95e 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);
> + }
You could also consider putting this in a helper in pmu.c
> free(pmu);
> return res;
> }
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index f1688e1f6ed7..555cb3524c25 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -274,7 +274,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 44ccbdbb1c37..b63c4c5e335e 100644
> --- a/tools/perf/util/pmu.h
> +++ b/tools/perf/util/pmu.h
> @@ -113,6 +113,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);
>
>
next prev parent reply other threads:[~2020-09-15 7:40 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 3:18 [PATCHSET v2 00/11] perf tools: Fix various memory leaks Namhyung Kim
2020-09-15 3:18 ` [PATCH 01/11] perf metric: Fix some " Namhyung Kim
2020-09-15 11:58 ` Arnaldo Carvalho de Melo
2020-09-15 3:18 ` [PATCH 02/11] perf metric: Fix some memory leaks - part 2 Namhyung Kim
2020-09-15 11:59 ` Arnaldo Carvalho de Melo
2020-09-15 3:18 ` [PATCH 03/11] perf evlist: Fix cpu/thread map leak Namhyung Kim
2020-09-15 3:18 ` [PATCH 04/11] perf parse-event: Fix cpu map leaks Namhyung Kim
2020-09-15 12:18 ` Arnaldo Carvalho de Melo
2020-09-15 14:39 ` Namhyung Kim
2020-09-15 16:51 ` Arnaldo Carvalho de Melo
2020-09-15 3:18 ` [PATCH 05/11] perf parse-event: Fix memory leak in evsel->unit Namhyung Kim
2020-09-15 12:19 ` Arnaldo Carvalho de Melo
2020-09-15 18:59 ` Ian Rogers
2020-09-15 19:56 ` David Malcolm
2020-09-16 7:12 ` Namhyung Kim
2020-09-16 18:37 ` Ian Rogers
2020-09-15 20:03 ` Arnaldo Carvalho de Melo
2020-09-15 3:18 ` [PATCH 06/11] perf test: Fix memory leaks in parse-metric test Namhyung Kim
2020-09-15 12:23 ` Arnaldo Carvalho de Melo
2020-09-15 3:18 ` [PATCH 07/11] perf metric: Release expr_parse_ctx after testing Namhyung Kim
2020-09-15 3:18 ` [PATCH 08/11] perf metric: Free metric when it failed to resolve Namhyung Kim
2020-09-15 12:24 ` Arnaldo Carvalho de Melo
2020-09-15 3:18 ` [PATCH 09/11] perf metric: Do not free metric when " Namhyung Kim
2020-09-15 3:18 ` [PATCH 10/11] perf test: Free aliases for PMU event map aliases test Namhyung Kim
2020-09-15 7:37 ` John Garry [this message]
2020-09-15 11:57 ` Arnaldo Carvalho de Melo
2020-09-15 3:18 ` [PATCH 11/11] perf test: Free formats for perf pmu parse test Namhyung Kim
2020-09-15 5:15 ` [PATCHSET v2 00/11] perf tools: Fix various memory leaks Ian Rogers
2020-09-15 14:49 ` Namhyung Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d1704e16-0561-8bd7-02bb-dbef0233e395@huawei.com \
--to=john.garry@huawei.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).