From 0e0efbe3574e7db016a6a2b8435a793d9f6456a0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 17 Feb 2026 13:45:39 +0100 Subject: [PATCH] 6.1-stable patches added patches: cpuset-fix-missing-adaptation-for-cpuset_is_populated.patch --- ...g-adaptation-for-cpuset_is_populated.patch | 40 +++++++++++++++++++ queue-6.1/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 queue-6.1/cpuset-fix-missing-adaptation-for-cpuset_is_populated.patch 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 index 0000000000..ab192a3120 --- /dev/null +++ b/queue-6.1/cpuset-fix-missing-adaptation-for-cpuset_is_populated.patch @@ -0,0 +1,40 @@ +From chenridong@huaweicloud.com Tue Feb 17 13:36:53 2026 +From: Chen Ridong +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 + +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 +Cc: Tejun Heo +Signed-off-by: Chen Ridong +Signed-off-by: Greg Kroah-Hartman +--- + 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) { diff --git a/queue-6.1/series b/queue-6.1/series index cb14d800bc..0869cf4cc9 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -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 -- 2.47.3