Commit 77a05940 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 changes in this cycle were:

   - Make kcpustat vtime aware (Frederic Weisbecker)

   - Rework the CFS load_balance() logic (Vincent Guittot)

   - Misc cleanups, smaller enhancements, fixes.

  The load-balancing rework is the most intrusive change: it replaces
  the old heuristics that have become less meaningful after the
  introduction of the PELT metrics, with a grounds-up load-balancing
  algorithm.

  As such it's not really an iterative series, but replaces the old
  load-balancing logic with the new one. We hope there are no
  performance regressions left - but statistically it's highly probable
  that there *is* going to be some workload that is hurting from these
  chnages. If so then we'd prefer to have a look at that workload and
  fix its scheduling, instead of reverting the changes"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (46 commits)
  rackmeter: Use vtime aware kcpustat accessor
  leds: Use all-in-one vtime aware kcpustat accessor
  cpufreq: Use vtime aware kcpustat accessors for user time
  procfs: Use all-in-one vtime aware kcpustat accessor
  sched/vtime: Bring up complete kcpustat accessor
  sched/cputime: Support other fields on kcpustat_field()
  sched/cpufreq: Move the cfs_rq_util_change() call to cpufreq_update_util()
  sched/fair: Add comments for group_type and balancing at SD_NUMA level
  sched/fair: Fix rework of find_idlest_group()
  sched/uclamp: Fix overzealous type replacement
  sched/Kconfig: Fix spelling mistake in user-visible help text
  sched/core: Further clarify sched_class::set_next_task()
  sched/fair: Use mul_u32_u32()
  sched/core: Simplify sched_class::pick_next_task()
  sched/core: Optimize pick_next_task()
  sched/core: Make pick_next_task_idle() more consistent
  sched/fair: Better document newidle_balance()
  leds: Use vtime aware kcpustat accessor to fetch CPUTIME_SYSTEM
  cpufreq: Use vtime aware kcpustat accessor to fetch CPUTIME_SYSTEM
  procfs: Use vtime aware kcpustat accessor to fetch CPUTIME_SYSTEM
  ...
parents 3f59dbca de881a34

arch/ia64/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static __u64 vtime_delta(struct task_struct *tsk) 
	return delta_stime;

}



void vtime_account_system(struct task_struct *tsk)

void vtime_account_kernel(struct task_struct *tsk)

{

	struct thread_info *ti = task_thread_info(tsk);

	__u64 stime = vtime_delta(tsk);
@@ -146,7 +146,7 @@ void vtime_account_system(struct task_struct *tsk) 
	else

		ti->stime += stime;

}

EXPORT_SYMBOL_GPL(vtime_account_system);

EXPORT_SYMBOL_GPL(vtime_account_kernel);



void vtime_account_idle(struct task_struct *tsk)

{

arch/powerpc/kernel/time.c

+3 −3
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static unsigned long vtime_delta(struct task_struct *tsk, 
	return stime;

}



void vtime_account_system(struct task_struct *tsk)

void vtime_account_kernel(struct task_struct *tsk)

{

	unsigned long stime, stime_scaled, steal_time;

	struct cpu_accounting_data *acct = get_accounting(tsk);
@@ -366,7 +366,7 @@ void vtime_account_system(struct task_struct *tsk) 
#endif

	}

}

EXPORT_SYMBOL_GPL(vtime_account_system);

EXPORT_SYMBOL_GPL(vtime_account_kernel);



void vtime_account_idle(struct task_struct *tsk)

{
@@ -395,7 +395,7 @@ static void vtime_flush_scaled(struct task_struct *tsk, 
/*

 * Account the whole cputime accumulated in the paca

 * Must be called with interrupts disabled.

 * Assumes that vtime_account_system/idle() has been called

 * Assumes that vtime_account_kernel/idle() has been called

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

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

 */

arch/s390/kernel/vtime.c

+2 −2
Original line number Diff line number Diff line
@@ -247,9 +247,9 @@ void vtime_account_irq_enter(struct task_struct *tsk) 
}

EXPORT_SYMBOL_GPL(vtime_account_irq_enter);



void vtime_account_system(struct task_struct *tsk)

void vtime_account_kernel(struct task_struct *tsk)

__attribute__((alias("vtime_account_irq_enter")));

EXPORT_SYMBOL_GPL(vtime_account_system);

EXPORT_SYMBOL_GPL(vtime_account_kernel);



/*

 * Sorted add to a list. List is linear searched until first bigger

arch/x86/entry/calling.h

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ For 32-bit we have the following conventions - kernel is built with 
.macro CALL_enter_from_user_mode

#ifdef CONFIG_CONTEXT_TRACKING

#ifdef CONFIG_JUMP_LABEL

	STATIC_JUMP_IF_FALSE .Lafter_call_\@, context_tracking_enabled, def=0

	STATIC_JUMP_IF_FALSE .Lafter_call_\@, context_tracking_key, def=0

#endif

	call enter_from_user_mode

.Lafter_call_\@:

drivers/cpufreq/cpufreq.c

+10 −7
Original line number Diff line number Diff line
@@ -113,18 +113,21 @@ EXPORT_SYMBOL_GPL(get_governor_parent_kobj); 


static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall)

{

	u64 idle_time;

	struct kernel_cpustat kcpustat;

	u64 cur_wall_time;

	u64 idle_time;

	u64 busy_time;



	cur_wall_time = jiffies64_to_nsecs(get_jiffies_64());



	busy_time = kcpustat_cpu(cpu).cpustat[CPUTIME_USER];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_IRQ];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SOFTIRQ];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_STEAL];

	busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE];

	kcpustat_cpu_fetch(&kcpustat, cpu);



	busy_time = kcpustat.cpustat[CPUTIME_USER];

	busy_time += kcpustat.cpustat[CPUTIME_SYSTEM];

	busy_time += kcpustat.cpustat[CPUTIME_IRQ];

	busy_time += kcpustat.cpustat[CPUTIME_SOFTIRQ];

	busy_time += kcpustat.cpustat[CPUTIME_STEAL];

	busy_time += kcpustat.cpustat[CPUTIME_NICE];



	idle_time = cur_wall_time - busy_time;

	if (wall)

CRA Git | Maintained and supported by SUSTech CRA and CCSE