Commit 64409660 authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

cpuset: Remove cpuset_cpu_is_isolated() 



The set of cpuset isolated CPUs is now included in HK_TYPE_DOMAIN
housekeeping cpumask. There is no usecase left interested in just
checking what is isolated by cpuset and not by the isolcpus= kernel
boot parameter.

Signed-off-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Reviewed-by: default avatarWaiman Long <longman@redhat.com>
Cc: "Michal Koutný" <mkoutny@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Marco Crivellari <marco.crivellari@suse.com>
Cc: Michal Hocko <mhocko@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 0947d018

include/linux/cpuset.h

+0 −6
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ extern void cpuset_unlock(void); 
extern void cpuset_cpus_allowed_locked(struct task_struct *p, struct cpumask *mask);

extern void cpuset_cpus_allowed(struct task_struct *p, struct cpumask *mask);

extern bool cpuset_cpus_allowed_fallback(struct task_struct *p);

extern bool cpuset_cpu_is_isolated(int cpu);

extern nodemask_t cpuset_mems_allowed(struct task_struct *p);

#define cpuset_current_mems_allowed (current->mems_allowed)

void cpuset_init_current_mems_allowed(void);
@@ -215,11 +214,6 @@ static inline bool cpuset_cpus_allowed_fallback(struct task_struct *p) 
	return false;

}



static inline bool cpuset_cpu_is_isolated(int cpu)

{

	return false;

}



static inline nodemask_t cpuset_mems_allowed(struct task_struct *p)

{

	return node_possible_map;

include/linux/sched/isolation.h

+1 −3
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define _LINUX_SCHED_ISOLATION_H



#include <linux/cpumask.h>

#include <linux/cpuset.h>

#include <linux/init.h>

#include <linux/tick.h>
@@ -84,8 +83,7 @@ static inline bool housekeeping_cpu(int cpu, enum hk_type type) 
static inline bool cpu_is_isolated(int cpu)

{

	return !housekeeping_test_cpu(cpu, HK_TYPE_DOMAIN) ||

	       !housekeeping_test_cpu(cpu, HK_TYPE_TICK) ||

	       cpuset_cpu_is_isolated(cpu);

	       !housekeeping_test_cpu(cpu, HK_TYPE_TICK);

}



#endif /* _LINUX_SCHED_ISOLATION_H */

kernel/cgroup/cpuset.c

+0 −12
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/mempolicy.h>

#include <linux/mm.h>

#include <linux/memory.h>

#include <linux/export.h>

#include <linux/rcupdate.h>

#include <linux/sched.h>

#include <linux/sched/deadline.h>
@@ -1488,17 +1487,6 @@ static void update_isolation_cpumasks(void) 
	isolated_cpus_updating = false;

}



/**

 * cpuset_cpu_is_isolated - Check if the given CPU is isolated

 * @cpu: the CPU number to be checked

 * Return: true if CPU is used in an isolated partition, false otherwise

 */

bool cpuset_cpu_is_isolated(int cpu)

{

	return cpumask_test_cpu(cpu, isolated_cpus);

}

EXPORT_SYMBOL_GPL(cpuset_cpu_is_isolated);



/**

 * rm_siblings_excl_cpus - Remove exclusive CPUs that are used by sibling cpusets

 * @parent: Parent cpuset containing all siblings