Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92c020d0 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 scheduler changes in this cycle were:

   - support Intel Turbo Boost Max Technology 3.0 (TBM3) by introducig a
     notion of 'better cores', which the scheduler will prefer to
     schedule single threaded workloads on. (Tim Chen, Srinivas
     Pandruvada)

   - enhance the handling of asymmetric capacity CPUs further (Morten
     Rasmussen)

   - improve/fix load handling when moving tasks between task groups
     (Vincent Guittot)

   - simplify and clean up the cputime code (Stanislaw Gruszka)

   - improve mass fork()ed task spread a.k.a. hackbench speedup (Vincent
     Guittot)

   - make struct kthread kmalloc()ed and related fixes (Oleg Nesterov)

   - add uaccess atomicity debugging (when using access_ok() in the
     wrong context), under CONFIG_DEBUG_ATOMIC_SLEEP=y (Peter Zijlstra)

   - implement various fixes, cleanups and other enhancements (Daniel
     Bristot de Oliveira, Martin Schwidefsky, Rafael J. Wysocki)"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (41 commits)
  sched/core: Use load_avg for selecting idlest group
  sched/core: Fix find_idlest_group() for fork
  kthread: Don't abuse kthread_create_on_cpu() in __kthread_create_worker()
  kthread: Don't use to_live_kthread() in kthread_[un]park()
  kthread: Don't use to_live_kthread() in kthread_stop()
  Revert "kthread: Pin the stack via try_get_task_stack()/put_task_stack() in to_live_kthread() function"
  kthread: Make struct kthread kmalloc'ed
  x86/uaccess, sched/preempt: Verify access_ok() context
  sched/x86: Make CONFIG_SCHED_MC_PRIO=y easier to enable
  sched/x86: Change CONFIG_SCHED_ITMT to CONFIG_SCHED_MC_PRIO
  x86/sched: Use #include <linux/mutex.h> instead of #include <asm/mutex.h>
  cpufreq/intel_pstate: Use CPPC to get max performance
  acpi/bus: Set _OSC for diverse core support
  acpi/bus: Enable HWP CPPC objects
  x86/sched: Add SD_ASYM_PACKING flags to x86 ITMT CPU
  x86/sysctl: Add sysctl for ITMT scheduling feature
  x86: Enable Intel Turbo Boost Max Technology 3.0
  x86/topology: Define x86's arch_update_cpu_topology
  sched: Extend scheduler's asym packing
  sched/fair: Clean up the tunable parameter definitions
  ...
parents bca13ce4 6b94780e

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -513,6 +513,9 @@ config HAVE_CONTEXT_TRACKING 
config HAVE_VIRT_CPU_ACCOUNTING

	bool



config ARCH_HAS_SCALED_CPUTIME

	bool



config HAVE_VIRT_CPU_ACCOUNTING_GEN

	bool

	default y if 64BIT

arch/ia64/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ void vtime_account_user(struct task_struct *tsk) 


	if (ti->ac_utime) {

		delta_utime = cycle_to_cputime(ti->ac_utime);

		account_user_time(tsk, delta_utime, delta_utime);

		account_user_time(tsk, delta_utime);

		ti->ac_utime = 0;

	}

}
@@ -112,7 +112,7 @@ void vtime_account_system(struct task_struct *tsk) 
{

	cputime_t delta = vtime_delta(tsk);



	account_system_time(tsk, 0, delta, delta);

	account_system_time(tsk, 0, delta);

}

EXPORT_SYMBOL_GPL(vtime_account_system);

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ config PPC 
	select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS

	select GENERIC_CPU_AUTOPROBE

	select HAVE_VIRT_CPU_ACCOUNTING

	select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE

	select HAVE_ARCH_HARDENED_USERCOPY

	select HAVE_KERNEL_GZIP

arch/powerpc/include/asm/cputime.h

+0 −14
Original line number Diff line number Diff line
@@ -46,26 +46,12 @@ extern cputime_t cputime_one_jiffy; 
 * Convert cputime <-> jiffies

 */

extern u64 __cputime_jiffies_factor;

DECLARE_PER_CPU(unsigned long, cputime_last_delta);

DECLARE_PER_CPU(unsigned long, cputime_scaled_last_delta);



static inline unsigned long cputime_to_jiffies(const cputime_t ct)

{

	return mulhdu((__force u64) ct, __cputime_jiffies_factor);

}



/* Estimate the scaled cputime by scaling the real cputime based on

 * the last scaled to real ratio */

static inline cputime_t cputime_to_scaled(const cputime_t ct)

{

	if (cpu_has_feature(CPU_FTR_SPURR) &&

	    __this_cpu_read(cputime_last_delta))

		return (__force u64) ct *

			__this_cpu_read(cputime_scaled_last_delta) /

			__this_cpu_read(cputime_last_delta);

	return ct;

}



static inline cputime_t jiffies_to_cputime(const unsigned long jif)

{

	u64 ct;

arch/powerpc/kernel/time.c

+4 −4
Original line number Diff line number Diff line
@@ -164,8 +164,6 @@ u64 __cputime_sec_factor; 
EXPORT_SYMBOL(__cputime_sec_factor);

u64 __cputime_clockt_factor;

EXPORT_SYMBOL(__cputime_clockt_factor);

DEFINE_PER_CPU(unsigned long, cputime_last_delta);

DEFINE_PER_CPU(unsigned long, cputime_scaled_last_delta);



cputime_t cputime_one_jiffy;
@@ -360,7 +358,8 @@ void vtime_account_system(struct task_struct *tsk) 
	unsigned long delta, sys_scaled, stolen;



	delta = vtime_delta(tsk, &sys_scaled, &stolen);

	account_system_time(tsk, 0, delta, sys_scaled);

	account_system_time(tsk, 0, delta);

	tsk->stimescaled += sys_scaled;

	if (stolen)

		account_steal_time(stolen);

}
@@ -393,7 +392,8 @@ void vtime_account_user(struct task_struct *tsk) 
	acct->user_time = 0;

	acct->user_time_scaled = 0;

	acct->utime_sspurr = 0;

	account_user_time(tsk, utime, utimescaled);

	account_user_time(tsk, utime);

	tsk->utimescaled += utimescaled;

}



#ifdef CONFIG_PPC32