Commit ed84825b authored by paul.szabo@sydney.edu.au's avatar paul.szabo@sydney.edu.au Committed by Fengguang Wu

Negative (setpoint-dirty) in bdi_position_ratio()

In bdi_position_ratio(), get difference (setpoint-dirty) right even when
negative. Both setpoint and dirty are unsigned long, the difference was
zero-padded thus wrongly sign-extended to s64. This issue affects all
32-bit architectures, does not affect 64-bit architectures where long
and s64 are equivalent.

In this function, dirty is between freerun and limit, the pseudo-float x
is between [-1,1], expected to be negative about half the time. With
zero-padding, instead of a small negative x we obtained a large positive
one so bdi_position_ratio() returned garbage.

Casting the difference to s64 also prevents overflow with left-shift;
though normally these numbers are small and I never observed a 32-bit
overflow there.

(This patch does not solve the PAE OOM issue.)

Paul Szabo   psz@maths.usyd.edu.au   http://www.maths.usyd.edu.au/u/psz/
School of Mathematics and Statistics   University of Sydney    Australia
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reported-by: default avatarPaul Szabo <psz@maths.usyd.edu.au>
Reference: http://bugs.debian.org/695182Signed-off-by: default avatarPaul Szabo <psz@maths.usyd.edu.au>
Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
parent 10ee27a0
...@@ -692,7 +692,7 @@ static unsigned long bdi_position_ratio(struct backing_dev_info *bdi, ...@@ -692,7 +692,7 @@ static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
* => fast response on large errors; small oscillation near setpoint * => fast response on large errors; small oscillation near setpoint
*/ */
setpoint = (freerun + limit) / 2; setpoint = (freerun + limit) / 2;
x = div_s64((setpoint - dirty) << RATELIMIT_CALC_SHIFT, x = div_s64(((s64)setpoint - (s64)dirty) << RATELIMIT_CALC_SHIFT,
limit - setpoint + 1); limit - setpoint + 1);
pos_ratio = x; pos_ratio = x;
pos_ratio = pos_ratio * x >> RATELIMIT_CALC_SHIFT; pos_ratio = pos_ratio * x >> RATELIMIT_CALC_SHIFT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment