From: Greg Kroah-Hartman Date: Mon, 7 Feb 2022 08:26:12 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v4.9.300~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2c2e5ea29fb700d2f85663b565630bde5ebf121;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: cgroup-cpuset-fix-suspicious-rcu-usage-lockdep-warning.patch net-dsa-mt7530-make-net_dsa_mt7530-select-mediatek_ge_phy.patch tools-include-uapi-sync-sound-asound.h-copy-with-the-kernel-sources.patch --- diff --git a/queue-5.15/cgroup-cpuset-fix-suspicious-rcu-usage-lockdep-warning.patch b/queue-5.15/cgroup-cpuset-fix-suspicious-rcu-usage-lockdep-warning.patch new file mode 100644 index 00000000000..0cc75d95bff --- /dev/null +++ b/queue-5.15/cgroup-cpuset-fix-suspicious-rcu-usage-lockdep-warning.patch @@ -0,0 +1,60 @@ +From 2bdfd2825c9662463371e6691b1a794e97fa36b4 Mon Sep 17 00:00:00 2001 +From: Waiman Long +Date: Wed, 2 Feb 2022 22:31:03 -0500 +Subject: cgroup/cpuset: Fix "suspicious RCU usage" lockdep warning + +From: Waiman Long + +commit 2bdfd2825c9662463371e6691b1a794e97fa36b4 upstream. + +It was found that a "suspicious RCU usage" lockdep warning was issued +with the rcu_read_lock() call in update_sibling_cpumasks(). It is +because the update_cpumasks_hier() function may sleep. So we have +to release the RCU lock, call update_cpumasks_hier() and reacquire +it afterward. + +Also add a percpu_rwsem_assert_held() in update_sibling_cpumasks() +instead of stating that in the comment. + +Fixes: 4716909cc5c5 ("cpuset: Track cpusets that use parent's effective_cpus") +Signed-off-by: Waiman Long +Tested-by: Phil Auld +Reviewed-by: Phil Auld +Signed-off-by: Tejun Heo +Signed-off-by: Greg Kroah-Hartman +--- + kernel/cgroup/cpuset.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/kernel/cgroup/cpuset.c ++++ b/kernel/cgroup/cpuset.c +@@ -1512,10 +1512,15 @@ static void update_sibling_cpumasks(stru + struct cpuset *sibling; + struct cgroup_subsys_state *pos_css; + ++ percpu_rwsem_assert_held(&cpuset_rwsem); ++ + /* + * Check all its siblings and call update_cpumasks_hier() + * if their use_parent_ecpus flag is set in order for them + * to use the right effective_cpus value. ++ * ++ * The update_cpumasks_hier() function may sleep. So we have to ++ * release the RCU read lock before calling it. + */ + rcu_read_lock(); + cpuset_for_each_child(sibling, pos_css, parent) { +@@ -1523,8 +1528,13 @@ static void update_sibling_cpumasks(stru + continue; + if (!sibling->use_parent_ecpus) + continue; ++ if (!css_tryget_online(&sibling->css)) ++ continue; + ++ rcu_read_unlock(); + update_cpumasks_hier(sibling, tmp); ++ rcu_read_lock(); ++ css_put(&sibling->css); + } + rcu_read_unlock(); + } diff --git a/queue-5.15/net-dsa-mt7530-make-net_dsa_mt7530-select-mediatek_ge_phy.patch b/queue-5.15/net-dsa-mt7530-make-net_dsa_mt7530-select-mediatek_ge_phy.patch new file mode 100644 index 00000000000..f951f8e2bbf --- /dev/null +++ b/queue-5.15/net-dsa-mt7530-make-net_dsa_mt7530-select-mediatek_ge_phy.patch @@ -0,0 +1,39 @@ +From 4223f86512877b04c932e7203648b37eec931731 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= +Date: Sat, 29 Jan 2022 09:27:04 +0300 +Subject: net: dsa: mt7530: make NET_DSA_MT7530 select MEDIATEK_GE_PHY +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Arınç ÜNAL + +commit 4223f86512877b04c932e7203648b37eec931731 upstream. + +Make MediaTek MT753x DSA driver enable MediaTek Gigabit PHYs driver to +properly control MT7530 and MT7531 switch PHYs. + +A noticeable change is that the behaviour of switchport interfaces going +up-down-up-down is no longer there. + +Fixes: b8f126a8d543 ("net-next: dsa: add dsa support for Mediatek MT7530 switch") +Signed-off-by: Arınç ÜNAL +Reviewed-by: Andrew Lunn +Reviewed-by: Florian Fainelli +Link: https://lore.kernel.org/r/20220129062703.595-1-arinc.unal@arinc9.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/dsa/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/dsa/Kconfig ++++ b/drivers/net/dsa/Kconfig +@@ -36,6 +36,7 @@ config NET_DSA_LANTIQ_GSWIP + config NET_DSA_MT7530 + tristate "MediaTek MT753x and MT7621 Ethernet switch support" + select NET_DSA_TAG_MTK ++ select MEDIATEK_GE_PHY + help + This enables support for the MediaTek MT7530, MT7531, and MT7621 + Ethernet switch chips. diff --git a/queue-5.15/series b/queue-5.15/series index a3401b8f427..d4050e062b1 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -101,3 +101,6 @@ ext4-modify-the-logic-of-ext4_mb_new_blocks_simple.patch ext4-fix-error-handling-in-ext4_restore_inline_data.patch ext4-fix-error-handling-in-ext4_fc_record_modified_inode.patch ext4-fix-incorrect-type-issue-during-replay_del_range.patch +net-dsa-mt7530-make-net_dsa_mt7530-select-mediatek_ge_phy.patch +cgroup-cpuset-fix-suspicious-rcu-usage-lockdep-warning.patch +tools-include-uapi-sync-sound-asound.h-copy-with-the-kernel-sources.patch diff --git a/queue-5.15/tools-include-uapi-sync-sound-asound.h-copy-with-the-kernel-sources.patch b/queue-5.15/tools-include-uapi-sync-sound-asound.h-copy-with-the-kernel-sources.patch new file mode 100644 index 00000000000..23f1302459a --- /dev/null +++ b/queue-5.15/tools-include-uapi-sync-sound-asound.h-copy-with-the-kernel-sources.patch @@ -0,0 +1,45 @@ +From 4f2492731ada9d702ffdfaa6ec1ff64820a1664c Mon Sep 17 00:00:00 2001 +From: Arnaldo Carvalho de Melo +Date: Wed, 12 Feb 2020 11:04:23 -0300 +Subject: tools include UAPI: Sync sound/asound.h copy with the kernel sources + +From: Arnaldo Carvalho de Melo + +commit 4f2492731ada9d702ffdfaa6ec1ff64820a1664c upstream. + +Picking the changes from: + + 06feec6005c9d950 ("ASoC: hdmi-codec: Fix OOB memory accesses") + +Which entails no changes in the tooling side as it doesn't introduce new +SNDRV_PCM_IOCTL_ ioctls. + +To silence this perf tools build warning: + + Warning: Kernel ABI header at 'tools/include/uapi/sound/asound.h' differs from latest version at 'include/uapi/sound/asound.h' + diff -u tools/include/uapi/sound/asound.h include/uapi/sound/asound.h + +Cc: Dmitry Osipenko +Cc: Mark Brown +Cc: Takashi Iwai +Link: https://lore.kernel.org/lkml/Yf+6OT+2eMrYDEeX@kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Greg Kroah-Hartman +--- + tools/include/uapi/sound/asound.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/tools/include/uapi/sound/asound.h ++++ b/tools/include/uapi/sound/asound.h +@@ -56,8 +56,10 @@ + * * + ****************************************************************************/ + ++#define AES_IEC958_STATUS_SIZE 24 ++ + struct snd_aes_iec958 { +- unsigned char status[24]; /* AES/IEC958 channel status bits */ ++ unsigned char status[AES_IEC958_STATUS_SIZE]; /* AES/IEC958 channel status bits */ + unsigned char subcode[147]; /* AES/IEC958 subcode bits */ + unsigned char pad; /* nothing */ + unsigned char dig_subframe[4]; /* AES/IEC958 subframe bits */