• Namhyung Kim's avatar
    perf test: Fix cpu and thread map leaks in keep_tracking test · f2c3202b
    Namhyung Kim authored
    The evlist and the cpu/thread maps should be released together.
    Otherwise following error was reported by Asan.
    
      $ perf test -v 28
      28: Use a dummy software event to keep tracking:
      --- start ---
      test child forked, pid 156810
      mmap size 528384B
    
      =================================================================
      ==156810==ERROR: LeakSanitizer: detected memory leaks
    
      Direct leak of 40 byte(s) in 1 object(s) allocated from:
        #0 0x7f637d2bce8f in __interceptor_malloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:145
        #1 0x55cc6295cffa in cpu_map__trim_new /home/namhyung/project/linux/tools/lib/perf/cpumap.c:79
        #2 0x55cc6295da1f in perf_cpu_map__read /home/namhyung/project/linux/tools/lib/perf/cpumap.c:149
        #3 0x55cc6295e1df in cpu_map__read_all_cpu_map /home/namhyung/project/linux/tools/lib/perf/cpumap.c:166
        #4 0x55cc6295e1df in perf_cpu_map__new /home/namhyung/project/linux/tools/lib/perf/cpumap.c:181
        #5 0x55cc626287cf in test__keep_tracking tests/keep-tracking.c:84
        #6 0x55cc625e38fb in run_test tests/builtin-test.c:428
        #7 0x55cc625e38fb in test_and_print tests/builtin-test.c:458
        #8 0x55cc625e5a53 in __cmd_test tests/builtin-test.c:679
        #9 0x55cc625e5a53 in cmd_test tests/builtin-test.c:825
        #10 0x55cc62651cc4 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:313
        #11 0x55cc624dba88 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:365
        #12 0x55cc624dba88 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:409
        #13 0x55cc624dba88 in main /home/namhyung/project/linux/tools/perf/perf.c:539
        #14 0x7f637cdf2d09 in __libc_start_main ../csu/libc-start.c:308
    
      SUMMARY: AddressSanitizer: 72 byte(s) leaked in 2 allocation(s).
      test child finished with 1
      ---- end ----
      Use a dummy software event to keep tracking: FAILED!
    Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
    Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Ian Rogers <irogers@google.com>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Leo Yan <leo.yan@linaro.org>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Link: https://lore.kernel.org/r/20210301140409.184570-7-namhyung@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    f2c3202b
keep-tracking.c 3.57 KB