From: Greg Kroah-Hartman Date: Mon, 7 Feb 2022 08:25:56 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v4.9.300~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=980f5fc21677c63874501af0767b9ac69ec3395f;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-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 --- diff --git a/queue-5.10/cgroup-cpuset-fix-suspicious-rcu-usage-lockdep-warning.patch b/queue-5.10/cgroup-cpuset-fix-suspicious-rcu-usage-lockdep-warning.patch new file mode 100644 index 00000000000..f1d1ec00b7d --- /dev/null +++ b/queue-5.10/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 +@@ -1481,10 +1481,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) { +@@ -1492,8 +1497,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.10/net-dsa-mt7530-make-net_dsa_mt7530-select-mediatek_ge_phy.patch b/queue-5.10/net-dsa-mt7530-make-net_dsa_mt7530-select-mediatek_ge_phy.patch new file mode 100644 index 00000000000..53fffe32416 --- /dev/null +++ b/queue-5.10/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_MT7530 + tristate "MediaTek MT753x and MT7621 Ethernet switch support" + depends on NET_DSA + 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.10/series b/queue-5.10/series index 84c49a54869..55aab29f9e4 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -69,3 +69,5 @@ 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