5.15-stable patches

added patches:
	arm64-dts-imx8mq-fix-lcdif-port-node.patch
	perf-fix-list-corruption-in-perf_cgroup_switch.patch

diff --git a/queue-5.15/arm64-dts-imx8mq-fix-lcdif-port-node.patch b/queue-5.15/arm64-dts-imx8mq-fix-lcdif-port-node.patch
new file mode 100644 (file)
index 0000000..7542b7f
--- /dev/null
+++ b/queue-5.15/arm64-dts-imx8mq-fix-lcdif-port-node.patch
@@ -0,0 +1,35 @@
+From 91f6d5f181f6629dd74ab71759fe92d3f4eff966 Mon Sep 17 00:00:00 2001
+From: Alexander Stein <alexander.stein@ew.tq-group.com>
+Date: Sat, 29 Jan 2022 14:39:05 +0800
+Subject: arm64: dts: imx8mq: fix lcdif port node
+
+From: Alexander Stein <alexander.stein@ew.tq-group.com>
+
+commit 91f6d5f181f6629dd74ab71759fe92d3f4eff966 upstream.
+
+The port node does not have a unit-address, remove it.
+This fixes the warnings:
+lcd-controller@30320000: 'port' is a required property
+lcd-controller@30320000: 'port@0' does not match any of the regexes:
+'pinctrl-[0-9]+'
+
+Fixes: commit d0081bd02a03 ("arm64: dts: imx8mq: Add NWL MIPI DSI controller")
+Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
+Reviewed-by: Fabio Estevam <festevam@gmail.com>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/freescale/imx8mq.dtsi |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
++++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+@@ -526,7 +526,7 @@
+                               assigned-clock-rates = <0>, <0>, <0>, <594000000>;
+                               status = "disabled";
+ 
+-                              port@0 {
++                              port {
+                                       lcdif_mipi_dsi: endpoint {
+                                               remote-endpoint = <&mipi_dsi_lcdif_in>;
+                                       };

diff --git a/queue-5.15/perf-fix-list-corruption-in-perf_cgroup_switch.patch b/queue-5.15/perf-fix-list-corruption-in-perf_cgroup_switch.patch
new file mode 100644 (file)
index 0000000..750a380
--- /dev/null
+++ b/queue-5.15/perf-fix-list-corruption-in-perf_cgroup_switch.patch
@@ -0,0 +1,52 @@
+From 5f4e5ce638e6a490b976ade4a40017b40abb2da0 Mon Sep 17 00:00:00 2001
+From: Song Liu <song@kernel.org>
+Date: Thu, 3 Feb 2022 16:40:57 -0800
+Subject: perf: Fix list corruption in perf_cgroup_switch()
+
+From: Song Liu <song@kernel.org>
+
+commit 5f4e5ce638e6a490b976ade4a40017b40abb2da0 upstream.
+
+There's list corruption on cgrp_cpuctx_list. This happens on the
+following path:
+
+  perf_cgroup_switch: list_for_each_entry(cgrp_cpuctx_list)
+      cpu_ctx_sched_in
+         ctx_sched_in
+            ctx_pinned_sched_in
+              merge_sched_in
+                  perf_cgroup_event_disable: remove the event from the list
+
+Use list_for_each_entry_safe() to allow removing an entry during
+iteration.
+
+Fixes: 058fe1c0440e ("perf/core: Make cgroup switch visit only cpuctxs with cgroup events")
+Signed-off-by: Song Liu <song@kernel.org>
+Reviewed-by: Rik van Riel <riel@surriel.com>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Link: https://lkml.kernel.org/r/20220204004057.2961252-1-song@kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/events/core.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/kernel/events/core.c
++++ b/kernel/events/core.c
+@@ -839,7 +839,7 @@ static DEFINE_PER_CPU(struct list_head,
+  */
+ static void perf_cgroup_switch(struct task_struct *task, int mode)
+ {
+-      struct perf_cpu_context *cpuctx;
++      struct perf_cpu_context *cpuctx, *tmp;
+       struct list_head *list;
+       unsigned long flags;
+ 
+@@ -850,7 +850,7 @@ static void perf_cgroup_switch(struct ta
+       local_irq_save(flags);
+ 
+       list = this_cpu_ptr(&cgrp_cpuctx_list);
+-      list_for_each_entry(cpuctx, list, cgrp_cpuctx_entry) {
++      list_for_each_entry_safe(cpuctx, tmp, list, cgrp_cpuctx_entry) {
+               WARN_ON_ONCE(cpuctx->ctx.nr_cgroups == 0);
+ 
+               perf_ctx_lock(cpuctx, cpuctx->task_ctx);

diff --git a/queue-5.15/series b/queue-5.15/series
index 0941da1777c93ba546ad8c90a12279bcd50978f4..6f0e658f563569204970342143cd66ed0fa1e07d 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -167,3 +167,5 @@ makefile.extrawarn-move-wunaligned-access-to-w-1.patch
 scsi-lpfc-remove-nvme-support-if-kernel-has-nvme_fc-disabled.patch
 scsi-lpfc-reduce-log-messages-seen-after-firmware-download.patch
 mips-octeon-fix-missed-ptr-ptr_wd-conversion.patch
+arm64-dts-imx8mq-fix-lcdif-port-node.patch
+perf-fix-list-corruption-in-perf_cgroup_switch.patch