Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
perf evsel: Free evsel->counts in perf_evsel__exit()
[ Upstream commit 42dfa451d825a2ad15793c476f73e7bbc0f9d312 ] Using gcc's ASan, Changbin reports: ================================================================= ==7494==ERROR: LeakSanitizer: detected memory leaks Direct leak of 48 byte(s) in 1 object(s) allocated from: #0 0x7f0333a89138 in calloc (/usr/lib/x86_64-linux-gnu/libasan.so.5+0xee138) DD3Boh#1 0x5625e5330a5e in zalloc util/util.h:23 DD3Boh#2 0x5625e5330a9b in perf_counts__new util/counts.c:10 DD3Boh#3 0x5625e5330ca0 in perf_evsel__alloc_counts util/counts.c:47 DD3Boh#4 0x5625e520d8e5 in __perf_evsel__read_on_cpu util/evsel.c:1505 DD3Boh#5 0x5625e517a985 in perf_evsel__read_on_cpu /home/work/linux/tools/perf/util/evsel.h:347 DD3Boh#6 0x5625e517ad1a in test__openat_syscall_event tests/openat-syscall.c:47 DD3Boh#7 0x5625e51528e6 in run_test tests/builtin-test.c:358 DD3Boh#8 0x5625e5152baf in test_and_print tests/builtin-test.c:388 DD3Boh#9 0x5625e51543fe in __cmd_test tests/builtin-test.c:583 DD3Boh#10 0x5625e515572f in cmd_test tests/builtin-test.c:722 DD3Boh#11 0x5625e51c3fb8 in run_builtin /home/changbin/work/linux/tools/perf/perf.c:302 DD3Boh#12 0x5625e51c44f7 in handle_internal_command /home/changbin/work/linux/tools/perf/perf.c:354 DD3Boh#13 0x5625e51c48fb in run_argv /home/changbin/work/linux/tools/perf/perf.c:398 DD3Boh#14 0x5625e51c5069 in main /home/changbin/work/linux/tools/perf/perf.c:520 #15 0x7f033214d09a in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x2409a) Indirect leak of 72 byte(s) in 1 object(s) allocated from: #0 0x7f0333a89138 in calloc (/usr/lib/x86_64-linux-gnu/libasan.so.5+0xee138) DD3Boh#1 0x5625e532560d in zalloc util/util.h:23 DD3Boh#2 0x5625e532566b in xyarray__new util/xyarray.c:10 DD3Boh#3 0x5625e5330aba in perf_counts__new util/counts.c:15 DD3Boh#4 0x5625e5330ca0 in perf_evsel__alloc_counts util/counts.c:47 DD3Boh#5 0x5625e520d8e5 in __perf_evsel__read_on_cpu util/evsel.c:1505 DD3Boh#6 0x5625e517a985 in perf_evsel__read_on_cpu /home/work/linux/tools/perf/util/evsel.h:347 DD3Boh#7 0x5625e517ad1a in test__openat_syscall_event tests/openat-syscall.c:47 DD3Boh#8 0x5625e51528e6 in run_test tests/builtin-test.c:358 DD3Boh#9 0x5625e5152baf in test_and_print tests/builtin-test.c:388 DD3Boh#10 0x5625e51543fe in __cmd_test tests/builtin-test.c:583 DD3Boh#11 0x5625e515572f in cmd_test tests/builtin-test.c:722 DD3Boh#12 0x5625e51c3fb8 in run_builtin /home/changbin/work/linux/tools/perf/perf.c:302 DD3Boh#13 0x5625e51c44f7 in handle_internal_command /home/changbin/work/linux/tools/perf/perf.c:354 DD3Boh#14 0x5625e51c48fb in run_argv /home/changbin/work/linux/tools/perf/perf.c:398 #15 0x5625e51c5069 in main /home/changbin/work/linux/tools/perf/perf.c:520 #16 0x7f033214d09a in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x2409a) His patch took care of evsel->prev_raw_counts, but the above backtraces are about evsel->counts, so fix that instead. Reported-by: Changbin Du <[email protected]> Cc: Alexei Starovoitov <[email protected]> Cc: Daniel Borkmann <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Steven Rostedt (VMware) <[email protected]> Link: https://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
- Loading branch information