perf evsel: Free evsel->counts in perf_evsel__exit()

[ Upstream commit 42dfa45 ]

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)
      beagleboard#1 0x5625e5330a5e in zalloc util/util.h:23
      beagleboard#2 0x5625e5330a9b in perf_counts__new util/counts.c:10
      beagleboard#3 0x5625e5330ca0 in perf_evsel__alloc_counts util/counts.c:47
      beagleboard#4 0x5625e520d8e5 in __perf_evsel__read_on_cpu util/evsel.c:1505
      beagleboard#5 0x5625e517a985 in perf_evsel__read_on_cpu /home/work/linux/tools/perf/util/evsel.h:347
      beagleboard#6 0x5625e517ad1a in test__openat_syscall_event tests/openat-syscall.c:47
      beagleboard#7 0x5625e51528e6 in run_test tests/builtin-test.c:358
      beagleboard#8 0x5625e5152baf in test_and_print tests/builtin-test.c:388
      beagleboard#9 0x5625e51543fe in __cmd_test tests/builtin-test.c:583
      beagleboard#10 0x5625e515572f in cmd_test tests/builtin-test.c:722
      beagleboard#11 0x5625e51c3fb8 in run_builtin /home/changbin/work/linux/tools/perf/perf.c:302
      beagleboard#12 0x5625e51c44f7 in handle_internal_command /home/changbin/work/linux/tools/perf/perf.c:354
      beagleboard#13 0x5625e51c48fb in run_argv /home/changbin/work/linux/tools/perf/perf.c:398
      beagleboard#14 0x5625e51c5069 in main /home/changbin/work/linux/tools/perf/perf.c:520
      beagleboard#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)
      beagleboard#1 0x5625e532560d in zalloc util/util.h:23
      beagleboard#2 0x5625e532566b in xyarray__new util/xyarray.c:10
      beagleboard#3 0x5625e5330aba in perf_counts__new util/counts.c:15
      beagleboard#4 0x5625e5330ca0 in perf_evsel__alloc_counts util/counts.c:47
      beagleboard#5 0x5625e520d8e5 in __perf_evsel__read_on_cpu util/evsel.c:1505
      beagleboard#6 0x5625e517a985 in perf_evsel__read_on_cpu /home/work/linux/tools/perf/util/evsel.h:347
      beagleboard#7 0x5625e517ad1a in test__openat_syscall_event tests/openat-syscall.c:47
      beagleboard#8 0x5625e51528e6 in run_test tests/builtin-test.c:358
      beagleboard#9 0x5625e5152baf in test_and_print tests/builtin-test.c:388
      beagleboard#10 0x5625e51543fe in __cmd_test tests/builtin-test.c:583
      beagleboard#11 0x5625e515572f in cmd_test tests/builtin-test.c:722
      beagleboard#12 0x5625e51c3fb8 in run_builtin /home/changbin/work/linux/tools/perf/perf.c:302
      beagleboard#13 0x5625e51c44f7 in handle_internal_command /home/changbin/work/linux/tools/perf/perf.c:354
      beagleboard#14 0x5625e51c48fb in run_argv /home/changbin/work/linux/tools/perf/perf.c:398
      beagleboard#15 0x5625e51c5069 in main /home/changbin/work/linux/tools/perf/perf.c:520
      beagleboard#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]>

tools/perf/util/evsel.c

@@ -1274,6 +1274,7 @@ void perf_evsel__exit(struct perf_evsel *evsel)
 {
 	assert(list_empty(&evsel->node));
 	assert(evsel->evlist == NULL);
+	perf_evsel__free_counts(evsel);
 	perf_evsel__free_fd(evsel);
 	perf_evsel__free_id(evsel);
 	perf_evsel__free_config_terms(evsel);