• Adrian Hunter's avatar
    perf tools: Fix hybrid config terms list corruption · 99fc5941
    Adrian Hunter authored
    A config terms list was spliced twice, resulting in a never-ending loop
    when the list was traversed. Fix by using list_splice_init() and copying
    and freeing the lists as necessary.
    
    This patch also depends on patch "perf tools: Factor out
    copy_config_terms() and free_config_terms()"
    
    Example on ADL:
    
     Before:
    
      # perf record -e '{intel_pt//,cycles/aux-sample-size=4096/pp}' uname &
      # jobs
      [1]+  Running                    perf record -e "{intel_pt//,cycles/aux-sample-size=4096/pp}" uname
      # perf top -E 10
        PerfTop:    4071 irqs/sec  kernel: 6.9%  exact: 100.0% lost: 0/0 drop: 0/0 [4000Hz cycles],  (all, 24 CPUs)
      ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
    
        97.60%  perf           [.] __evsel__get_config_term
         0.25%  [kernel]       [k] kallsyms_expand_symbol.constprop.13
         0.24%  perf           [.] kallsyms__parse
         0.15%  [kernel]       [k] _raw_spin_lock
         0.14%  [kernel]       [k] number
         0.13%  [kernel]       [k] advance_transaction
         0.08%  [kernel]       [k] format_decode
         0.08%  perf           [.] map__process_kallsym_symbol
         0.08%  perf           [.] rb_insert_color
         0.08%  [kernel]       [k] vsnprintf
      exiting.
      # kill %1
    
    After:
    
      # perf record -e '{intel_pt//,cycles/aux-sample-size=4096/pp}' uname &
      Linux
      [ perf record: Woken up 1 times to write data ]
      [ perf record: Captured and wrote 0.060 MB perf.data ]
      # perf script | head
           perf-exec   604 [001]  1827.312293:                            psb:  psb offs: 0                       ffffffffb8415e87 pt_config_start+0x37 ([kernel.kallsyms])
           perf-exec   604  1827.312293:          1                       branches:  ffffffffb856a3bd event_sched_in.isra.133+0xfd ([kernel.kallsyms]) => ffffffffb856a9a0 perf_pmu_nop_void+0x0 ([kernel.kallsyms])
           perf-exec   604  1827.312293:          1                       branches:  ffffffffb856b10e merge_sched_in+0x26e ([kernel.kallsyms]) => ffffffffb856a2c0 event_sched_in.isra.133+0x0 ([kernel.kallsyms])
           perf-exec   604  1827.312293:          1                       branches:  ffffffffb856a45d event_sched_in.isra.133+0x19d ([kernel.kallsyms]) => ffffffffb8568b80 perf_event_set_state.part.61+0x0 ([kernel.kallsyms])
           perf-exec   604  1827.312293:          1                       branches:  ffffffffb8568b86 perf_event_set_state.part.61+0x6 ([kernel.kallsyms]) => ffffffffb85662a0 perf_event_update_time+0x0 ([kernel.kallsyms])
           perf-exec   604  1827.312293:          1                       branches:  ffffffffb856a35c event_sched_in.isra.133+0x9c ([kernel.kallsyms]) => ffffffffb8567610 perf_log_itrace_start+0x0 ([kernel.kallsyms])
           perf-exec   604  1827.312293:          1                       branches:  ffffffffb856a377 event_sched_in.isra.133+0xb7 ([kernel.kallsyms]) => ffffffffb8403b40 x86_pmu_add+0x0 ([kernel.kallsyms])
           perf-exec   604  1827.312293:          1                       branches:  ffffffffb8403b86 x86_pmu_add+0x46 ([kernel.kallsyms]) => ffffffffb8403940 collect_events+0x0 ([kernel.kallsyms])
           perf-exec   604  1827.312293:          1                       branches:  ffffffffb8403a7b collect_events+0x13b ([kernel.kallsyms]) => ffffffffb8402cd0 collect_event+0x0 ([kernel.kallsyms])
    
    Fixes: 30def61f ("perf parse-events Create two hybrid cache events")
    Fixes: 94da591b ("perf parse-events Create two hybrid raw events")
    Fixes: 9cbfa2f6 ("perf parse-events Create two hybrid hardware events")
    Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
    Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
    Cc: Jin Yao <yao.jin@linux.intel.com>
    Cc: Kan Liang <kan.liang@linux.intel.com>
    Link: https //lore.kernel.org/r/20210909125508.28693-3-adrian.hunter@intel.com
    Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    99fc5941
parse-events.c 77.6 KB