This is a note to let you know that I've just added the patch titled perf evlist: Extend arch_evsel__must_be_in_group to support hybrid systems to the 5.17-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-evlist-extend-arch_evsel__must_be_in_group-to-support-hybrid-systems.patch and it can be found in the queue-5.17 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From e69a5c010246ca6a87c4e6f13d0a291954bdece8 Mon Sep 17 00:00:00 2001 From: Zhengjun Xing <zhengjun.xing@xxxxxxxxxxxxxxx> Date: Wed, 1 Jun 2022 23:25:44 +0800 Subject: perf evlist: Extend arch_evsel__must_be_in_group to support hybrid systems From: Zhengjun Xing <zhengjun.xing@xxxxxxxxxxxxxxx> commit e69a5c010246ca6a87c4e6f13d0a291954bdece8 upstream. For the hybrid system, the "slots" event changes to "cpu_core/slots/", need extend API arch_evsel__must_be_in_group() to support hybrid systems. In the origin code, for hybrid system event "cpu_core/slots/", the output of the API arch_evsel__must_be_in_group() is "false" (in fact,it should be "true"). Currently only one API evsel__remove_from_group() calls it. In evsel__remove_from_group(), it adds the second condition to check, so the output of evsel__remove_from_group() still is correct. That's the reason why there isn't an instant error. I'd like to fix the issue found in API arch_evsel__must_be_in_group() in case someone else using the function in the other place. Fixes: d98079c05b5a ("perf evlist: Keep topdown counters in weak group") Signed-off-by: Zhengjun Xing <zhengjun.xing@xxxxxxxxxxxxxxx> Reviewed-by: Kan Liang <kan.liang@xxxxxxxxxxxxxxx> Acked-by: Ian Rogers <irogers@xxxxxxxxxx> Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> Link: https://lore.kernel.org/r/20220601152544.1842447-1-zhengjun.xing@xxxxxxxxxxxxxxx Cc: peterz@xxxxxxxxxxxxx Cc: adrian.hunter@xxxxxxxxx Cc: alexander.shishkin@xxxxxxxxx Cc: acme@xxxxxxxxxx Cc: ak@xxxxxxxxxxxxxxx Cc: jolsa@xxxxxxxxxx Cc: mingo@xxxxxxxxxx Cc: linux-kernel@xxxxxxxxxxxxxxx Cc: linux-perf-users@xxxxxxxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- tools/perf/arch/x86/util/evsel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/tools/perf/arch/x86/util/evsel.c +++ b/tools/perf/arch/x86/util/evsel.c @@ -38,6 +38,6 @@ bool arch_evsel__must_be_in_group(const return false; return evsel->name && - (!strcasecmp(evsel->name, "slots") || + (strcasestr(evsel->name, "slots") || strcasestr(evsel->name, "topdown")); } Patches currently in stable-queue which might be from zhengjun.xing@xxxxxxxxxxxxxxx are queue-5.17/perf-jevents-fix-event-syntax-error-caused-by-extsel.patch queue-5.17/perf-evlist-keep-topdown-counters-in-weak-group.patch queue-5.17/perf-evlist-extend-arch_evsel__must_be_in_group-to-support-hybrid-systems.patch queue-5.17/perf-parse-events-support-different-format-of-the-to.patch queue-5.17/perf-stat-always-keep-perf-metrics-topdown-events-in.patch