Re: [PATCH] cgroup/cpuset: Properly disable partition when partition state switching fails
From: Waiman Long
Date: Tue Sep 29 2026 - 11:50:51 EST
On 9/29/26 3:40 AM, Guopeng Zhang wrote:
Hi Waiman, Tejun,
在 2026/9/29 11:16, Waiman Long 写道:
On 9/28/26 10:07 PM, Tejun Heo wrote:However, after the parent is created, the ownership of full housekeeping
Hello, Waiman.Commit b1034a690129 ("cgroup/cpuset: Ensure domain isolated CPUs stay in root or isolated partition") comes after 103b08709e8a. From my point of view, the first commit is the one that introduces the bug. The second commit comes along assuming the existing code is right. That is why I didn't tag the second one even though the second one is easier to trigger than the first one.
The following is a Claude-generated review.
On Mon, Sep 28, 2026 at 07:51:59PM -0400, Waiman Long wrote:
Before commit 103b08709e8a ("cgroup/cpuset: Fail if isolated and nohz_fullThe isolated -> root failure came from b1034a690129 ("cgroup/cpuset:
don't leave any housekeeping"), the partition state can be freely switched
from "root" to "isolated" and vice versa. After that commit, the switch
from "root" to "isolated" can fail if it exhausts all the housekeeping
CPUs. Later on, the switch from "isolated" to "root" can also fail if
some of the partition CPUs are boot-time isolated by "isolcpus".
Ensure domain isolated CPUs stay in root or isolated partition"). Maybe
add a Fixes: tag for it too?
OK, will update the commit log.The partition is made invalid when the switch fails. However, theThe reproducer below is a local partition and the fix covers that case
remote_partition flag for a remote partition can remain set and the CPUs
from the invalidated partition aren't cleared from subpartitions_cpus.
Fix this by properly disable the partition in this case.
too. The CPUs weren't given back to the parent, which is what leaves them
in subpartitions_cpus and isolated_cpus in the example. Maybe describe
both? Also, "properly disable" -> "disabling".
Yes, I can drop this part.In the case of remote_partition flag, it should be cleared for aAfter the update_prstate() change, every path that invalidates a remote
invalidated remote partition. To be safe, the reset_partition_data() is
now enhanced to always clear the remote_partition flag. So there is no
need to explicitly clear remote_partition in remote_partition_disable().
partition goes through remote_partition_disable(), so the other
reset_partition_data() callers never see the flag set. If one did,
clearing only the flag would leave its CPUs in subpartitions_cpus and turn
the WARN_ON_ONCE() in partition_xcpus_del() into a silent leak. Maybe drop
this part?
If the parent is a valid isolated partition before the child partition is created, it had passed the isolated_cpus_can_update() check. So returning the CPUs back to its parent is fine.On a x86 test system with boot option "isolcpus=10 cgroup_debug" set"a x86" -> "an x86", "commands was" -> "commands were".
and more than 16 cores, the following commands was executed after boot.
@@ -2946,27 +2947,32 @@ static int update_prstate(struct cpuset *cs, int new_prs)If a root -> isolated switch fails isolated_cpus_can_update() under an
*/
if (((new_prs == PRS_ISOLATED) &&
!isolated_cpus_can_update(cs->effective_xcpus, NULL)) ||
- prstate_housekeeping_conflict(new_prs, cs->effective_xcpus))
+ prstate_housekeeping_conflict(new_prs, cs->effective_xcpus)) {
err = PERR_HKEEPING;
- else
+ disable_partition = true;
isolated parent, partcmd_disable hands the CPUs back to the parent and
partition_xcpus_del() adds them to isolated_cpus, which is the state the
check just rejected. Switching to member ends up in the same place, so
this may be fine as is.
CPUs can still change, so passing the check at creation time doesn't seem
to guarantee that returning CPUs later is still safe.
With additional thought after my email, I realized that my statement isn't quite correct. So invalidating the partition handing the CPUs back to its rightful parent may not be right. A simpler way to handle this is to keep the status quo and return an error to the users instead.
Cheers,
Longman
I tested with this patch applied on a 32 vCPU VM booted with:
nohz_full=1,3 maxcpus=4
CPUs 0-3 are online, and CPU0 and CPU2 are initially available as full
housekeeping CPUs:
cd /sys/fs/cgroup
echo +cpuset > cgroup.subtree_control
mkdir A C
echo +cpuset > A/cgroup.subtree_control
mkdir A/B
echo 0-1 > A/cpuset.cpus
echo isolated > A/cpuset.cpus.partition # isolated={0,1}, full HK={2}
echo 0 > A/B/cpuset.cpus
echo root > A/B/cpuset.cpus.partition # isolated={1}, full HK={0,2}
echo 2 > C/cpuset.cpus
echo isolated > C/cpuset.cpus.partition # isolated={1,2}, full HK={0}
At this point, CPU0 is the last CPU that is neither domain-isolated nor in
nohz_full. Then:
echo isolated > A/B/cpuset.cpus.partition
cat A/B/cpuset.cpus.partition
isolated invalid (partition config conflicts with housekeeping setup)
cat cpuset.cpus.isolated
0-2
The root -> isolated switch of A/B is rejected as expected, but the new
disable path then hands CPU0 back to the isolated parent A, and
partition_xcpus_del() puts it right back into isolated_cpus.
In the end the domain-isolated CPUs are {0,1,2} and the nohz_full CPUs are
{1,3}, so no full housekeeping CPU is left.
Also, as Tejun pointed out, switching A/B to member leads to the same
problem. What I tried in patches 2-3 of [1] was: if returning CPUs to an
isolated parent would consume the last full housekeeping CPU, invalidate
the outermost isolated ancestor and return its CPUs instead. Maybe this
part can serve as a reference. The implementation there may not be good
enough - it was an earlier idea and I am not sure whether it helps :)
[1] https://lore.kernel.org/all/20260910094546.5852-1-guopeng.zhang@xxxxxxxxx/
Thanks,
Guopeng