Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edb93821 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

sched/isolation: Move isolcpus= handling to the housekeeping code 



We want to centralize the isolation features, to be done by the housekeeping
subsystem and scheduler domain isolation is a significant part of it.

No intended behaviour change, we just reuse the housekeeping cpumask
and core code.

Signed-off-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Chris Metcalf <cmetcalf@mellanox.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luiz Capitulino <lcapitulino@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Wanpeng Li <kernellwp@gmail.com>
Link: http://lkml.kernel.org/r/1509072159-31808-11-git-send-email-frederic@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 6f1982fe

drivers/base/cpu.c

+10 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/cpufeature.h>

#include <linux/tick.h>

#include <linux/pm_qos.h>

#include <linux/sched/isolation.h>



#include "base.h"
@@ -271,8 +272,16 @@ static ssize_t print_cpus_isolated(struct device *dev, 
				  struct device_attribute *attr, char *buf)

{

	int n = 0, len = PAGE_SIZE-2;

	cpumask_var_t isolated;



	n = scnprintf(buf, len, "%*pbl\n", cpumask_pr_args(cpu_isolated_map));

	if (!alloc_cpumask_var(&isolated, GFP_KERNEL))

		return -ENOMEM;



	cpumask_andnot(isolated, cpu_possible_mask,

		       housekeeping_cpumask(HK_FLAG_DOMAIN));

	n = scnprintf(buf, len, "%*pbl\n", cpumask_pr_args(isolated));



	free_cpumask_var(isolated);



	return n;

}

include/linux/sched.h

+0 −2
Original line number Diff line number Diff line
@@ -165,8 +165,6 @@ struct task_group; 
/* Task command name length: */

#define TASK_COMM_LEN			16



extern cpumask_var_t			cpu_isolated_map;



extern void scheduler_tick(void);



#define	MAX_SCHEDULE_TIMEOUT		LONG_MAX

include/linux/sched/isolation.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ enum hk_flags { 
	HK_FLAG_MISC		= (1 << 2),

	HK_FLAG_SCHED		= (1 << 3),

	HK_FLAG_TICK		= (1 << 4),

	HK_FLAG_DOMAIN		= (1 << 5),

};



#ifdef CONFIG_CPU_ISOLATION

kernel/cgroup/cpuset.c

+5 −10
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#include <linux/backing-dev.h>

#include <linux/sort.h>

#include <linux/oom.h>



#include <linux/sched/isolation.h>

#include <linux/uaccess.h>

#include <linux/atomic.h>

#include <linux/mutex.h>
@@ -656,7 +656,6 @@ static int generate_sched_domains(cpumask_var_t **domains, 
	int csn;		/* how many cpuset ptrs in csa so far */

	int i, j, k;		/* indices for partition finding loops */

	cpumask_var_t *doms;	/* resulting partition; i.e. sched domains */

	cpumask_var_t non_isolated_cpus;  /* load balanced CPUs */

	struct sched_domain_attr *dattr;  /* attributes for custom domains */

	int ndoms = 0;		/* number of sched domains in result */

	int nslot;		/* next empty doms[] struct cpumask slot */
@@ -666,10 +665,6 @@ static int generate_sched_domains(cpumask_var_t **domains, 
	dattr = NULL;

	csa = NULL;



	if (!alloc_cpumask_var(&non_isolated_cpus, GFP_KERNEL))

		goto done;

	cpumask_andnot(non_isolated_cpus, cpu_possible_mask, cpu_isolated_map);



	/* Special case for the 99% of systems with one, full, sched domain */

	if (is_sched_load_balance(&top_cpuset)) {

		ndoms = 1;
@@ -683,7 +678,7 @@ static int generate_sched_domains(cpumask_var_t **domains, 
			update_domain_attr_tree(dattr, &top_cpuset);

		}

		cpumask_and(doms[0], top_cpuset.effective_cpus,

				     non_isolated_cpus);

			    housekeeping_cpumask(HK_FLAG_DOMAIN));



		goto done;

	}
@@ -707,7 +702,8 @@ static int generate_sched_domains(cpumask_var_t **domains, 
		 */

		if (!cpumask_empty(cp->cpus_allowed) &&

		    !(is_sched_load_balance(cp) &&

		      cpumask_intersects(cp->cpus_allowed, non_isolated_cpus)))

		      cpumask_intersects(cp->cpus_allowed,

					 housekeeping_cpumask(HK_FLAG_DOMAIN))))

			continue;



		if (is_sched_load_balance(cp))
@@ -789,7 +785,7 @@ static int generate_sched_domains(cpumask_var_t **domains, 


			if (apn == b->pn) {

				cpumask_or(dp, dp, b->effective_cpus);

				cpumask_and(dp, dp, non_isolated_cpus);

				cpumask_and(dp, dp, housekeeping_cpumask(HK_FLAG_DOMAIN));

				if (dattr)

					update_domain_attr_tree(dattr + nslot, b);
@@ -802,7 +798,6 @@ static int generate_sched_domains(cpumask_var_t **domains, 
	BUG_ON(nslot != ndoms);



done:

	free_cpumask_var(non_isolated_cpus);

	kfree(csa);



	/*

kernel/sched/core.c

+1 −15
Original line number Diff line number Diff line
@@ -84,9 +84,6 @@ __read_mostly int scheduler_running; 
 */

int sysctl_sched_rt_runtime = 950000;



/* CPUs with isolated domains */

cpumask_var_t cpu_isolated_map;



/*

 * __task_rq_lock - lock the rq @p resides on.

 */
@@ -5735,10 +5732,6 @@ static inline void sched_init_smt(void) { } 


void __init sched_init_smp(void)

{

	cpumask_var_t non_isolated_cpus;



	alloc_cpumask_var(&non_isolated_cpus, GFP_KERNEL);



	sched_init_numa();



	/*
@@ -5748,16 +5741,12 @@ void __init sched_init_smp(void) 
	 */

	mutex_lock(&sched_domains_mutex);

	sched_init_domains(cpu_active_mask);

	cpumask_andnot(non_isolated_cpus, cpu_possible_mask, cpu_isolated_map);

	if (cpumask_empty(non_isolated_cpus))

		cpumask_set_cpu(smp_processor_id(), non_isolated_cpus);

	mutex_unlock(&sched_domains_mutex);



	/* Move init over to a non-isolated CPU */

	if (set_cpus_allowed_ptr(current, non_isolated_cpus) < 0)

	if (set_cpus_allowed_ptr(current, housekeeping_cpumask(HK_FLAG_DOMAIN)) < 0)

		BUG();

	sched_init_granularity();

	free_cpumask_var(non_isolated_cpus);



	init_sched_rt_class();

	init_sched_dl_class();
@@ -5961,9 +5950,6 @@ void __init sched_init(void) 
	calc_load_update = jiffies + LOAD_FREQ;



#ifdef CONFIG_SMP

	/* May be allocated at isolcpus cmdline parse time */

	if (cpu_isolated_map == NULL)

		zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);

	idle_thread_set_boot_cpu();

	set_cpu_rq_start_time(smp_processor_id());

#endif