From b7a1a48d78e17a1d974d0c75e2db41989795934e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 6 Jun 2022 19:10:02 +0200 Subject: [PATCH] 5.18-stable patches added patches: kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch media-lirc-add-missing-exceptions-for-lirc-uapi-header-file.patch perf-evlist-extend-arch_evsel__must_be_in_group-to-support-hybrid-systems.patch --- ..._stress.sh-work-if-run-interactively.patch | 29 +++++++++++ ...exceptions-for-lirc-uapi-header-file.patch | 37 ++++++++++++++ ...e_in_group-to-support-hybrid-systems.patch | 51 +++++++++++++++++++ queue-5.18/series | 3 ++ 4 files changed, 120 insertions(+) create mode 100644 queue-5.18/kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch create mode 100644 queue-5.18/media-lirc-add-missing-exceptions-for-lirc-uapi-header-file.patch create mode 100644 queue-5.18/perf-evlist-extend-arch_evsel__must_be_in_group-to-support-hybrid-systems.patch diff --git a/queue-5.18/kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch b/queue-5.18/kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch new file mode 100644 index 00000000000..b49a948658e --- /dev/null +++ b/queue-5.18/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.18/media-lirc-add-missing-exceptions-for-lirc-uapi-header-file.patch b/queue-5.18/media-lirc-add-missing-exceptions-for-lirc-uapi-header-file.patch new file mode 100644 index 00000000000..2fe1de803eb --- /dev/null +++ b/queue-5.18/media-lirc-add-missing-exceptions-for-lirc-uapi-header-file.patch @@ -0,0 +1,37 @@ +From b1c8312c6bd70e2c41f96183936fdb6f4f07cc0e Mon Sep 17 00:00:00 2001 +From: Sean Young +Date: Thu, 26 May 2022 08:59:40 +0100 +Subject: media: lirc: add missing exceptions for lirc uapi header file + +From: Sean Young + +commit b1c8312c6bd70e2c41f96183936fdb6f4f07cc0e upstream. + +Commit e5499dd7253c ("media: lirc: revert removal of unused feature +flags") reintroduced unused feature flags in the lirc uapi header, but +failed to reintroduce the necessary exceptions for the docs. + +Fixes: e5499dd7253c ("media: lirc: revert removal of unused feature flags") +Signed-off-by: Sean Young +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + Documentation/userspace-api/media/lirc.h.rst.exceptions | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Documentation/userspace-api/media/lirc.h.rst.exceptions b/Documentation/userspace-api/media/lirc.h.rst.exceptions +index 913d17b49831..1aeb7d7afe13 100644 +--- a/Documentation/userspace-api/media/lirc.h.rst.exceptions ++++ b/Documentation/userspace-api/media/lirc.h.rst.exceptions +@@ -30,6 +30,8 @@ ignore define LIRC_CAN_REC + + ignore define LIRC_CAN_SEND_MASK + ignore define LIRC_CAN_REC_MASK ++ignore define LIRC_CAN_SET_REC_FILTER ++ignore define LIRC_CAN_NOTIFY_DECODE + + # Obsolete ioctls + +-- +2.36.1 + diff --git a/queue-5.18/perf-evlist-extend-arch_evsel__must_be_in_group-to-support-hybrid-systems.patch b/queue-5.18/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.18/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.18/series b/queue-5.18/series index c22529b5079..70d84274869 100644 --- a/queue-5.18/series +++ b/queue-5.18/series @@ -861,3 +861,6 @@ 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 +media-lirc-add-missing-exceptions-for-lirc-uapi-header-file.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 -- 2.47.3