Commit c94d89fa authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

Merge branch 'sched/core'

parents 7c60610d 234b8ab6

include/linux/cpuset.h

+5 −3
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/cpumask.h>

#include <linux/nodemask.h>

#include <linux/mm.h>

#include <linux/mmu_context.h>

#include <linux/jump_label.h>



#ifdef CONFIG_CPUSETS
@@ -58,7 +59,7 @@ extern void cpuset_wait_for_hotplug(void); 
extern void cpuset_read_lock(void);

extern void cpuset_read_unlock(void);

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

extern void cpuset_cpus_allowed_fallback(struct task_struct *p);

extern bool cpuset_cpus_allowed_fallback(struct task_struct *p);

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);
@@ -184,11 +185,12 @@ static inline void cpuset_read_unlock(void) { } 
static inline void cpuset_cpus_allowed(struct task_struct *p,

				       struct cpumask *mask)

{

	cpumask_copy(mask, cpu_possible_mask);

	cpumask_copy(mask, task_cpu_possible_mask(p));

}



static inline void cpuset_cpus_allowed_fallback(struct task_struct *p)

static inline bool cpuset_cpus_allowed_fallback(struct task_struct *p)

{

	return false;

}



static inline nodemask_t cpuset_mems_allowed(struct task_struct *p)

include/linux/mmu_context.h

+14 −0
Original line number Diff line number Diff line
@@ -14,4 +14,18 @@ 
static inline void leave_mm(int cpu) { }

#endif



/*

 * CPUs that are capable of running user task @p. Must contain at least one

 * active CPU. It is assumed that the kernel can run on all CPUs, so calling

 * this for a kernel thread is pointless.

 *

 * By default, we assume a sane, homogeneous system.

 */

#ifndef task_cpu_possible_mask

# define task_cpu_possible_mask(p)	cpu_possible_mask

# define task_cpu_possible(cpu, p)	true

#else

# define task_cpu_possible(cpu, p)	cpumask_test_cpu((cpu), task_cpu_possible_mask(p))

#endif



#endif

include/linux/sched.h

+21 −0
Original line number Diff line number Diff line
@@ -748,6 +748,7 @@ struct task_struct { 
	unsigned int			policy;

	int				nr_cpus_allowed;

	const cpumask_t			*cpus_ptr;

	cpumask_t			*user_cpus_ptr;

	cpumask_t			cpus_mask;

	void				*migration_pending;

#ifdef CONFIG_SMP
@@ -1705,6 +1706,11 @@ extern int task_can_attach(struct task_struct *p, const struct cpumask *cs_cpus_ 
#ifdef CONFIG_SMP

extern void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask);

extern int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask);

extern int dup_user_cpus_ptr(struct task_struct *dst, struct task_struct *src, int node);

extern void release_user_cpus_ptr(struct task_struct *p);

extern int dl_task_check_affinity(struct task_struct *p, const struct cpumask *mask);

extern void force_compatible_cpus_allowed_ptr(struct task_struct *p);

extern void relax_compatible_cpus_allowed_ptr(struct task_struct *p);

#else

static inline void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)

{
@@ -1715,6 +1721,21 @@ static inline int set_cpus_allowed_ptr(struct task_struct *p, const struct cpuma 
		return -EINVAL;

	return 0;

}

static inline int dup_user_cpus_ptr(struct task_struct *dst, struct task_struct *src, int node)

{

	if (src->user_cpus_ptr)

		return -EINVAL;

	return 0;

}

static inline void release_user_cpus_ptr(struct task_struct *p)

{

	WARN_ON(p->user_cpus_ptr);

}



static inline int dl_task_check_affinity(struct task_struct *p, const struct cpumask *mask)

{

	return 0;

}

#endif



extern int yield_to(struct task_struct *p, bool preempt);

include/linux/sched/sysctl.h

+0 −18
Original line number Diff line number Diff line
@@ -28,30 +28,12 @@ enum { sysctl_hung_task_timeout_secs = 0 }; 


extern unsigned int sysctl_sched_child_runs_first;



extern unsigned int sysctl_sched_latency;

extern unsigned int sysctl_sched_min_granularity;

extern unsigned int sysctl_sched_wakeup_granularity;



enum sched_tunable_scaling {

	SCHED_TUNABLESCALING_NONE,

	SCHED_TUNABLESCALING_LOG,

	SCHED_TUNABLESCALING_LINEAR,

	SCHED_TUNABLESCALING_END,

};

extern unsigned int sysctl_sched_tunable_scaling;



extern unsigned int sysctl_numa_balancing_scan_delay;

extern unsigned int sysctl_numa_balancing_scan_period_min;

extern unsigned int sysctl_numa_balancing_scan_period_max;

extern unsigned int sysctl_numa_balancing_scan_size;



#ifdef CONFIG_SCHED_DEBUG

extern __read_mostly unsigned int sysctl_sched_migration_cost;

extern __read_mostly unsigned int sysctl_sched_nr_migrate;



extern int sysctl_resched_latency_warn_ms;

extern int sysctl_resched_latency_warn_once;

#endif



/*

 *  control realtime throttling:

include/linux/wait.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct task_struct; 


#define __WAIT_QUEUE_HEAD_INITIALIZER(name) {					\

	.lock		= __SPIN_LOCK_UNLOCKED(name.lock),			\

	.head		= { &(name).head, &(name).head } }

	.head		= LIST_HEAD_INIT(name.head) }



#define DECLARE_WAIT_QUEUE_HEAD(name) \

	struct wait_queue_head name = __WAIT_QUEUE_HEAD_INITIALIZER(name)