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

Commit d652e1eb 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:
 "Main changes:

   - scheduler side full-dynticks (user-space execution is undisturbed
     and receives no timer IRQs) preparation changes that convert the
     cputime accounting code to be full-dynticks ready, from Frederic
     Weisbecker.

   - Initial sched.h split-up changes, by Clark Williams

   - select_idle_sibling() performance improvement by Mike Galbraith:

        " 1 tbench pair (worst case) in a 10 core + SMT package:

          pre   15.22 MB/sec 1 procs
          post 252.01 MB/sec 1 procs "

  - sched_rr_get_interval() ABI fix/change.  We think this detail is not
    used by apps (so it's not an ABI in practice), but lets keep it
    under observation.

  - misc RT scheduling cleanups, optimizations"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
  sched/rt: Add <linux/sched/rt.h> header to <linux/init_task.h>
  cputime: Remove irqsave from seqlock readers
  sched, powerpc: Fix sched.h split-up build failure
  cputime: Restore CPU_ACCOUNTING config defaults for PPC64
  sched/rt: Move rt specific bits into new header file
  sched/rt: Add a tuning knob to allow changing SCHED_RR timeslice
  sched: Move sched.h sysctl bits into separate header
  sched: Fix signedness bug in yield_to()
  sched: Fix select_idle_sibling() bouncing cow syndrome
  sched/rt: Further simplify pick_rt_task()
  sched/rt: Do not account zero delta_exec in update_curr_rt()
  cputime: Safely read cputime of full dynticks CPUs
  kvm: Prepare to add generic guest entry/exit callbacks
  cputime: Use accessors to read task cputime stats
  cputime: Allow dynamic switch between tick/virtual based cputime accounting
  cputime: Generic on-demand virtual cputime accounting
  cputime: Move default nsecs_to_cputime() to jiffies based cputime file
  cputime: Librarize per nsecs resolution cputime definitions
  cputime: Avoid multiplication overflow on utime scaling
  context_tracking: Export context state for generic vtime
  ...

Fix up conflict in kernel/context_tracking.c due to comment additions.
parents 8f55cea4 77852fea

arch/alpha/kernel/osf_sys.c

+4 −2
Original line number Diff line number Diff line
@@ -1139,6 +1139,7 @@ struct rusage32 { 
SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru)

{

	struct rusage32 r;

	cputime_t utime, stime;



	if (who != RUSAGE_SELF && who != RUSAGE_CHILDREN)

		return -EINVAL;
@@ -1146,8 +1147,9 @@ SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru) 
	memset(&r, 0, sizeof(r));

	switch (who) {

	case RUSAGE_SELF:

		jiffies_to_timeval32(current->utime, &r.ru_utime);

		jiffies_to_timeval32(current->stime, &r.ru_stime);

		task_cputime(current, &utime, &stime);

		jiffies_to_timeval32(utime, &r.ru_utime);

		jiffies_to_timeval32(stime, &r.ru_stime);

		r.ru_minflt = current->min_flt;

		r.ru_majflt = current->maj_flt;

		break;

arch/ia64/include/asm/cputime.h

+6 −86
Original line number Diff line number Diff line
@@ -11,99 +11,19 @@ 
 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 *

 * If we have CONFIG_VIRT_CPU_ACCOUNTING, we measure cpu time in nsec.

 * If we have CONFIG_VIRT_CPU_ACCOUNTING_NATIVE, we measure cpu time in nsec.

 * Otherwise we measure cpu time in jiffies using the generic definitions.

 */



#ifndef __IA64_CPUTIME_H

#define __IA64_CPUTIME_H



#ifndef CONFIG_VIRT_CPU_ACCOUNTING

#ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE

# include <asm-generic/cputime.h>

#else



#include <linux/time.h>

#include <linux/jiffies.h>

# include <asm/processor.h>



typedef u64 __nocast cputime_t;

typedef u64 __nocast cputime64_t;



#define cputime_one_jiffy		jiffies_to_cputime(1)



/*

 * Convert cputime <-> jiffies (HZ)

 */

#define cputime_to_jiffies(__ct)	\

	((__force u64)(__ct) / (NSEC_PER_SEC / HZ))

#define jiffies_to_cputime(__jif)	\

	(__force cputime_t)((__jif) * (NSEC_PER_SEC / HZ))

#define cputime64_to_jiffies64(__ct)	\

	((__force u64)(__ct) / (NSEC_PER_SEC / HZ))

#define jiffies64_to_cputime64(__jif)	\

	(__force cputime64_t)((__jif) * (NSEC_PER_SEC / HZ))



/*

 * Convert cputime <-> microseconds

 */

#define cputime_to_usecs(__ct)		\

	((__force u64)(__ct) / NSEC_PER_USEC)

#define usecs_to_cputime(__usecs)	\

	(__force cputime_t)((__usecs) * NSEC_PER_USEC)

#define usecs_to_cputime64(__usecs)	\

	(__force cputime64_t)((__usecs) * NSEC_PER_USEC)



/*

 * Convert cputime <-> seconds

 */

#define cputime_to_secs(__ct)		\

	((__force u64)(__ct) / NSEC_PER_SEC)

#define secs_to_cputime(__secs)		\

	(__force cputime_t)((__secs) * NSEC_PER_SEC)



/*

 * Convert cputime <-> timespec (nsec)

 */

static inline cputime_t timespec_to_cputime(const struct timespec *val)

{

	u64 ret = val->tv_sec * NSEC_PER_SEC + val->tv_nsec;

	return (__force cputime_t) ret;

}

static inline void cputime_to_timespec(const cputime_t ct, struct timespec *val)

{

	val->tv_sec  = (__force u64) ct / NSEC_PER_SEC;

	val->tv_nsec = (__force u64) ct % NSEC_PER_SEC;

}



/*

 * Convert cputime <-> timeval (msec)

 */

static inline cputime_t timeval_to_cputime(struct timeval *val)

{

	u64 ret = val->tv_sec * NSEC_PER_SEC + val->tv_usec * NSEC_PER_USEC;

	return (__force cputime_t) ret;

}

static inline void cputime_to_timeval(const cputime_t ct, struct timeval *val)

{

	val->tv_sec = (__force u64) ct / NSEC_PER_SEC;

	val->tv_usec = ((__force u64) ct % NSEC_PER_SEC) / NSEC_PER_USEC;

}



/*

 * Convert cputime <-> clock (USER_HZ)

 */

#define cputime_to_clock_t(__ct)	\

	((__force u64)(__ct) / (NSEC_PER_SEC / USER_HZ))

#define clock_t_to_cputime(__x)		\

	(__force cputime_t)((__x) * (NSEC_PER_SEC / USER_HZ))



/*

 * Convert cputime64 to clock.

 */

#define cputime64_to_clock_t(__ct)	\

	cputime_to_clock_t((__force cputime_t)__ct)



# include <asm-generic/cputime_nsecs.h>

extern void arch_vtime_task_switch(struct task_struct *tsk);

#endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */



#endif /* CONFIG_VIRT_CPU_ACCOUNTING */

#endif /* __IA64_CPUTIME_H */

arch/ia64/include/asm/thread_info.h

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct thread_info { 
	mm_segment_t addr_limit;	/* user-level address space limit */

	int preempt_count;		/* 0=premptable, <0=BUG; will also serve as bh-counter */

	struct restart_block restart_block;

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE

	__u64 ac_stamp;

	__u64 ac_leave;

	__u64 ac_stime;
@@ -69,7 +69,7 @@ struct thread_info { 
#define task_stack_page(tsk)	((void *)(tsk))



#define __HAVE_THREAD_FUNCTIONS

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE

#define setup_thread_stack(p, org)			\

	*task_thread_info(p) = *task_thread_info(org);	\

	task_thread_info(p)->ac_stime = 0;		\

arch/ia64/include/asm/xen/minstate.h

+1 −1
Original line number Diff line number Diff line 


#ifdef CONFIG_VIRT_CPU_ACCOUNTING

#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE

/* read ar.itc in advance, and use it before leaving bank 0 */

#define XEN_ACCOUNT_GET_STAMP		\

	MOV_FROM_ITC(pUStk, p6, r20, r2);

arch/ia64/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ void foo(void) 
	DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));

	DEFINE(TI_CPU, offsetof(struct thread_info, cpu));

	DEFINE(TI_PRE_COUNT, offsetof(struct thread_info, preempt_count));

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE

	DEFINE(TI_AC_STAMP, offsetof(struct thread_info, ac_stamp));

	DEFINE(TI_AC_LEAVE, offsetof(struct thread_info, ac_leave));

	DEFINE(TI_AC_STIME, offsetof(struct thread_info, ac_stime));