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

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

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

   - Make nohz housekeeping processing more permissive and less
     intrusive to isolated CPUs

   - Decouple CPU-bound workqueue acconting from the scheduler and move
     it into the workqueue code.

   - Optimize topology building

   - Better handle quota and period overflows

   - Add more RCU annotations

   - Comment updates, misc cleanups"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (25 commits)
  nohz_full: Allow the boot CPU to be nohz_full
  sched/isolation: Require a present CPU in housekeeping mask
  kernel/cpu: Allow non-zero CPU to be primary for suspend / kexec freeze
  power/suspend: Add function to disable secondaries for suspend
  sched/core: Allow the remote scheduler tick to be started on CPU0
  sched/nohz: Run NOHZ idle load balancer on HK_FLAG_MISC CPUs
  sched/debug: Fix spelling mistake "logaritmic" -> "logarithmic"
  sched/topology: Update init_sched_domains() comment
  cgroup/cpuset: Update stale generate_sched_domains() comments
  sched/core: Check quota and period overflow at usec to nsec conversion
  sched/core: Handle overflow in cpu_shares_write_u64
  sched/rt: Check integer overflow at usec to nsec conversion
  sched/core: Fix typo in comment
  sched/core: Make some functions static
  sched/core: Unify p->on_rq updates
  sched/core: Remove ttwu_activate()
  sched/core, workqueues: Distangle worker accounting from rq lock
  sched/fair: Remove unneeded prototype of capacity_of()
  sched/topology: Skip duplicate group rewrites in build_sched_groups()
  sched/topology: Fix build_sched_groups() comment
  ...
parents 90489a72 08ae95f4

arch/powerpc/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -313,6 +313,10 @@ config ARCH_SUSPEND_POSSIBLE 
		   (PPC_85xx && !PPC_E500MC) || PPC_86xx || PPC_PSERIES \

		   || 44x || 40x



config ARCH_SUSPEND_NONZERO_CPU

	def_bool y

	depends on PPC_POWERNV || PPC_PSERIES



config PPC_DCR_NATIVE

	bool

include/linux/cpu.h

+17 −0
Original line number Diff line number Diff line
@@ -137,9 +137,26 @@ static inline int disable_nonboot_cpus(void) 
	return freeze_secondary_cpus(0);

}

extern void enable_nonboot_cpus(void);



static inline int suspend_disable_secondary_cpus(void)

{

	int cpu = 0;



	if (IS_ENABLED(CONFIG_PM_SLEEP_SMP_NONZERO_CPU))

		cpu = -1;



	return freeze_secondary_cpus(cpu);

}

static inline void suspend_enable_secondary_cpus(void)

{

	return enable_nonboot_cpus();

}



#else /* !CONFIG_PM_SLEEP_SMP */

static inline int disable_nonboot_cpus(void) { return 0; }

static inline void enable_nonboot_cpus(void) {}

static inline int suspend_disable_secondary_cpus(void) { return 0; }

static inline void suspend_enable_secondary_cpus(void) { }

#endif /* !CONFIG_PM_SLEEP_SMP */



void cpu_startup_entry(enum cpuhp_state state);

include/linux/rcuwait.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
 * awoken.

 */

struct rcuwait {

	struct task_struct *task;

	struct task_struct __rcu *task;

};



#define __RCUWAIT_INITIALIZER(name)		\

include/linux/sched/topology.h

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ struct sched_domain_shared { 


struct sched_domain {

	/* These fields must be setup */

	struct sched_domain *parent;	/* top domain must be null terminated */

	struct sched_domain *child;	/* bottom domain must be null terminated */

	struct sched_domain __rcu *parent;	/* top domain must be null terminated */

	struct sched_domain __rcu *child;	/* bottom domain must be null terminated */

	struct sched_group *groups;	/* the balancing groups of the domain */

	unsigned long min_interval;	/* Minimum balance interval ms */

	unsigned long max_interval;	/* Maximum balance interval ms */

kernel/cgroup/cpuset.c

+5 −6
Original line number Diff line number Diff line
@@ -740,11 +740,10 @@ static inline int nr_cpusets(void) 
 * Must be called with cpuset_mutex held.

 *

 * The three key local variables below are:

 *    q  - a linked-list queue of cpuset pointers, used to implement a

 *	   top-down scan of all cpusets.  This scan loads a pointer

 *	   to each cpuset marked is_sched_load_balance into the

 *	   array 'csa'.  For our purposes, rebuilding the schedulers

 *	   sched domains, we can ignore !is_sched_load_balance cpusets.

 *    cp - cpuset pointer, used (together with pos_css) to perform a

 *	   top-down scan of all cpusets. For our purposes, rebuilding

 *	   the schedulers sched domains, we can ignore !is_sched_load_

 *	   balance cpusets.

 *  csa  - (for CpuSet Array) Array of pointers to all the cpusets

 *	   that need to be load balanced, for convenient iterative

 *	   access by the subsequent code that finds the best partition,
@@ -775,7 +774,7 @@ static inline int nr_cpusets(void) 
static int generate_sched_domains(cpumask_var_t **domains,

			struct sched_domain_attr **attributes)

{

	struct cpuset *cp;	/* scans q */

	struct cpuset *cp;	/* top-down scan of cpusets */

	struct cpuset **csa;	/* array of all cpuset ptrs */

	int csn;		/* how many cpuset ptrs in csa so far */

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE