mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Waiman Long <longman@redhat.com>
To: "Guopeng Zhang" <guopeng.zhang@linux.dev>,
	"Ridong Chen" <ridong.chen@linux.dev>,
	"Tejun Heo" <tj@kernel.org>,
	"Johannes Weiner" <hannes@cmpxchg.org>,
	"Michal Koutný" <mkoutny@suse.com>,
	"Shuah Khan" <shuah@kernel.org>
Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-kselftest@vger.kernel.org, Hui Peng <benquike@gmail.com>
Subject: Re: [PATCH-next v2 1/6] cgroup/cpuset: Consolidate isolated_cpus_can_update() into prstate_housekeeping_conflict()
Date: Tue, 13 Oct 2026 14:59:50 -0400	[thread overview]
Message-ID: <37481345-f80b-4b28-8519-15c396fc7942@redhat.com> (raw)
In-Reply-To: <7ec04fe0-994e-44d3-8c20-6732c9f20afd@linux.dev>


On 10/11/26 1:49 AM, Guopeng Zhang wrote:
> Hi,Longman,
> 在 2026/10/11 06:19, Waiman Long 写道:
>> The isolated_cpus_can_update() and prstate_housekeeping_conflict() are
>> checking different aspects of upcoming cpumask changes that may conflict
>> with the current setting of the housekeeping cpumasks. There are places
>> where both are called together. There are also places where only one
>> of them is called. That inconsistency can contribute to missing check
>> where invalid cpumask changes may be allowed to move forward.
>>
>> Fix that by consolidating isolated_cpus_can_update() into
>> prstate_housekeeping_conflict() and call prstate_housekeeping_conflict()
>> in all the places where either one of them or both are called. The
>> exception is the validate_partition() function where the
>> prstate_housekeeping_conflict() call is removed. It is because
>> validate_partition() is called only from partition_cpus_change()
>> where prstate_housekeeping_conflict() will be called from either
>> remote_cpus_update() or update_parent_effective_cpumask() with
>> partcmd_update if not for partition invalidatation or disablement.
>>
>> Now prstate_housekeeping_conflict() will be called in the following
>> locations:
>>   - when a partition is enabled in remote_partition_enable() or in
>>     update_parent_effective_cpumask() with partcmd_enable*.
>>   - when a cpumask is updated in remote_cpus_update() or in
>>     update_parent_effective_cpumask() with partcmd_update.
>>   - when a partition state changes from root to isolated or vice versa
>>     in update_prstate().
>>
>> Fixes: 4a74e418881f ("cgroup/cpuset: Check partition conflict with housekeeping setup")
>> Fixes: 103b08709e8a ("cgroup/cpuset: Fail if isolated and nohz_full don't leave any housekeeping")
>> Signed-off-by: Waiman Long <longman@redhat.com>
>> ---
>>   kernel/cgroup/cpuset.c | 123 +++++++++++++++++------------------------
>>   1 file changed, 52 insertions(+), 71 deletions(-)
>>
>> diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
>> index 0ebba2d646c3..f3cebb277a68 100644
>> --- a/kernel/cgroup/cpuset.c
>> +++ b/kernel/cgroup/cpuset.c
>> @@ -1353,65 +1353,62 @@ static void partition_xcpus_del(int old_prs, struct cpuset *parent,
>>   }
>>   
>>   /*
>> - * isolated_cpus_can_update - check for isolated & nohz_full conflicts
>> - * @add_cpus: cpu mask for cpus that are going to be isolated
>> - * @del_cpus: cpu mask for cpus that are no longer isolated, can be NULL
>> - * Return: false if there is conflict, true otherwise
>> - *
>> - * If nohz_full is enabled and we have isolated CPUs, their combination must
>> - * still leave housekeeping CPUs.
>> + * prstate_housekeeping_conflict - check for partition & housekeeping conflicts
>> + * @new_prs: new partition root state to be checked
>> + * @parent_prs: Parent partition root state
>> + * @add_cpus: additional CPUs to be added to current cpuset
>> + * @del_cpus: CPUs to be removed from current cpuset, can be NULL
>> + * Return: true if there is conflict, false otherwise
>>    *
>> - * TBD: Should consider merging this function into
>> - *      prstate_housekeeping_conflict().
>> + * There are two different housekeeping conflicts to be checked:
>> + * 1) If new_prs is PRS_ROOT, none of the @add_cpus can be a boot-time isolated
>> + *    CPU. IOW, the whole @add_cpus must be a subset of HK_TYPE_DOMAIN_BOOT.
>> + * 2) If nohz_full is enabled and we have isolated CPUs, their combination must
>> + *    still leave housekeeping CPUs. This check is only needed if new_prs
>> + *    differs from parent_prs and one of them is PRS_ISOLATED.
>>    */
>> -static bool isolated_cpus_can_update(struct cpumask *add_cpus,
>> -				     struct cpumask *del_cpus)
>> +static bool prstate_housekeeping_conflict(int new_prs, int parent_prs,
>> +					  struct cpumask *add_cpus,
>> +					  struct cpumask *del_cpus)
>>   {
>>   	cpumask_var_t full_hk_cpus;
>> -	int res = true;
>> +	int res;
>>   
>> -	if (!housekeeping_enabled(HK_TYPE_KERNEL_NOISE))
>> +	if (housekeeping_enabled(HK_TYPE_DOMAIN_BOOT) && (new_prs == PRS_ROOT) &&
>> +	    !cpumask_subset(add_cpus, housekeeping_cpumask(HK_TYPE_DOMAIN_BOOT)))
>>   		return true;
>>   
>> -	if (del_cpus && cpumask_weight_and(del_cpus,
>> -			housekeeping_cpumask(HK_TYPE_KERNEL_NOISE)))
>> -		return true;
>> +	if (!housekeeping_enabled(HK_TYPE_KERNEL_NOISE) ||
>> +	    (new_prs == parent_prs) ||
>> +	    (!del_cpus && (new_prs != PRS_ISOLATED)) ||
>> +	    ((new_prs != PRS_ISOLATED) && (parent_prs != PRS_ISOLATED)))
>> +		return false;
>>   
> When a child partition switches from root to isolated under an isolated
> parent, this returns false even though the child's CPUs were not isolated
> before the switch.
>
> On a fresh boot with CPUs 0-15 online and nohz_full=2-15:
>
>      # cd /sys/fs/cgroup
>      # echo +cpuset > cgroup.subtree_control
>      # mkdir A B
>      # echo 1-2 > A/cpuset.cpus
>      # echo isolated > A/cpuset.cpus.partition
>      # echo +cpuset > A/cgroup.subtree_control
>      # mkdir A/C
>      # echo 1 > A/C/cpuset.cpus
>      # echo root > A/C/cpuset.cpus.partition
>      # echo 0 > B/cpuset.cpus
>      # echo isolated > B/cpuset.cpus.partition
>      # cat cpuset.cpus.isolated
>      0,2
>      # echo isolated > A/C/cpuset.cpus.partition
>      # cat A/C/cpuset.cpus.partition
>      isolated
>      # cat cpuset.cpus.isolated
>      0-2
>
> CPU 1 was the last remaining housekeeping CPU: it was in neither the
> nohz_full mask nor the cpuset.cpus.isolated mask. The final write isolates
> CPU 1 as well, leaving no housekeeping CPU.
>
> Should this check also take the child's previous partition state into
> account, rather than just comparing its new state with the parent's state?

This is actually a problem that is hard to fix without introducing a lot 
of complexity. After spending a day or so trying to find a possible fix 
from 2 different perspectives, I realize that either one will introduce 
quite a lot of complexity into the existing cpuset partition code. When 
looking at it again from a higher level, I think we may have allowed too 
much freedom to create a complicated nested partition hierarchy. If we 
simply don't allow the creation of root partition under an isolated 
partition parent, this problem will not exist. It is indeed a new 
limitation imposed on the existing cpuset partition functionality, but 
it is a simple solution and I don't believe there is a real use case in 
the creation of a root partition under isolated partition. Please 
correct me if my use case assumption is wrong.

Thanks,
Longman


  reply	other threads:[~2026-10-13 19:00 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-10 22:19 [PATCH-next v2 0/6] cgroup/cpuset: Fix various housekeeping check problems Waiman Long
2026-10-10 22:19 ` [PATCH-next v2 1/6] cgroup/cpuset: Consolidate isolated_cpus_can_update() into prstate_housekeeping_conflict() Waiman Long
2026-10-11  2:02   ` Ridong Chen
2026-10-11  5:49   ` Guopeng Zhang
2026-10-13 18:59     ` Waiman Long [this message]
2026-10-14  6:58       ` Guopeng Zhang
2026-10-14 13:29         ` Waiman Long
2026-10-10 22:19 ` [PATCH-next v2 2/6] cgroup/cpuset: Consider all the exclusive CPUs when doing housekeeping check Waiman Long
2026-10-11  8:34   ` Guopeng Zhang
2026-10-14 14:02     ` Waiman Long
2026-10-10 22:19 ` [PATCH-next v2 3/6] cgroup/cpuset: Do housekeeping check before converting invalid partition to valid Waiman Long
2026-10-11  2:06   ` Ridong Chen
2026-10-11  6:04   ` Guopeng Zhang
2026-10-10 22:19 ` [PATCH-next v2 4/6] cgroup/cpuset: Properly disabling partition when partition state switching fails Waiman Long
2026-10-11  6:05   ` Guopeng Zhang
2026-10-10 22:19 ` [PATCH-next v2 5/6] selftests/cgroup: Add tests for housekeeping check Waiman Long
2026-10-11  8:48   ` Guopeng Zhang
2026-10-14 14:02     ` Waiman Long
2026-10-10 22:19 ` [PATCH-next v2 6/6] selftests/cgroup: Skip test_cpuset_prs.sh test if some required CPUs are offline Waiman Long
2026-10-11  9:00   ` Guopeng Zhang
2026-10-13 22:43     ` Waiman Long

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=37481345-f80b-4b28-8519-15c396fc7942@redhat.com \
    --to=longman@redhat.com \
    --cc=benquike@gmail.com \
    --cc=cgroups@vger.kernel.org \
    --cc=guopeng.zhang@linux.dev \
    --cc=hannes@cmpxchg.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=mkoutny@suse.com \
    --cc=ridong.chen@linux.dev \
    --cc=shuah@kernel.org \
    --cc=tj@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®