]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.1-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Feb 2026 12:45:39 +0000 (13:45 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Feb 2026 12:45:39 +0000 (13:45 +0100)
added patches:
cpuset-fix-missing-adaptation-for-cpuset_is_populated.patch

queue-6.1/cpuset-fix-missing-adaptation-for-cpuset_is_populated.patch [new file with mode: 0644]
queue-6.1/series

diff --git a/queue-6.1/cpuset-fix-missing-adaptation-for-cpuset_is_populated.patch b/queue-6.1/cpuset-fix-missing-adaptation-for-cpuset_is_populated.patch
new file mode 100644 (file)
index 0000000..ab192a3
--- /dev/null
@@ -0,0 +1,40 @@
+From chenridong@huaweicloud.com  Tue Feb 17 13:36:53 2026
+From: Chen Ridong <chenridong@huaweicloud.com>
+Date: Wed, 14 Jan 2026 01:51:29 +0000
+Subject: cpuset: Fix missing adaptation for cpuset_is_populated
+To: gregkh@linuxfoundation.org
+Cc: stable@vger.kernel.org, chenridong@huaweicloud.com, lujialin4@huawei.com
+Message-ID: <20260114015129.1156361-1-chenridong@huaweicloud.com>
+
+From: Chen Ridong <chenridong@huawei.com>
+
+Commit b1bcaed1e39a ("cpuset: Treat cpusets in attaching as populated")
+was backported to the long‑term support (LTS) branches. However, because
+commit d5cf4d34a333 ("cgroup/cpuset: Don't track # of local child
+partitions") was not backported, a corresponding adaptation to the
+backported code is still required.
+
+To ensure correct behavior, replace cgroup_is_populated with
+cpuset_is_populated in the partition_is_populated function.
+
+Cc: stable@vger.kernel.org     # 6.1+
+Fixes: b1bcaed1e39a ("cpuset: Treat cpusets in attaching as populated")
+Cc: Waiman Long <longman@redhat.com>
+Cc: Tejun Heo <tj@kernel.org>
+Signed-off-by: Chen Ridong <chenridong@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/cgroup/cpuset.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/cgroup/cpuset.c
++++ b/kernel/cgroup/cpuset.c
+@@ -509,7 +509,7 @@ static inline bool partition_is_populate
+           cs->attach_in_progress)
+               return true;
+       if (!excluded_child && !cs->nr_subparts_cpus)
+-              return cgroup_is_populated(cs->css.cgroup);
++              return cpuset_is_populated(cs);
+       rcu_read_lock();
+       cpuset_for_each_descendant_pre(cp, pos_css, cs) {
index cb14d800bc6ad12414a1758dab973fac27ee6b5c..0869cf4cc9eda9d603e70a8f482a1c51618cbd71 100644 (file)
@@ -54,3 +54,4 @@ net-stmmac-fix-accessing-freed-irq-affinity_hint.patch
 net-dsa-free-routing-table-on-probe-failure.patch
 mptcp-fix-race-in-mptcp_pm_nl_flush_addrs_doit.patch
 wifi-cfg80211-add-missing-lock-in-cfg80211_check_and_end_cac.patch
+cpuset-fix-missing-adaptation-for-cpuset_is_populated.patch