Commit bfd1b83d authored Sep 15, 2020 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Sep 15, 2020

perf evlist: Fix cpu/thread map leak



Asan reported leak of cpu and thread maps as they have one more refcount
than released.  I found that after setting evlist maps it should release
it's refcount.

It seems to be broken from the beginning so I chose the original commit
as the culprit.  But not sure how it's applied to stable trees since
there are many changes in the code after that.

Fixes: 7e2ed097 ("perf evlist: Store pointer to the cpu and thread maps")
Fixes: 4112eb18 ("perf evlist: Default to syswide target when no thread/cpu maps set")
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
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-4-namhyung@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent b033ab11

tools/perf/util/evlist.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -946,6 +946,10 @@ int perf_evlist__create_maps(struct evlist evlist, struct target target)

		perf_evlist__set_maps(&evlist->core, cpus, threads);

		/* as evlist now has references, put count here */
		perf_cpu_map__put(cpus);
		perf_thread_map__put(threads);

		return 0;

		out_delete_threads:
		@@ -1273,11 +1277,12 @@ static int perf_evlist__create_syswide_maps(struct evlist *evlist)
		goto out_put;

		perf_evlist__set_maps(&evlist->core, cpus, threads);
		out:
		return err;

		perf_thread_map__put(threads);
		out_put:
		perf_cpu_map__put(cpus);
		goto out;
		out:
		return err;
		}

		int evlist__open(struct evlist *evlist)

Admin message