scheduler fixes
Subsystems (2)
Linus,
Please pull the latest sched-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-for-linus
HEAD: 7f6575f1fb963d5231afbceecd3feadb6ab58cd3 cputime: Use local_clock() for full dynticks cputime accounting
Thanks,
Ingo
------------------>
Clark Williams (1):
sched: Move RR_TIMESLICE from sysctl.h to rt.h
Frederic Weisbecker (1):
cputime: Use local_clock() for full dynticks cputime accounting
Li Zhong (1):
cputime: Constify timeval_to_cputime(timeval) argument
Nathan Zimmer (2):
sched: Fix /proc/sched_stat failure on very very large systems
sched: Fix /proc/sched_debug failure on very very large systems
Sha Zhengju (1):
sched/core: Remove the obsolete and unused nr_uninterruptible() function
include/asm-generic/cputime_nsecs.h | 2 +- include/linux/sched.h | 1 - include/linux/sched/rt.h | 6 +++ include/linux/sched/sysctl.h | 6 --- kernel/sched/core.c | 22 +-------- kernel/sched/cputime.c | 2 +- kernel/sched/debug.c | 90 ++++++++++++++++++++++++++++++++----- kernel/sched/stats.c | 79 +++++++++++++++++++++++--------- 8 files changed, 148 insertions(+), 60 deletions(-)
include/asm-generic/cputime_nsecs.h +1 -1
@@ -76,7 +76,7 @@ static inline void cputime_to_timespec(const cputime_t ct, struct timespec *val)/* * Convert cputime <-> timeval (msec) */ -static inline cputime_t timeval_to_cputime (struct timeval *val) +static inline cputime_t timeval_to_cputime (const struct timeval *val) {u64 ret = val->tv_sec *NSEC_PER_SEC + val->tv_usec *NSEC_PER_USEC ;return (__force cputime_t ) ret;
include/linux/sched.h +0 -1
@@ -98,7 +98,6 @@ extern int nr_threads; DECLARE_PER_CPU(unsigned long, process_counts);extern int nr_processes (void );extern unsigned long nr_running (void ); -extern unsigned long nr_uninterruptible (void );extern unsigned long nr_iowait (void );extern unsigned long nr_iowait_cpu (int cpu);extern unsigned long this_cpu_load (void );
include/linux/sched/rt.h +6 -0
@@ -55,4 +55,10 @@ static inline bool tsk_is_pi_blocked(struct task_struct *tsk)extern void normalize_rt_tasks (void ); +/* +* default timeslice is 100 msecs (used only for SCHED_RR tasks). +* Timeslices get refilled after they expire. +*/ +#define RR_TIMESLICE (100 * HZ / 1000) +#endif /* _SCHED_RT_H */
include/linux/sched/sysctl.h +0 -6
@@ -91,12 +91,6 @@ extern unsigned int sysctl_sched_cfs_bandwidth_slice;extern unsigned int sysctl_sched_autogroup_enabled;#endif -/* -* default timeslice is 100 msecs (used only for SCHED_RR tasks). -* Timeslices get refilled after they expire. -*/ -#define RR_TIMESLICE (100 * HZ / 1000) -extern int sched_rr_timeslice; extern int sched_rr_handler(struct ctl_table *table, int write,
kernel/sched/core.c +2 -20
@@ -1969,11 +1969,10 @@ context_switch(struct rq *rq, struct task_struct *prev, }/* -* nr_running, nr_uninterruptible and nr_context_switches: +* nr_running and nr_context_switches: * * externally visible scheduler statistics: current number of runnable -* threads, current number of uninterruptible-sleeping threads, total -* number of context switches performed since bootup. +* threads, total number of context switches performed since bootup. */ unsigned long nr_running (void ) {
@@ -1985,23 +1984,6 @@ unsigned long nr_running(void)return sum; } -unsigned long nr_uninterruptible (void ) -{ -unsigned long i, sum =0 ; - -for_each_possible_cpu (i) - sum +=cpu_rq (i)->nr_uninterruptible; - -/* -* Since we read the counters lockless, it might be slightly -* inaccurate. Do not allow it to go below zero though: -*/ -if (unlikely ((long )sum <0 )) - sum =0 ; - -return sum; -} -unsigned long long nr_context_switches (void ) {int i;
kernel/sched/cputime.c +1 -1
@@ -604,7 +604,7 @@ static unsigned long long vtime_delta(struct task_struct *tsk) {unsigned long long clock; - clock =sched_clock (); + clock =local_clock ();if (clock < tsk->vtime_snap)return 0 ;
kernel/sched/debug.c +79 -11
140 lines not on this page · raw message
kernel/sched/stats.c +59 -20
103 lines not on this page · raw message