Commit c84a1e32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-core-for-linus' of... 

Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next

Pull scheduler updates from Ingo Molnar:
 "The main scheduling related changes in this cycle were:

   - various sched/numa updates, for better performance

   - tree wide cleanup of open coded nice levels

   - nohz fix related to rq->nr_running use

   - cpuidle changes and continued consolidation to improve the
     kernel/sched/idle.c high level idle scheduling logic.  As part of
     this effort I pulled cpuidle driver changes from Rafael as well.

   - standardized idle polling amongst architectures

   - continued work on preparing better power/energy aware scheduling

   - sched/rt updates

   - misc fixlets and cleanups"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (49 commits)
  sched/numa: Decay ->wakee_flips instead of zeroing
  sched/numa: Update migrate_improves/degrades_locality()
  sched/numa: Allow task switch if load imbalance improves
  sched/rt: Fix 'struct sched_dl_entity' and dl_task_time() comments, to match the current upstream code
  sched: Consolidate open coded implementations of nice level frobbing into nice_to_rlimit() and rlimit_to_nice()
  sched: Initialize rq->age_stamp on processor start
  sched, nohz: Change rq->nr_running to always use wrappers
  sched: Fix the rq->next_balance logic in rebalance_domains() and idle_balance()
  sched: Use clamp() and clamp_val() to make sys_nice() more readable
  sched: Do not zero sg->cpumask and sg->sgp->power in build_sched_groups()
  sched/numa: Fix initialization of sched_domain_topology for NUMA
  sched: Call select_idle_sibling() when not affine_sd
  sched: Simplify return logic in sched_read_attr()
  sched: Simplify return logic in sched_copy_attr()
  sched: Fix exec_start/task_hot on migrated tasks
  arm64: Remove TIF_POLLING_NRFLAG
  metag: Remove TIF_POLLING_NRFLAG
  sched/idle: Make cpuidle_idle_call() void
  sched/idle: Reflow cpuidle_idle_call()
  sched/idle: Delay clearing the polling bit
  ...
parents 3d521f91 096aa338

arch/alpha/include/asm/thread_info.h

+2 −2
Original line number Diff line number Diff line
@@ -73,12 +73,14 @@ register struct thread_info *__current_thread_info __asm__("$8"); 
#define TIF_SYSCALL_AUDIT	4	/* syscall audit active */

#define TIF_DIE_IF_KERNEL	9	/* dik recursion lock */

#define TIF_MEMDIE		13	/* is terminating due to OOM killer */

#define TIF_POLLING_NRFLAG	14	/* idle is polling for TIF_NEED_RESCHED */



#define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)

#define _TIF_SIGPENDING		(1<<TIF_SIGPENDING)

#define _TIF_NEED_RESCHED	(1<<TIF_NEED_RESCHED)

#define _TIF_NOTIFY_RESUME	(1<<TIF_NOTIFY_RESUME)

#define _TIF_SYSCALL_AUDIT	(1<<TIF_SYSCALL_AUDIT)

#define _TIF_POLLING_NRFLAG	(1<<TIF_POLLING_NRFLAG)



/* Work to do on interrupt/exception return.  */

#define _TIF_WORK_MASK		(_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
@@ -92,8 +94,6 @@ register struct thread_info *__current_thread_info __asm__("$8"); 
#define TS_UAC_NOFIX		0x0002	/* ! flags as they match          */

#define TS_UAC_SIGBUS		0x0004	/* ! userspace part of 'osf_sysinfo' */

#define TS_RESTORE_SIGMASK	0x0008	/* restore signal mask in do_signal() */

#define TS_POLLING		0x0010	/* idle task polling need_resched,

					   skip sending interrupt */



#ifndef __ASSEMBLY__

#define HAVE_SET_RESTORE_SIGMASK	1

arch/arm/kernel/topology.c

+26 −0
Original line number Diff line number Diff line
@@ -185,6 +185,15 @@ const struct cpumask *cpu_coregroup_mask(int cpu) 
	return &cpu_topology[cpu].core_sibling;

}



/*

 * The current assumption is that we can power gate each core independently.

 * This will be superseded by DT binding once available.

 */

const struct cpumask *cpu_corepower_mask(int cpu)

{

	return &cpu_topology[cpu].thread_sibling;

}



static void update_siblings_masks(unsigned int cpuid)

{

	struct cputopo_arm *cpu_topo, *cpuid_topo = &cpu_topology[cpuid];
@@ -266,6 +275,20 @@ void store_cpu_topology(unsigned int cpuid) 
		cpu_topology[cpuid].socket_id, mpidr);

}



static inline const int cpu_corepower_flags(void)

{

	return SD_SHARE_PKG_RESOURCES  | SD_SHARE_POWERDOMAIN;

}



static struct sched_domain_topology_level arm_topology[] = {

#ifdef CONFIG_SCHED_MC

	{ cpu_corepower_mask, cpu_corepower_flags, SD_INIT_NAME(GMC) },

	{ cpu_coregroup_mask, cpu_core_flags, SD_INIT_NAME(MC) },

#endif

	{ cpu_cpu_mask, SD_INIT_NAME(DIE) },

	{ NULL, },

};



/*

 * init_cpu_topology is called at boot when only one cpu is running

 * which prevent simultaneous write access to cpu_topology array
@@ -289,4 +312,7 @@ void __init init_cpu_topology(void) 
	smp_wmb();



	parse_dt_topology();



	/* Set scheduler topology descriptor */

	set_sched_topology(arm_topology);

}

arch/arm64/include/asm/thread_info.h

+0 −2
Original line number Diff line number Diff line
@@ -95,13 +95,11 @@ static inline struct thread_info *current_thread_info(void) 
 *  TIF_NEED_RESCHED	- rescheduling necessary

 *  TIF_NOTIFY_RESUME	- callback before returning to user

 *  TIF_USEDFPU		- FPU was used by this task this quantum (SMP)

 *  TIF_POLLING_NRFLAG	- true if poll_idle() is polling TIF_NEED_RESCHED

 */

#define TIF_SIGPENDING		0

#define TIF_NEED_RESCHED	1

#define TIF_NOTIFY_RESUME	2	/* callback before returning to user */

#define TIF_SYSCALL_TRACE	8

#define TIF_POLLING_NRFLAG	16

#define TIF_MEMDIE		18	/* is terminating due to OOM killer */

#define TIF_FREEZE		19

#define TIF_RESTORE_SIGMASK	20

arch/ia64/include/asm/thread_info.h

+2 −1
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ struct thread_info { 
#define TIF_MCA_INIT		18	/* this task is processing MCA or INIT */

#define TIF_DB_DISABLED		19	/* debug trap disabled for fsyscall */

#define TIF_RESTORE_RSE		21	/* user RBS is newer than kernel RBS */

#define TIF_POLLING_NRFLAG	22	/* idle is polling for TIF_NEED_RESCHED */



#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)

#define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)
@@ -118,6 +119,7 @@ struct thread_info { 
#define _TIF_MCA_INIT		(1 << TIF_MCA_INIT)

#define _TIF_DB_DISABLED	(1 << TIF_DB_DISABLED)

#define _TIF_RESTORE_RSE	(1 << TIF_RESTORE_RSE)

#define _TIF_POLLING_NRFLAG	(1 << TIF_POLLING_NRFLAG)



/* "work to do on user-return" bits */

#define TIF_ALLWORK_MASK	(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SYSCALL_AUDIT|\
@@ -125,7 +127,6 @@ struct thread_info { 
/* like TIF_ALLWORK_BITS but sans TIF_SYSCALL_TRACE or TIF_SYSCALL_AUDIT */

#define TIF_WORK_MASK		(TIF_ALLWORK_MASK&~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT))



#define TS_POLLING		1 	/* true if in idle loop and not sleeping */

#define TS_RESTORE_SIGMASK	2	/* restore signal mask in do_signal() */



#ifndef __ASSEMBLY__

arch/ia64/include/asm/topology.h

+0 −24
Original line number Diff line number Diff line
@@ -46,30 +46,6 @@ 


void build_cpu_to_node_map(void);



#define SD_CPU_INIT (struct sched_domain) {		\

	.parent			= NULL,			\

	.child			= NULL,			\

	.groups			= NULL,			\

	.min_interval		= 1,			\

	.max_interval		= 4,			\

	.busy_factor		= 64,			\

	.imbalance_pct		= 125,			\

	.cache_nice_tries	= 2,			\

	.busy_idx		= 2,			\

	.idle_idx		= 1,			\

	.newidle_idx		= 0,			\

	.wake_idx		= 0,			\

	.forkexec_idx		= 0,			\

	.flags			= SD_LOAD_BALANCE	\

				| SD_BALANCE_NEWIDLE	\

				| SD_BALANCE_EXEC	\

				| SD_BALANCE_FORK	\

				| SD_WAKE_AFFINE,	\

	.last_balance		= jiffies,		\

	.balance_interval	= 1,			\

	.nr_balance_failed	= 0,			\

}



#endif /* CONFIG_NUMA */



#ifdef CONFIG_SMP

CRA Git | Maintained and supported by SUSTech CRA and CCSE