Commit f57d54ba 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 biggest change affects group scheduling: we now track the runnable
  average on a per-task entity basis, allowing a smoother, exponential
  decay average based load/weight estimation instead of the previous
  binary on-the-runqueue/off-the-runqueue load weight method.

  This will inevitably disturb workloads that were in some sort of
  borderline balancing state or unstable equilibrium, so an eye has to
  be kept on regressions.

  For that reason the new load average is only limited to group
  scheduling (shares distribution) at the moment (which was also hurting
  the most from the prior, crude weight calculation and whose scheduling
  quality wins most from this change) - but we plan to extend this to
  regular SMP balancing as well in the future, which will simplify and
  speed up things a bit.

  Other changes involve ongoing preparatory work to extend NOHZ to the
  scheduler as well, eventually allowing completely irq-free user-space
  execution."

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (33 commits)
  Revert "sched/autogroup: Fix crash on reboot when autogroup is disabled"
  cputime: Comment cputime's adjusting code
  cputime: Consolidate cputime adjustment code
  cputime: Rename thread_group_times to thread_group_cputime_adjusted
  cputime: Move thread_group_cputime() to sched code
  vtime: Warn if irqs aren't disabled on system time accounting APIs
  vtime: No need to disable irqs on vtime_account()
  vtime: Consolidate a bit the ctx switch code
  vtime: Explicitly account pending user time on process tick
  vtime: Remove the underscore prefix invasion
  sched/autogroup: Fix crash on reboot when autogroup is disabled
  cputime: Separate irqtime accounting from generic vtime
  cputime: Specialize irq vtime hooks
  kvm: Directly account vtime to system on guest switch
  vtime: Make vtime_account_system() irqsafe
  vtime: Gather vtime declarations to their own header file
  sched: Describe CFS load-balancer
  sched: Introduce temporary FAIR_GROUP_SCHED dependency for load-tracking
  sched: Make __update_entity_runnable_avg() fast
  sched: Update_cfs_shares at period edge
  ...
parents da830e58 c1ad41f1

arch/ia64/include/asm/cputime.h

+2 −0
Original line number Diff line number Diff line
@@ -103,5 +103,7 @@ static inline void cputime_to_timeval(const cputime_t ct, struct timeval *val) 
#define cputime64_to_clock_t(__ct)	\

	cputime_to_clock_t((__force cputime_t)__ct)



extern void arch_vtime_task_switch(struct task_struct *tsk);



#endif /* CONFIG_VIRT_CPU_ACCOUNTING */

#endif /* __IA64_CPUTIME_H */

arch/ia64/kernel/time.c

+4 −18
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static struct clocksource *itc_clocksource; 


extern cputime_t cycle_to_cputime(u64 cyc);



static void vtime_account_user(struct task_struct *tsk)

void vtime_account_user(struct task_struct *tsk)

{

	cputime_t delta_utime;

	struct thread_info *ti = task_thread_info(tsk);
@@ -100,18 +100,11 @@ static void vtime_account_user(struct task_struct *tsk) 
 * accumulated times to the current process, and to prepare accounting on

 * the next process.

 */

void vtime_task_switch(struct task_struct *prev)

void arch_vtime_task_switch(struct task_struct *prev)

{

	struct thread_info *pi = task_thread_info(prev);

	struct thread_info *ni = task_thread_info(current);



	if (idle_task(smp_processor_id()) != prev)

		vtime_account_system(prev);

	else

		vtime_account_idle(prev);



	vtime_account_user(prev);



	pi->ac_stamp = ni->ac_stamp;

	ni->ac_stime = ni->ac_utime = 0;

}
@@ -126,6 +119,8 @@ static cputime_t vtime_delta(struct task_struct *tsk) 
	cputime_t delta_stime;

	__u64 now;



	WARN_ON_ONCE(!irqs_disabled());



	now = ia64_get_itc();



	delta_stime = cycle_to_cputime(ti->ac_stime + (now - ti->ac_stamp));
@@ -147,15 +142,6 @@ void vtime_account_idle(struct task_struct *tsk) 
	account_idle_time(vtime_delta(tsk));

}



/*

 * Called from the timer interrupt handler to charge accumulated user time

 * to the current process.  Must be called with interrupts disabled.

 */

void account_process_tick(struct task_struct *p, int user_tick)

{

	vtime_account_user(p);

}



#endif /* CONFIG_VIRT_CPU_ACCOUNTING */



static irqreturn_t

arch/powerpc/include/asm/cputime.h

+2 −0
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ static inline cputime_t clock_t_to_cputime(const unsigned long clk) 


#define cputime64_to_clock_t(ct)	cputime_to_clock_t((cputime_t)(ct))



static inline void arch_vtime_task_switch(struct task_struct *tsk) { }



#endif /* __KERNEL__ */

#endif /* CONFIG_VIRT_CPU_ACCOUNTING */

#endif /* __POWERPC_CPUTIME_H */

arch/powerpc/kernel/time.c

+8 −12
Original line number Diff line number Diff line
@@ -297,6 +297,8 @@ static u64 vtime_delta(struct task_struct *tsk, 
	u64 now, nowscaled, deltascaled;

	u64 udelta, delta, user_scaled;



	WARN_ON_ONCE(!irqs_disabled());



	now = mftb();

	nowscaled = read_spurr(now);

	get_paca()->system_time += now - get_paca()->starttime;
@@ -355,15 +357,15 @@ void vtime_account_idle(struct task_struct *tsk) 
}



/*

 * Transfer the user and system times accumulated in the paca

 * by the exception entry and exit code to the generic process

 * user and system time records.

 * Transfer the user time accumulated in the paca

 * by the exception entry and exit code to the generic

 * process user time records.

 * Must be called with interrupts disabled.

 * Assumes that vtime_account() has been called recently

 * (i.e. since the last entry from usermode) so that

 * Assumes that vtime_account_system/idle() has been called

 * recently (i.e. since the last entry from usermode) so that

 * get_paca()->user_time_scaled is up to date.

 */

void account_process_tick(struct task_struct *tsk, int user_tick)

void vtime_account_user(struct task_struct *tsk)

{

	cputime_t utime, utimescaled;
@@ -375,12 +377,6 @@ void account_process_tick(struct task_struct *tsk, int user_tick) 
	account_user_time(tsk, utime, utimescaled);

}



void vtime_task_switch(struct task_struct *prev)

{

	vtime_account(prev);

	account_process_tick(prev, 0);

}



#else /* ! CONFIG_VIRT_CPU_ACCOUNTING */

#define calc_cputime_factors()

#endif

arch/s390/include/asm/cputime.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 




#define __ARCH_HAS_VTIME_ACCOUNT

#define __ARCH_HAS_VTIME_TASK_SWITCH



/* We want to use full resolution of the CPU timer: 2**-12 micro-seconds. */