Skip to content

Commit

Permalink
perf script: Fix memory 'threads' and 'cpus' leaks on exit
Browse files Browse the repository at this point in the history
[ Upstream commit faf3ac3 ]

ASan reports several memory leaks while running:

  # perf test "82: Use vfs_getname probe to get syscall args filenames"

Two of these are caused by some refcounts not being decreased on
perf-script exit, namely script.threads and script.cpus.

This patch adds the missing __put calls in a new perf_script__exit
function, which is called at the end of cmd_script.

This patch concludes the fixes of all remaining memory leaks in perf
test "82: Use vfs_getname probe to get syscall args filenames".

Signed-off-by: Riccardo Mancini <rickyman7@gmail.com>
Fixes: cfc8874 ("perf script: Process cpu/threads maps")
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/5ee73b19791c6fa9d24c4d57f4ac1a23609400d7.1626343282.git.rickyman7@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Manciukic authored and gregkh committed Jul 28, 2021
1 parent 51077d3 commit 2ae8f40
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions tools/perf/builtin-script.c
Expand Up @@ -2483,6 +2483,12 @@ static void perf_script__exit_per_event_dump_stats(struct perf_script *script)
}
}

static void perf_script__exit(struct perf_script *script)
{
perf_thread_map__put(script->threads);
perf_cpu_map__put(script->cpus);
}

static int __cmd_script(struct perf_script *script)
{
int ret;
Expand Down Expand Up @@ -3937,6 +3943,7 @@ int cmd_script(int argc, const char **argv)

perf_evlist__free_stats(session->evlist);
perf_session__delete(session);
perf_script__exit(&script);

if (script_started)
cleanup_scripting();
Expand Down

0 comments on commit 2ae8f40

Please sign in to comment.