Patch "perf parse-events: Support different format of the topdown event name" has been added to the 5.18-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    perf parse-events: Support different format of the topdown event name

to the 5.18-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     perf-parse-events-support-different-format-of-the-to.patch
and it can be found in the queue-5.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit d6257978f1df4460b7dd44d6ff2c6a9f6a21a996
Author: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>
Date:   Wed May 18 07:38:59 2022 -0700

    perf parse-events: Support different format of the topdown event name
    
    [ Upstream commit e7d1374ed5cb346efd9b3df03814dbc0767adb4e ]
    
    The evsel->name may have a different format for a topdown event, a pure
    topdown name (e.g., topdown-fe-bound), or a PMU name + a topdown name
    (e.g., cpu/topdown-fe-bound/). The cpu/topdown-fe-bound/ kind format
    isn't supported by the arch_evlist__leader(). This format is a very
    common format for a hybrid platform, which requires specifying the PMU
    name for each event.
    
    Without the patch,
    
      $ perf stat -e '{instructions,slots,cpu/topdown-fe-bound/}' -a sleep 1
    
       Performance counter stats for 'system wide':
    
           <not counted>      instructions
           <not counted>      slots
         <not supported>      cpu/topdown-fe-bound/
    
             1.003482041 seconds time elapsed
    
      Some events weren't counted. Try disabling the NMI watchdog:
              echo 0 > /proc/sys/kernel/nmi_watchdog
              perf stat ...
              echo 1 > /proc/sys/kernel/nmi_watchdog
      The events in group usually have to be from the same PMU. Try reorganizing the group.
    
    With the patch,
    
      $ perf stat -e '{instructions,slots,cpu/topdown-fe-bound/}' -a sleep 1
    
      Performance counter stats for 'system wide':
    
             157,383,996      slots
              25,011,711      instructions
              27,441,686      cpu/topdown-fe-bound/
    
             1.003530890 seconds time elapsed
    
    Fixes: bc355822f0d9623b ("perf parse-events: Move slots only with topdown")
    Reviewed-by: Ian Rogers <irogers@xxxxxxxxxx>
    Signed-off-by: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>
    Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
    Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
    Cc: Ian Rogers <irogers@xxxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxxxxx>
    Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
    Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Xing Zhengjun <zhengjun.xing@xxxxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20220518143900.1493980-4-kan.liang@xxxxxxxxxxxxxxx
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/perf/arch/x86/util/evlist.c b/tools/perf/arch/x86/util/evlist.c
index cfc208d71f00..75564a7df15b 100644
--- a/tools/perf/arch/x86/util/evlist.c
+++ b/tools/perf/arch/x86/util/evlist.c
@@ -36,7 +36,7 @@ struct evsel *arch_evlist__leader(struct list_head *list)
 				if (slots == first)
 					return first;
 			}
-			if (!strncasecmp(evsel->name, "topdown", 7))
+			if (strcasestr(evsel->name, "topdown"))
 				has_topdown = true;
 			if (slots && has_topdown)
 				return slots;