timer fixes
Subsystems (7)
Linus,
Please pull the latest timers-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-fixes-for-linus
Thanks,
Ingo
------------------>
Jaswinder Singh Rajput (1):
time-sched.c: tick_nohz_update_jiffies should be static
Peter Zijlstra (3):
itimers: remove the per-cpu-ish-ness
locking, hpet: annotate false positive warning
hrtimers: fix inconsistent lock state on resume in hres_timers_resume
Steven Noonan (1):
kernel/fork.c: unused variable 'ret'
arch/x86/kernel/hpet.c | 2 +- include/linux/init_task.h | 6 ++++ include/linux/sched.h | 29 +++++++++++------- include/linux/workqueue.h | 6 ++++ kernel/fork.c | 16 ++++------ kernel/hrtimer.c | 4 ++- kernel/posix-cpu-timers.c | 70 --------------------------------------------- kernel/sched_stats.h | 33 +++++++++----------- kernel/time/tick-sched.c | 2 +- 9 files changed, 57 insertions(+), 111 deletions(-)
arch/x86/kernel/hpet.c +1 -1
@@ -628,7 +628,7 @@ static int hpet_cpuhp_notify(struct notifier_block *n,switch (action &0xf ) {case CPU_ONLINE : -INIT_DELAYED_WORK (&work.work, hpet_work); +INIT_DELAYED_WORK_ON_STACK (&work.work, hpet_work);init_completion (&work.complete);/* FIXME: add schedule_work_on() */ schedule_delayed_work_on (cpu, &work.work,0 );
include/linux/init_task.h +6 -0
@@ -48,6 +48,12 @@ extern struct fs_struct init_fs; .posix_timers = LIST_HEAD_INIT(sig.posix_timers), \ .cpu_timers = INIT_CPU_TIMERS(sig.cpu_timers), \ .rlim = INIT_RLIMITS, \ + .cputime = { .totals = { \ + .utime = cputime_zero, \ + .stime = cputime_zero, \ + .sum_exec_runtime = 0, \ + .lock = __SPIN_LOCK_UNLOCKED(sig.cputime.totals.lock), \ + }, }, \ }extern struct nsproxy init_nsproxy;
include/linux/sched.h +18 -11
@@ -450,6 +450,7 @@ struct task_cputime {cputime_t utime;cputime_t stime;unsigned long long sum_exec_runtime; +spinlock_t lock; };/* Alternate field names when used to cache expirations. */ #define prof_exp stime
@@ -465,7 +466,7 @@ struct task_cputime {* used for thread group CPU clock calculations. */ struct thread_group_cputime { -struct task_cputime *totals; +struct task_cputime totals; };/*
@@ -2180,24 +2181,30 @@ static inline int spin_needbreak(spinlock_t *lock)* Thread group CPU time accounting. */ -extern int thread_group_cputime_alloc (struct task_struct *); -extern void thread_group_cputime (struct task_struct *,struct task_cputime *); - -static inline void thread_group_cputime_init (struct signal_struct *sig) +static inline +void thread_group_cputime (struct task_struct *tsk,struct task_cputime *times) { - sig->cputime.totals =NULL ; +struct task_cputime *totals = &tsk->signal->cputime.totals; +unsigned long flags; + +spin_lock_irqsave (&totals->lock, flags); + *times = *totals; +spin_unlock_irqrestore (&totals->lock, flags); } -static inline int thread_group_cputime_clone_thread (struct task_struct *curr) +static inline void thread_group_cputime_init (struct signal_struct *sig) { -if (curr->signal->cputime.totals) -return 0 ; -return thread_group_cputime_alloc (curr); + sig->cputime.totals = (struct task_cputime ){ + .utime = cputime_zero, + .stime = cputime_zero, + .sum_exec_runtime =0 , + }; + +spin_lock_init (&sig->cputime.totals.lock); }static inline void thread_group_cputime_free (struct signal_struct *sig) { -free_percpu (sig->cputime.totals); }/*
include/linux/workqueue.h +6 -0
@@ -118,6 +118,12 @@ struct execute_work {init_timer (&(_work)->timer); \ } while (0) +#define INIT_DELAYED_WORK_ON_STACK (_work, _func) \ + do { \ + INIT_WORK(&(_work)->work, (_func)); \ + init_timer_on_stack(&(_work)->timer); \ + } while (0) +#define INIT_DELAYED_WORK_DEFERRABLE (_work, _func) \ do { \ INIT_WORK(&(_work)->work, (_func)); \
kernel/fork.c +7 -9
@@ -817,17 +817,17 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig)static int copy_signal (unsigned long clone_flags,struct task_struct *tsk) {struct signal_struct *sig; -int ret;if (clone_flags &CLONE_THREAD ) { - ret =thread_group_cputime_clone_thread (current); -if (likely (!ret)) { -atomic_inc (¤t->signal->count); -atomic_inc (¤t->signal->live); - } -return ret; +atomic_inc (¤t->signal->count); +atomic_inc (¤t->signal->live); +return 0 ; } sig =kmem_cache_alloc (signal_cachep,GFP_KERNEL ); + +if (sig) +posix_cpu_timers_init_group (sig); + tsk->signal = sig;if (!sig)return -ENOMEM ;
@@ -864,8 +864,6 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)memcpy (sig->rlim, current->signal->rlim,sizeof sig->rlim);task_unlock (current->group_leader); -posix_cpu_timers_init_group (sig); -acct_init_pacct (&sig->pacct);tty_audit_fork (sig);
kernel/hrtimer.c +3 -1
@@ -614,7 +614,9 @@ void clock_was_set(void)*/ void hres_timers_resume (void ) { -/* Retrigger the CPU local events: */ +WARN_ONCE (!irqs_disabled (), +KERN_INFO "hres_timers_resume() called with IRQs enabled!" ); +retrigger_next_event (NULL ); }
kernel/posix-cpu-timers.c +0 -70
76 lines not on this page · raw message
kernel/sched_stats.h +15 -18
@@ -296,6 +296,7 @@ sched_info_switch(struct task_struct *prev, struct task_struct *next)static inline void account_group_user_time (struct task_struct *tsk,cputime_t cputime) { +struct task_cputime *times;struct signal_struct *sig;/* tsk == current, ensure it is safe to use ->signal */
@@ -303,13 +304,11 @@ static inline void account_group_user_time(struct task_struct *tsk,return ; sig = tsk->signal; -if (sig->cputime.totals) { -struct task_cputime *times; + times = &sig->cputime.totals; - times =per_cpu_ptr (sig->cputime.totals,get_cpu ()); - times->utime =cputime_add (times->utime, cputime); -put_cpu_no_resched (); - } +spin_lock (×->lock); + times->utime =cputime_add (times->utime, cputime); +spin_unlock (×->lock); }/**
@@ -325,6 +324,7 @@ static inline void account_group_user_time(struct task_struct *tsk,static inline void account_group_system_time (struct task_struct *tsk,cputime_t cputime) { +struct task_cputime *times;struct signal_struct *sig;/* tsk == current, ensure it is safe to use ->signal */
@@ -332,13 +332,11 @@ static inline void account_group_system_time(struct task_struct *tsk,return ; sig = tsk->signal; -if (sig->cputime.totals) { -struct task_cputime *times; + times = &sig->cputime.totals; - times =per_cpu_ptr (sig->cputime.totals,get_cpu ()); - times->stime =cputime_add (times->stime, cputime); -put_cpu_no_resched (); - } +spin_lock (×->lock); + times->stime =cputime_add (times->stime, cputime); +spin_unlock (×->lock); }/**
@@ -354,6 +352,7 @@ static inline void account_group_system_time(struct task_struct *tsk,static inline void account_group_exec_runtime (struct task_struct *tsk,unsigned long long ns) { +struct task_cputime *times;struct signal_struct *sig; sig = tsk->signal;
@@ -362,11 +361,9 @@ static inline void account_group_exec_runtime(struct task_struct *tsk,if (unlikely (!sig))return ; -if (sig->cputime.totals) { -struct task_cputime *times; + times = &sig->cputime.totals; - times =per_cpu_ptr (sig->cputime.totals,get_cpu ()); - times->sum_exec_runtime += ns; -put_cpu_no_resched (); - } +spin_lock (×->lock); + times->sum_exec_runtime += ns; +spin_unlock (×->lock); }
kernel/time/tick-sched.c +1 -1
@@ -134,7 +134,7 @@ __setup("nohz=", setup_tick_nohz);* value. We do this unconditionally on any cpu, as we don't know whether the * cpu, which has the update task assigned is in a long sleep. */ -void tick_nohz_update_jiffies (void ) +static void tick_nohz_update_jiffies (void ) {int cpu =smp_processor_id ();struct tick_sched *ts = &per_cpu (tick_cpu_sched, cpu);