mm: fix arithmetic for bdi min_ratio and max_ratio
Subsystems (3)
PATCH 1/1 mm: fix arithmetic for bdi min_ratio and max_ratio
bdi->[min|max]_ratio are both part per million. Fix the wrong arithmetic when setting bdi's min_ratio and max_ratio.
--- mm/page-writeback.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/page-writeback.c +2 -2
@@ -692,7 +692,6 @@ static int __bdi_set_min_ratio(struct backing_dev_info *bdi, unsigned int min_raif (min_ratio >100 *BDI_RATIO_SCALE )return -EINVAL ; - min_ratio *=BDI_RATIO_SCALE ;spin_lock_bh (&bdi_lock);if (min_ratio > bdi->max_ratio) {
@@ -729,7 +728,8 @@ static int __bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ra ret = -EINVAL ; }else { bdi->max_ratio = max_ratio; - bdi->max_prop_frac = (FPROP_FRAC_BASE * max_ratio) /100 ; + bdi->max_prop_frac =div64_u64 (FPROP_FRAC_BASE * max_ratio, +100UL *BDI_RATIO_SCALE ); }spin_unlock_bh (&bdi_lock);
Signature · 1 line
2.19.1.6.gb485710b
+cc fsdevel
Quoted 33 lines · Jingbo Xu
bdi->[min|max]_ratio are both part per million. Fix the wrong arithmetic when setting bdi's
min_ratioandmax_ratio.Fixes efc3e6ad53ea ("mm: split off __bdi_set_max_ratio() function")Fixes 8021fb3232f2 ("mm: split off __bdi_set_min_ratio() function")Reported-by Joseph Qi <[email protected]>Signed-off-by Jingbo Xu <[email protected]>--- mm/page-writeback.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)mm/page-writeback.c +2
-2@@ -692,7 +692,6 @@ static int __bdi_set_min_ratio(struct backing_dev_info *bdi, unsigned int min_raif (min_ratio >100 *BDI_RATIO_SCALE )return -EINVAL ; - min_ratio *=BDI_RATIO_SCALE ;spin_lock_bh (&bdi_lock);if (min_ratio > bdi->max_ratio) {@@ -729,7 +728,8 @@ static int __bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ra ret = -EINVAL ; }else { bdi->max_ratio = max_ratio; - bdi->max_prop_frac = (FPROP_FRAC_BASE * max_ratio) /100 ; + bdi->max_prop_frac =div64_u64 (FPROP_FRAC_BASE * max_ratio, +100UL *BDI_RATIO_SCALE ); }spin_unlock_bh (&bdi_lock);
Signature · 2 lines
Thanks, Jingbo
Andrew Morton
maintainerQuoted 5 lines · On Mon, 18 Dec 2023 11:16:40 +0800 Jingbo Xu <[email protected]> wrote:
bdi->[min|max]_ratio are both part per million. Fix the wrong arithmetic when setting bdi's
min_ratioandmax_ratio.Fixes efc3e6ad53ea ("mm: split off __bdi_set_max_ratio() function")Fixes 8021fb3232f2 ("mm: split off __bdi_set_min_ratio() function")
As we have two Fixes:, it would be better to have two patches please.
Quoted 11 lines
mm/page-writeback.c +0
-1@@ -692,7 +692,6 @@ static int __bdi_set_min_ratio(struct backing_dev_info *bdi, unsigned int min_raif (min_ratio >100 *BDI_RATIO_SCALE )return -EINVAL ; - min_ratio *=BDI_RATIO_SCALE ;spin_lock_bh (&bdi_lock);if (min_ratio > bdi->max_ratio) {
mm/page-writeback.c static int __bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ra · line 734
Quoted 8 lines
mm/page-writeback.c +2
-1@@ -729,7 +728,8 @@ static int __bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ra ret = -EINVAL ; }else { bdi->max_ratio = max_ratio; - bdi->max_prop_frac = (FPROP_FRAC_BASE * max_ratio) /100 ; + bdi->max_prop_frac =div64_u64 (FPROP_FRAC_BASE * max_ratio, +100UL *BDI_RATIO_SCALE ); }spin_unlock_bh (&bdi_lock);
Does this change have any observable runtime effects? If so, what are they?
Quoted 9 lines · Andrew Morton
Quoted 5 lines · On Mon, 18 Dec 2023 11:16:40 +0800 Jingbo Xu <[email protected]> wrote:
bdi->[min|max]_ratio are both part per million. Fix the wrong arithmetic when setting bdi's
min_ratioandmax_ratio.Fixes efc3e6ad53ea ("mm: split off __bdi_set_max_ratio() function")Fixes 8021fb3232f2 ("mm: split off __bdi_set_min_ratio() function")As we have two Fixes:, it would be better to have two patches please.
Sounds reasonable. Thanks.
Quoted 8 lines
mm/page-writeback.c static int __bdi_set_min_ratio(struct backing_dev_info *bdi, unsigned int min_ra · line 695
Quoted 8 lines
mm/page-writeback.c +0
-1@@ -692,7 +692,6 @@ static int __bdi_set_min_ratio(struct backing_dev_info *bdi, unsigned int min_raif (min_ratio >100 *BDI_RATIO_SCALE )return -EINVAL ; - min_ratio *=BDI_RATIO_SCALE ;
This indeed has visible runtime effect as follows:
# cat /sys/class/bdi/253\:0/min_ratio 0 # cat /sys/class/bdi/253\:0/max_ratio 100 # echo 1 > /sys/class/bdi/253\:0/min_ratio -bash: echo: write error: Invalid argument
Setting min_ratio will fail with -EINVAL, as the above code tries to set min_ratio with (min_ratio * BDI_RATIO_SCALE)%, i.e. 10000% in the above example.
Quoted 12 lines
mm/page-writeback.c static int __bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ra · line 734
Quoted 12 lines
mm/page-writeback.c +2
-1spin_lock_bh (&bdi_lock);if (min_ratio > bdi->max_ratio) {@@ -729,7 +728,8 @@ static int __bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ra ret = -EINVAL ; }else { bdi->max_ratio = max_ratio; - bdi->max_prop_frac = (FPROP_FRAC_BASE * max_ratio) /100 ; + bdi->max_prop_frac =div64_u64 (FPROP_FRAC_BASE * max_ratio, +100UL *BDI_RATIO_SCALE ); }spin_unlock_bh (&bdi_lock);
This one has no visible runtime effect, but I believe this would affect the incrementing of writeout completion count when max_ratio is not 100%.
Signature · 2 lines
Thanks, Jingbo