56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
|
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
||
|
|
Date: Tue, 14 Sep 2010 14:35:14 +0000 (+0200)
|
||
|
|
Subject: sched: Fix user time incorrectly accounted as system time on 32-bit
|
||
|
|
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fx86%2Flinux-2.6-tip.git;a=commitdiff_plain;h=e75e863dd5c7d96b91ebbd241da5328fc38a78cc
|
||
|
|
|
||
|
|
sched: Fix user time incorrectly accounted as system time on 32-bit
|
||
|
|
|
||
|
|
We have 32-bit variable overflow possibility when multiply in
|
||
|
|
task_times() and thread_group_times() functions. When the
|
||
|
|
overflow happens then the scaled utime value becomes erroneously
|
||
|
|
small and the scaled stime becomes i erroneously big.
|
||
|
|
|
||
|
|
Reported here:
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=633037
|
||
|
|
https://bugzilla.kernel.org/show_bug.cgi?id=16559
|
||
|
|
|
||
|
|
Reported-by: Michael Chapman <redhat-bugzilla@very.puzzling.org>
|
||
|
|
Reported-by: Ciriaco Garcia de Celis <sysman@etherpilot.com>
|
||
|
|
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
||
|
|
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
|
||
|
|
Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
|
||
|
|
Cc: <stable@kernel.org> # 2.6.32.19+ (partially) and 2.6.33+
|
||
|
|
LKML-Reference: <20100914143513.GB8415@redhat.com>
|
||
|
|
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
||
|
|
---
|
||
|
|
|
||
|
|
diff --git a/kernel/sched.c b/kernel/sched.c
|
||
|
|
index ed09d4f..dc85ceb 100644
|
||
|
|
--- a/kernel/sched.c
|
||
|
|
+++ b/kernel/sched.c
|
||
|
|
@@ -3513,9 +3513,9 @@ void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
|
||
|
|
rtime = nsecs_to_cputime(p->se.sum_exec_runtime);
|
||
|
|
|
||
|
|
if (total) {
|
||
|
|
- u64 temp;
|
||
|
|
+ u64 temp = rtime;
|
||
|
|
|
||
|
|
- temp = (u64)(rtime * utime);
|
||
|
|
+ temp *= utime;
|
||
|
|
do_div(temp, total);
|
||
|
|
utime = (cputime_t)temp;
|
||
|
|
} else
|
||
|
|
@@ -3546,9 +3546,9 @@ void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
|
||
|
|
rtime = nsecs_to_cputime(cputime.sum_exec_runtime);
|
||
|
|
|
||
|
|
if (total) {
|
||
|
|
- u64 temp;
|
||
|
|
+ u64 temp = rtime;
|
||
|
|
|
||
|
|
- temp = (u64)(rtime * cputime.utime);
|
||
|
|
+ temp *= cputime.utime;
|
||
|
|
do_div(temp, total);
|
||
|
|
utime = (cputime_t)temp;
|
||
|
|
} else
|