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: f3002134158092178be81339ec5a22ff80e6c308 Revert "math64: New div64_u64_rem helper"
This fixes the cputime scaling overflow problems for good without having bad 32-bit overhead, and gets rid of the div64_u64_rem() helper as well.
Ingo
------------------>
Stanislaw Gruszka (4):
sched: Avoid cputime scaling overflow
sched: Do not account bogus utime
sched: Avoid prev->stime underflow
Revert "math64: New div64_u64_rem helper"
include/linux/math64.h | 19 +----------- kernel/sched/cputime.c | 80 ++++++++++++++++++++++++++++++++------------------ lib/div64.c | 19 ++++-------- 3 files changed, 58 insertions(+), 60 deletions(-)
include/linux/math64.h +1 -18
@@ -30,15 +30,6 @@ static inline s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder) }/** -* div64_u64_rem - unsigned 64bit divide with 64bit divisor -*/ -static inline u64 div64_u64_rem (u64 dividend,u64 divisor,u64 *remainder) -{ - *remainder = dividend % divisor; -return dividend / divisor; -} - -/** * div64_u64 - unsigned 64bit divide with 64bit divisor */ static inline u64 div64_u64 (u64 dividend,u64 divisor)
@@ -70,16 +61,8 @@ static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)extern s64 div_s64_rem (s64 dividend,s32 divisor,s32 *remainder);#endif -#ifndef div64_u64_rem -extern u64 div64_u64_rem (u64 dividend,u64 divisor,u64 *remainder); -#endif -#ifndef div64_u64 -static inline u64 div64_u64 (u64 dividend,u64 divisor) -{ -u64 remainder; -return div64_u64_rem (dividend, divisor, &remainder); -} +extern u64 div64_u64 (u64 dividend,u64 divisor);#endif #ifndef div64_s64
kernel/sched/cputime.c +51 -29
113 lines not on this page · raw message
lib/div64.c +6 -13
@@ -79,10 +79,9 @@ EXPORT_SYMBOL(div_s64_rem);#endif /** -* div64_u64_rem - unsigned 64bit divide with 64bit divisor and 64bit remainder +* div64_u64 - unsigned 64bit divide with 64bit divisor * @dividend: 64bit dividend * @divisor: 64bit divisor -* @remainder: 64bit remainder * * This implementation is a modified version of the algorithm proposed * by the book 'Hacker's Delight'. The original source and full proof
@@ -90,33 +89,27 @@ EXPORT_SYMBOL(div_s64_rem);* * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt' */ -#ifndef div64_u64_rem -u64 div64_u64_rem (u64 dividend,u64 divisor,u64 *remainder) +#ifndef div64_u64 +u64 div64_u64 (u64 dividend,u64 divisor) {u32 high = divisor >>32 ;u64 quot;if (high ==0 ) { -u32 rem32; - quot =div_u64_rem (dividend, divisor, &rem32); - *remainder = rem32; + quot =div_u64 (dividend, divisor); }else {int n =1 +fls (high); quot =div_u64 (dividend >> n, divisor >> n);if (quot !=0 ) quot--; - - *remainder = dividend - quot * divisor; -if (*remainder >= divisor) { +if ((dividend - quot * divisor) >= divisor) quot++; - *remainder -= divisor; - } }return quot; } -EXPORT_SYMBOL (div64_u64_rem); +EXPORT_SYMBOL (div64_u64);#endif /**