Messages in this thread Patch in this message | | | Subject | Re: Linux 3.1-rc9 | From | Peter Zijlstra <> | Date | Mon, 17 Oct 2011 19:54:50 +0200 |
| |
On Mon, 2011-10-17 at 07:57 -0700, Linus Torvalds wrote:
> So seeing this, I'm not confident that atomic64 works at all, after all.
I could of course propose this... but I really won't since I'm half retching by now.. ;-)
--- include/linux/sched.h | 7 +++++-- kernel/posix-cpu-timers.c | 8 +++++--- kernel/sched_stats.h | 4 +--- 3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h index 41d0237..94bf16f 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -474,7 +474,10 @@ struct cpu_itimer { struct task_cputime { cputime_t utime; cputime_t stime; - unsigned long long sum_exec_runtime; + union { + unsigned long long sum_exec_runtime; + atomic64_t _sum_exec_runtime; + }; }; /* Alternate field names when used to cache expirations. */ #define prof_exp stime @@ -485,7 +488,7 @@ struct task_cputime { (struct task_cputime) { \ .utime = cputime_zero, \ .stime = cputime_zero, \ - .sum_exec_runtime = 0, \ + { .sum_exec_runtime = 0, }, \ } /* diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index c8008dd..4808c0d 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c @@ -264,8 +264,8 @@ static void update_gt_cputime(struct task_cputime *a, struct task_cputime *b) if (cputime_gt(b->stime, a->stime)) a->stime = b->stime; - if (b->sum_exec_runtime > a->sum_exec_runtime) - a->sum_exec_runtime = b->sum_exec_runtime; + if (b->sum_exec_runtime > atomic64_read(&a->_sum_exec_runtime)) + atomic64_set(&a->_sum_exec_runtime, b->sum_exec_runtime); } void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times) @@ -287,6 +287,8 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times) update_gt_cputime(&cputimer->cputime, &sum); } *times = cputimer->cputime; + times->sum_exec_runtime = + atomic64_read(&cputimer->cputime._sum_exec_runtime); spin_unlock_irqrestore(&cputimer->lock, flags); } @@ -1279,7 +1281,7 @@ static inline int fastpath_timer_check(struct task_struct *tsk) struct task_cputime task_sample = { .utime = tsk->utime, .stime = tsk->stime, - .sum_exec_runtime = tsk->se.sum_exec_runtime + { .sum_exec_runtime = tsk->se.sum_exec_runtime, }, }; if (task_cputime_expired(&task_sample, &tsk->cputime_expires)) diff --git a/kernel/sched_stats.h b/kernel/sched_stats.h index 331e01b..65dcb76 100644 --- a/kernel/sched_stats.h +++ b/kernel/sched_stats.h @@ -330,7 +330,5 @@ static inline void account_group_exec_runtime(struct task_struct *tsk, if (!cputimer->running) return; - spin_lock(&cputimer->lock); - cputimer->cputime.sum_exec_runtime += ns; - spin_unlock(&cputimer->lock); + atomic64_add(ns, &cputimer->cputime._sum_exec_runtime); }
| |