Commit 971eae7c 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 changes from Ingo Molnar:
 "Bigger changes:

   - sched/idle restructuring: they are WIP preparation for deeper
     integration between the scheduler and idle state selection, by
     Nicolas Pitre.

   - add NUMA scheduling pseudo-interleaving, by Rik van Riel.

   - optimize cgroup context switches, by Peter Zijlstra.

   - RT scheduling enhancements, by Thomas Gleixner.

  The rest is smaller changes, non-urgnt fixes and cleanups"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (68 commits)
  sched: Clean up the task_hot() function
  sched: Remove double calculation in fix_small_imbalance()
  sched: Fix broken setscheduler()
  sparc64, sched: Remove unused sparc64_multi_core
  sched: Remove unused mc_capable() and smt_capable()
  sched/numa: Move task_numa_free() to __put_task_struct()
  sched/fair: Fix endless loop in idle_balance()
  sched/core: Fix endless loop in pick_next_task()
  sched/fair: Push down check for high priority class task into idle_balance()
  sched/rt: Fix picking RT and DL tasks from empty queue
  trace: Replace hardcoding of 19 with MAX_NICE
  sched: Guarantee task priority in pick_next_task()
  sched/idle: Remove stale old file
  sched: Put rq's sched_avg under CONFIG_FAIR_GROUP_SCHED
  cpuidle/arm64: Remove redundant cpuidle_idle_call()
  cpuidle/powernv: Remove redundant cpuidle_idle_call()
  sched, nohz: Exclude isolated cores from load balancing
  sched: Fix select_task_rq_fair() description comments
  workqueue: Replace hardcoding of -20 and 19 with MIN_NICE and MAX_NICE
  sys: Replace hardcoding of -20 and 19 with MIN_NICE and MAX_NICE
  ...
parents 8c292f11 6037dd1a

Documentation/sysctl/kernel.txt

+1 −9
Original line number Diff line number Diff line
@@ -442,8 +442,7 @@ feature should be disabled. Otherwise, if the system overhead from the 
feature is too high then the rate the kernel samples for NUMA hinting

faults may be controlled by the numa_balancing_scan_period_min_ms,

numa_balancing_scan_delay_ms, numa_balancing_scan_period_max_ms,

numa_balancing_scan_size_mb, numa_balancing_settle_count sysctls and

numa_balancing_migrate_deferred.

numa_balancing_scan_size_mb, and numa_balancing_settle_count sysctls.



==============================================================
@@ -484,13 +483,6 @@ rate for each task. 
numa_balancing_scan_size_mb is how many megabytes worth of pages are

scanned for a given scan.



numa_balancing_migrate_deferred is how many page migrations get skipped

unconditionally, after a page migration is skipped because a page is shared

with other tasks. This reduces page migration overhead, and determines

how much stronger the "move task near its memory" policy scheduler becomes,

versus the "move memory near its task" memory management policy, for workloads

with shared memory.



==============================================================



osrelease, ostype & version:

arch/arm/include/asm/topology.h

+0 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ extern struct cputopo_arm cpu_topology[NR_CPUS]; 
#define topology_core_cpumask(cpu)	(&cpu_topology[cpu].core_sibling)

#define topology_thread_cpumask(cpu)	(&cpu_topology[cpu].thread_sibling)



#define mc_capable()	(cpu_topology[0].socket_id != -1)

#define smt_capable()	(cpu_topology[0].thread_id != -1)



void init_cpu_topology(void);

void store_cpu_topology(unsigned int cpuid);

const struct cpumask *cpu_coregroup_mask(int cpu);

arch/arm/kernel/process.c

+5 −11
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/uaccess.h>

#include <linux/random.h>

#include <linux/hw_breakpoint.h>

#include <linux/cpuidle.h>

#include <linux/leds.h>

#include <linux/reboot.h>
@@ -133,7 +132,11 @@ EXPORT_SYMBOL_GPL(arm_pm_restart); 


void (*arm_pm_idle)(void);



static void default_idle(void)

/*

 * Called from the core idle loop.

 */



void arch_cpu_idle(void)

{

	if (arm_pm_idle)

		arm_pm_idle();
@@ -167,15 +170,6 @@ void arch_cpu_idle_dead(void) 
}

#endif



/*

 * Called from the core idle loop.

 */

void arch_cpu_idle(void)

{

	if (cpuidle_idle_call())

		default_idle();

}



/*

 * Called by kexec, immediately prior to machine_kexec().

 *

arch/arm64/kernel/process.c

+2 −5
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <linux/kallsyms.h>

#include <linux/init.h>

#include <linux/cpu.h>

#include <linux/cpuidle.h>

#include <linux/elfcore.h>

#include <linux/pm.h>

#include <linux/tick.h>
@@ -94,11 +93,9 @@ void arch_cpu_idle(void) 
	 * This should do all the clock switching and wait for interrupt

	 * tricks

	 */

	if (cpuidle_idle_call()) {

	cpu_do_idle();

	local_irq_enable();

}

}



#ifdef CONFIG_HOTPLUG_CPU

void arch_cpu_idle_dead(void)

arch/ia64/include/asm/topology.h

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ void build_cpu_to_node_map(void); 
#define topology_core_id(cpu)			(cpu_data(cpu)->core_id)

#define topology_core_cpumask(cpu)		(&cpu_core_map[cpu])

#define topology_thread_cpumask(cpu)		(&per_cpu(cpu_sibling_map, cpu))

#define smt_capable() 				(smp_num_siblings > 1)

#endif



extern void arch_fix_phys_package_id(int num, u32 slot);

CRA Git | Maintained and supported by SUSTech CRA and CCSE