On 12/24/25 8:44 AM, Frederic Weisbecker wrote:
> boot_hk_cpus is an ad-hoc copy of HK_TYPE_DOMAIN_BOOT. Remove it and use
> the official version.
>
> Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
> Reviewed-by: Phil Auld <pauld@redhat.com>
> Reviewed-by: Chen Ridong <chenridong@huawei.com>
> ---
> kernel/cgroup/cpuset.c | 22 +++++++---------------
> 1 file changed, 7 insertions(+), 15 deletions(-)
>
> diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
> index 6e6eb09b8db6..3afa72f8d579 100644
> --- a/kernel/cgroup/cpuset.c
> +++ b/kernel/cgroup/cpuset.c
> @@ -88,12 +88,6 @@ static cpumask_var_t isolated_cpus;
> */
> static bool isolated_cpus_updating;
>
> -/*
> - * Housekeeping (HK_TYPE_DOMAIN) CPUs at boot
> - */
> -static cpumask_var_t boot_hk_cpus;
> -static bool have_boot_isolcpus;
> -
> /*
> * A flag to force sched domain rebuild at the end of an operation.
> * It can be set in
> @@ -1453,15 +1447,16 @@ static bool isolated_cpus_can_update(struct cpumask *add_cpus,
> * @new_cpus: cpu mask
> * Return: true if there is conflict, false otherwise
> *
> - * CPUs outside of boot_hk_cpus, if defined, can only be used in an
> + * CPUs outside of HK_TYPE_DOMAIN_BOOT, if defined, can only be used in an
> * isolated partition.
> */
> static bool prstate_housekeeping_conflict(int prstate, struct cpumask *new_cpus)
> {
> - if (!have_boot_isolcpus)
> + if (!housekeeping_enabled(HK_TYPE_DOMAIN_BOOT))
> return false;
>
> - if ((prstate != PRS_ISOLATED) && !cpumask_subset(new_cpus, boot_hk_cpus))
> + if ((prstate != PRS_ISOLATED) &&
> + !cpumask_subset(new_cpus, housekeeping_cpumask(HK_TYPE_DOMAIN_BOOT)))
> return true;
>
> return false;
> @@ -3892,12 +3887,9 @@ int __init cpuset_init(void)
>
> BUG_ON(!alloc_cpumask_var(&cpus_attach, GFP_KERNEL));
>
> - have_boot_isolcpus = housekeeping_enabled(HK_TYPE_DOMAIN);
> - if (have_boot_isolcpus) {
> - BUG_ON(!alloc_cpumask_var(&boot_hk_cpus, GFP_KERNEL));
> - cpumask_copy(boot_hk_cpus, housekeeping_cpumask(HK_TYPE_DOMAIN));
> - cpumask_andnot(isolated_cpus, cpu_possible_mask, boot_hk_cpus);
> - }
> + if (housekeeping_enabled(HK_TYPE_DOMAIN_BOOT))
> + cpumask_andnot(isolated_cpus, cpu_possible_mask,
> + housekeeping_cpumask(HK_TYPE_DOMAIN_BOOT));
>
> return 0;
> }
Reviewed-by: Waiman Long <longman@redhat.com>