From: Greg Kroah-Hartman Date: Mon, 6 Jun 2022 17:09:55 +0000 (+0200) Subject: 5.17-stable patches X-Git-Tag: v5.10.121~56 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=444957491cf17169b07f108589fb376652f49053;p=thirdparty%2Fkernel%2Fstable-queue.git 5.17-stable patches added patches: kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch perf-evlist-extend-arch_evsel__must_be_in_group-to-support-hybrid-systems.patch --- diff --git a/queue-5.17/kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch b/queue-5.17/kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch new file mode 100644 index 00000000000..b49a948658e --- /dev/null +++ b/queue-5.17/kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch @@ -0,0 +1,29 @@ +From 213adc63dfbcdff9a0c19ec1f2681fda9c05cf6d Mon Sep 17 00:00:00 2001 +From: Waiman Long +Date: Fri, 13 May 2022 15:09:28 -0400 +Subject: kseltest/cgroup: Make test_stress.sh work if run interactively + +From: Waiman Long + +commit 213adc63dfbcdff9a0c19ec1f2681fda9c05cf6d upstream. + +Commit 54de76c01239 ("kselftest/cgroup: fix test_stress.sh to use OUTPUT +dir") changes the test_core command path from . to $OUTPUT. However, +variable OUTPUT may not be defined if the command is run interactively. +Fix that by using ${OUTPUT:-.} to cover both cases. + +Signed-off-by: Waiman Long +Signed-off-by: Tejun Heo +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/cgroup/test_stress.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/cgroup/test_stress.sh ++++ b/tools/testing/selftests/cgroup/test_stress.sh +@@ -1,4 +1,4 @@ + #!/bin/bash + # SPDX-License-Identifier: GPL-2.0 + +-./with_stress.sh -s subsys -s fork ${OUTPUT}/test_core ++./with_stress.sh -s subsys -s fork ${OUTPUT:-.}/test_core diff --git a/queue-5.17/perf-evlist-extend-arch_evsel__must_be_in_group-to-support-hybrid-systems.patch b/queue-5.17/perf-evlist-extend-arch_evsel__must_be_in_group-to-support-hybrid-systems.patch new file mode 100644 index 00000000000..0fe837576eb --- /dev/null +++ b/queue-5.17/perf-evlist-extend-arch_evsel__must_be_in_group-to-support-hybrid-systems.patch @@ -0,0 +1,51 @@ +From e69a5c010246ca6a87c4e6f13d0a291954bdece8 Mon Sep 17 00:00:00 2001 +From: Zhengjun Xing +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 + +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 +Reviewed-by: Kan Liang +Acked-by: Ian Rogers +Signed-off-by: Arnaldo Carvalho de Melo +Link: https://lore.kernel.org/r/20220601152544.1842447-1-zhengjun.xing@linux.intel.com +Cc: peterz@infradead.org +Cc: adrian.hunter@intel.com +Cc: alexander.shishkin@intel.com +Cc: acme@kernel.org +Cc: ak@linux.intel.com +Cc: jolsa@redhat.com +Cc: mingo@redhat.com +Cc: linux-kernel@vger.kernel.org +Cc: linux-perf-users@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + 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")); + } diff --git a/queue-5.17/series b/queue-5.17/series index 7216d0659da..275db5d3acd 100644 --- a/queue-5.17/series +++ b/queue-5.17/series @@ -754,3 +754,5 @@ coresight-core-fix-coresight-device-probe-failure-issue.patch phy-qcom-qmp-fix-reset-controller-leak-on-probe-errors.patch net-ipa-fix-page-free-in-ipa_endpoint_trans_release.patch net-ipa-fix-page-free-in-ipa_endpoint_replenish_one.patch +kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch +perf-evlist-extend-arch_evsel__must_be_in_group-to-support-hybrid-systems.patch