Commit 0f4dfdc1 authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

cpuset: Convert boot_hk_cpus to use HK_TYPE_DOMAIN_BOOT 



boot_hk_cpus is an ad-hoc copy of HK_TYPE_DOMAIN_BOOT. Remove it and use
the official version.

Signed-off-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Reviewed-by: default avatarPhil Auld <pauld@redhat.com>
Reviewed-by: default avatarChen Ridong <chenridong@huawei.com>
Reviewed-by: default avatarWaiman Long <longman@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Marco Crivellari <marco.crivellari@suse.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Michal Koutny <mkoutny@suse.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Waiman Long <longman@redhat.com>
Cc: cgroups@vger.kernel.org
parent 4fca0e55

kernel/cgroup/cpuset.c

+7 −15
Original line number Diff line number Diff line
@@ -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;

}