scheduler fixes
Subsystems (3)
Linus,
Please pull the latest sched-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus
the linecount looks a bit scary because the task_*time() functions had to be made available from the core kernel toward kernel/exit.c - but it's reasonable safe otherwise. [ array.c depends on proc-y so we couldnt just export it from there. ]
Thanks,
Ingo
------------------>
Balbir Singh (1):
sched: fix process time monotonicity
Peter Zijlstra (1):
sched_clock: fix NOHZ interaction
fs/proc/array.c | 59 ---------------------------------------------- include/linux/sched.h | 4 +++ kernel/exit.c | 6 ++-- kernel/sched.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ kernel/time/tick-sched.c | 3 ++ 5 files changed, 69 insertions(+), 62 deletions(-)
fs/proc/array.c +0 -59
@@ -337,65 +337,6 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,return 0 ; } -/* -* Use precise platform statistics if available: -*/ -#ifdef CONFIG_VIRT_CPU_ACCOUNTING -static cputime_t task_utime (struct task_struct *p) -{ -return p->utime; -} - -static cputime_t task_stime (struct task_struct *p) -{ -return p->stime; -} -#else -static cputime_t task_utime (struct task_struct *p) -{ -clock_t utime =cputime_to_clock_t (p->utime), - total = utime +cputime_to_clock_t (p->stime); -u64 temp; - -/* -* Use CFS's precise accounting: -*/ - temp = (u64 )nsec_to_clock_t (p->se.sum_exec_runtime); - -if (total) { - temp *= utime; -do_div (temp, total); - } - utime = (clock_t )temp; - - p->prev_utime =max (p->prev_utime,clock_t_to_cputime (utime)); -return p->prev_utime; -} - -static cputime_t task_stime (struct task_struct *p) -{ -clock_t stime; - -/* -* Use CFS's precise accounting. (we subtract utime from -* the total, to make sure the total observed by userspace -* grows monotonically - apps rely on that): -*/ - stime =nsec_to_clock_t (p->se.sum_exec_runtime) - -cputime_to_clock_t (task_utime (p)); - -if (stime >=0 ) - p->prev_stime =max (p->prev_stime,clock_t_to_cputime (stime)); - -return p->prev_stime; -} -#endif - -static cputime_t task_gtime (struct task_struct *p) -{ -return p->gtime; -} -static int do_task_stat (struct seq_file *m,struct pid_namespace *ns,struct pid *pid,struct task_struct *task,int whole) {
include/linux/sched.h +4 -0
@@ -1475,6 +1475,10 @@ static inline void put_task_struct(struct task_struct *t)__put_task_struct (t); } +extern cputime_t task_utime (struct task_struct *p); +extern cputime_t task_stime (struct task_struct *p); +extern cputime_t task_gtime (struct task_struct *p); +/* * Per process flags */
kernel/exit.c +3 -3
@@ -112,9 +112,9 @@ static void __exit_signal(struct task_struct *tsk)* We won't ever get here for the group leader, since it * will have been the last reference on the signal_struct. */ - sig->utime =cputime_add (sig->utime, tsk->utime); - sig->stime =cputime_add (sig->stime, tsk->stime); - sig->gtime =cputime_add (sig->gtime, tsk->gtime); + sig->utime =cputime_add (sig->utime,task_utime (tsk)); + sig->stime =cputime_add (sig->stime,task_stime (tsk)); + sig->gtime =cputime_add (sig->gtime,task_gtime (tsk)); sig->min_flt += tsk->min_flt; sig->maj_flt += tsk->maj_flt; sig->nvcsw += tsk->nvcsw;
kernel/sched.c +59 -0
65 lines not on this page · raw message
kernel/time/tick-sched.c +3 -0
@@ -162,6 +162,8 @@ void tick_nohz_stop_idle(int cpu) ts->idle_lastupdate = now; ts->idle_sleeptime =ktime_add (ts->idle_sleeptime, delta); ts->idle_active =0 ; + +sched_clock_idle_wakeup_event (0 ); } }
@@ -177,6 +179,7 @@ static ktime_t tick_nohz_start_idle(struct tick_sched *ts) } ts->idle_entrytime = now; ts->idle_active =1 ; +sched_clock_idle_sleep_event ();return now; }