Commit 825a3b26 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:

 - massive CPU hotplug rework (Thomas Gleixner)

 - improve migration fairness (Peter Zijlstra)

 - CPU load calculation updates/cleanups (Yuyang Du)

 - cpufreq updates (Steve Muckle)

 - nohz optimizations (Frederic Weisbecker)

 - switch_mm() micro-optimization on x86 (Andy Lutomirski)

 - ... lots of other enhancements, fixes and cleanups.

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (66 commits)
  ARM: Hide finish_arch_post_lock_switch() from modules
  sched/core: Provide a tsk_nr_cpus_allowed() helper
  sched/core: Use tsk_cpus_allowed() instead of accessing ->cpus_allowed
  sched/loadavg: Fix loadavg artifacts on fully idle and on fully loaded systems
  sched/fair: Correct unit of load_above_capacity
  sched/fair: Clean up scale confusion
  sched/nohz: Fix affine unpinned timers mess
  sched/fair: Fix fairness issue on migration
  sched/core: Kill sched_class::task_waking to clean up the migration logic
  sched/fair: Prepare to fix fairness problems on migration
  sched/fair: Move record_wakee()
  sched/core: Fix comment typo in wake_q_add()
  sched/core: Remove unused variable
  sched: Make hrtick_notifier an explicit call
  sched/fair: Make ilb_notifier an explicit call
  sched/hotplug: Make activate() the last hotplug step
  sched/hotplug: Move migration CPU_DYING to sched_cpu_dying()
  sched/migration: Move CPU_ONLINE into scheduler state
  sched/migration: Move calc_load_migrate() into CPU_DYING
  sched/migration: Move prepare transition to SCHED_STARTING state
  ...
parents cf6ed9a6 ef0491ea

Documentation/trace/ftrace.txt

+5 −5
Original line number Diff line number Diff line
@@ -1562,12 +1562,12 @@ Doing the same with chrt -r 5 and function-trace set. 
  <idle>-0       3dN.1   12us : menu_hrtimer_cancel <-tick_nohz_idle_exit

  <idle>-0       3dN.1   12us : ktime_get <-tick_nohz_idle_exit

  <idle>-0       3dN.1   12us : tick_do_update_jiffies64 <-tick_nohz_idle_exit

  <idle>-0       3dN.1   13us : update_cpu_load_nohz <-tick_nohz_idle_exit

  <idle>-0       3dN.1   13us : _raw_spin_lock <-update_cpu_load_nohz

  <idle>-0       3dN.1   13us : cpu_load_update_nohz <-tick_nohz_idle_exit

  <idle>-0       3dN.1   13us : _raw_spin_lock <-cpu_load_update_nohz

  <idle>-0       3dN.1   13us : add_preempt_count <-_raw_spin_lock

  <idle>-0       3dN.2   13us : __update_cpu_load <-update_cpu_load_nohz

  <idle>-0       3dN.2   14us : sched_avg_update <-__update_cpu_load

  <idle>-0       3dN.2   14us : _raw_spin_unlock <-update_cpu_load_nohz

  <idle>-0       3dN.2   13us : __cpu_load_update <-cpu_load_update_nohz

  <idle>-0       3dN.2   14us : sched_avg_update <-__cpu_load_update

  <idle>-0       3dN.2   14us : _raw_spin_unlock <-cpu_load_update_nohz

  <idle>-0       3dN.2   14us : sub_preempt_count <-_raw_spin_unlock

  <idle>-0       3dN.1   15us : calc_load_exit_idle <-tick_nohz_idle_exit

  <idle>-0       3dN.1   15us : touch_softlockup_watchdog <-tick_nohz_idle_exit

arch/arm/include/asm/mmu_context.h

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <linux/compiler.h>

#include <linux/sched.h>

#include <linux/preempt.h>

#include <asm/cacheflush.h>

#include <asm/cachetype.h>

#include <asm/proc-fns.h>
@@ -66,6 +67,7 @@ static inline void check_and_switch_context(struct mm_struct *mm, 
		cpu_switch_mm(mm->pgd, mm);

}



#ifndef MODULE

#define finish_arch_post_lock_switch \

	finish_arch_post_lock_switch

static inline void finish_arch_post_lock_switch(void)
@@ -87,6 +89,7 @@ static inline void finish_arch_post_lock_switch(void) 
		preempt_enable_no_resched();

	}

}

#endif /* !MODULE */



#endif	/* CONFIG_MMU */

arch/powerpc/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle) 
		smp_ops->give_timebase();



	/* Wait until cpu puts itself in the online & active maps */

	while (!cpu_online(cpu) || !cpu_active(cpu))

	while (!cpu_online(cpu))

		cpu_relax();



	return 0;

arch/s390/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle) 
	pcpu_attach_task(pcpu, tidle);

	pcpu_start_fn(pcpu, smp_start_secondary, NULL);

	/* Wait until cpu puts itself in the online & active maps */

	while (!cpu_online(cpu) || !cpu_active(cpu))

	while (!cpu_online(cpu))

		cpu_relax();

	return 0;

}

arch/x86/events/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2183,7 +2183,7 @@ void arch_perf_update_userpage(struct perf_event *event, 
	 * cap_user_time_zero doesn't make sense when we're using a different

	 * time base for the records.

	 */

	if (event->clock == &local_clock) {

	if (!event->attr.use_clockid) {

		userpg->cap_user_time_zero = 1;

		userpg->time_zero = data->cyc2ns_offset;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE