• Z
    perf parse: Fix event parser error for hybrid systems · 91c9923a
    Zhengjun Xing 提交于
    This bug happened on hybrid systems when both cpu_core and cpu_atom
    have the same event name such as "UOPS_RETIRED.MS" while their event
    terms are different, then during perf stat, the event for cpu_atom
    will parse fail and then no output for cpu_atom.
    
    UOPS_RETIRED.MS -> cpu_core/period=0x1e8483,umask=0x4,event=0xc2,frontend=0x8/
    UOPS_RETIRED.MS -> cpu_atom/period=0x1e8483,umask=0x1,event=0xc2/
    
    It is because event terms in the "head" of parse_events_multi_pmu_add
    will be changed to event terms for cpu_core after parsing UOPS_RETIRED.MS
    for cpu_core, then when parsing the same event for cpu_atom, it still
    uses the event terms for cpu_core, but event terms for cpu_atom are
    different with cpu_core, the event parses for cpu_atom will fail. This
    patch fixes it, the event terms should be parsed from the original
    event.
    
    This patch can work for the hybrid systems that have the same event
    in more than 2 PMUs. It also can work in non-hybrid systems.
    
    Before:
    
      # perf stat -v  -e  UOPS_RETIRED.MS  -a sleep 1
    
      Using CPUID GenuineIntel-6-97-1
      UOPS_RETIRED.MS -> cpu_core/period=0x1e8483,umask=0x4,event=0xc2,frontend=0x8/
      Control descriptor is not initialized
      UOPS_RETIRED.MS: 2737845 16068518485 16068518485
    
     Performance counter stats for 'system wide':
    
             2,737,845      cpu_core/UOPS_RETIRED.MS/
    
           1.002553850 seconds time elapsed
    
    After:
    
      # perf stat -v  -e  UOPS_RETIRED.MS  -a sleep 1
    
      Using CPUID GenuineIntel-6-97-1
      UOPS_RETIRED.MS -> cpu_core/period=0x1e8483,umask=0x4,event=0xc2,frontend=0x8/
      UOPS_RETIRED.MS -> cpu_atom/period=0x1e8483,umask=0x1,event=0xc2/
      Control descriptor is not initialized
      UOPS_RETIRED.MS: 1977555 16076950711 16076950711
      UOPS_RETIRED.MS: 568684 8038694234 8038694234
    
     Performance counter stats for 'system wide':
    
             1,977,555      cpu_core/UOPS_RETIRED.MS/
               568,684      cpu_atom/UOPS_RETIRED.MS/
    
           1.004758259 seconds time elapsed
    
    Fixes: fb081153 ("perf parse-events: Allow config on kernel PMU events")
    Reviewed-by: NKan Liang <kan.liang@linux.intel.com>
    Signed-off-by: NZhengjun Xing <zhengjun.xing@linux.intel.com>
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Alexander Shishkin <alexander.shishkin@intel.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Ian Rogers <irogers@google.com>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: https://lore.kernel.org/r/20220307151627.30049-1-zhengjun.xing@linux.intel.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
    91c9923a
parse-events.c 81.9 KB