blk-iocost: fix divide-by-zero in transfer_surpluses()
Subsystems (3)
Tejun Heo
maintainerPATCH 1/1 blk-iocost: fix divide-by-zero in transfer_surpluses()
Conceptually, root_iocg->hweight_donating must be less than WEIGHT_ONE but all hweight calculations round up and thus it may end up >= WEIGHT_ONE triggering divide-by-zero and other issues. Bound the value to avoid surprises.
--- block/blk-iocost.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
block/blk-iocost.c +10 -4
@@ -1881,15 +1881,21 @@ static void transfer_surpluses(struct list_head *surpluses, struct ioc_now *now)/* * Calculate the global donation rate (gamma) - the rate to adjust -* non-donating budgets by. No need to use 64bit multiplication here as -* the first operand is guaranteed to be smaller than WEIGHT_ONE -* (1<<16). +* non-donating budgets by. +* +* No need to use 64bit multiplication here as the first operand is +* guaranteed to be smaller than WEIGHT_ONE (1<<16). +* +* We know that there are beneficiary nodes and the sum of the donating +* hweights can't be whole; however, due to the round-ups during hweight +* calculations, root_iocg->hweight_donating might still end up equal to +* or greater than whole. Limit the range when calculating the divider. * * gamma = (1 - t_r') / (1 - t_r) */ gamma =DIV_ROUND_UP ( (WEIGHT_ONE - root_iocg->hweight_after_donation) *WEIGHT_ONE , -WEIGHT_ONE - root_iocg->hweight_donating); +WEIGHT_ONE -min_t (root_iocg->hweight_donating,WEIGHT_ONE -1 ));/* * Calculate adjusted hwi, child_adjusted_sum and inuse for the inner
Quoted 4 lines · Tejun Heo
Conceptually,
root_iocg->hweight_donatingmust be less thanWEIGHT_ONEbut all hweight calculations round up and thus it may end up >=WEIGHT_ONEtriggering divide-by-zero and other issues. Bound the value to avoid surprises.
Applied, thanks.
Signature · 1 line
Jens Axboe
Tejun Heo
maintainerPATCH v2 1/1 blk-iocost: fix divide-by-zero in transfer_surpluses()
Conceptually, root_iocg->hweight_donating must be less than WEIGHT_ONE but all hweight calculations round up and thus it may end up >= WEIGHT_ONE triggering divide-by-zero and other issues. Bound the value to avoid surprises.
---
Jens, I was flipping between doing max_t(, 1) over the whole divider and doing min_t(, WEIGHT_ONE - 1) for hweight_donating. I thought that I as testing after the last change but it obviously wasn't and the previous patch doesn't compile due to missing type argument. Can you please apply this patch instead? I can send an incremental patch if that'd be better. My apologies.
Thanks.
block/blk-iocost.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
block/blk-iocost.c +10 -4
@@ -1881,15 +1881,21 @@ static void transfer_surpluses(struct list_head *surpluses, struct ioc_now *now)/* * Calculate the global donation rate (gamma) - the rate to adjust -* non-donating budgets by. No need to use 64bit multiplication here as -* the first operand is guaranteed to be smaller than WEIGHT_ONE -* (1<<16). +* non-donating budgets by. +* +* No need to use 64bit multiplication here as the first operand is +* guaranteed to be smaller than WEIGHT_ONE (1<<16). +* +* We know that there are beneficiary nodes and the sum of the donating +* hweights can't be whole; however, due to the round-ups during hweight +* calculations, root_iocg->hweight_donating might still end up equal to +* or greater than whole. Limit the range when calculating the divider. * * gamma = (1 - t_r') / (1 - t_r) */ gamma =DIV_ROUND_UP ( (WEIGHT_ONE - root_iocg->hweight_after_donation) *WEIGHT_ONE , -WEIGHT_ONE - root_iocg->hweight_donating); +WEIGHT_ONE -min_t (u32, root_iocg->hweight_donating,WEIGHT_ONE -1 ));/* * Calculate adjusted hwi, child_adjusted_sum and inuse for the inner
Jens Axboe
maintainerQuoted 8 lines · Tejun Heo
Conceptually,
root_iocg->hweight_donatingmust be less thanWEIGHT_ONEbut all hweight calculations round up and thus it may end up >=WEIGHT_ONEtriggering divide-by-zero and other issues. Bound the value to avoid surprises.Signed-off-by Tejun Heo <[email protected]>Fixes e08d02aa5fc9 ("blk-iocost: implement Andy's method for donation weight updates")
Quoted 8 lines
Signed-off-by Tejun Heo <[email protected]>---
Jens, I was flipping between doingmax_t(, 1)over the whole divider and doingmin_t(, WEIGHT_ONE - 1)forhweight_donating. I thought that I as testing after the last change but it obviously wasn't and the previous patch doesn't compile due to missing type argument. Can you please apply this patch instead? I can send an incremental patch if that'd be better. My apologies.
Sure, I replaced it. BTW, you had two signed-off-by's in there.
Signature · 1 line
Jens Axboe
Tejun Heo
maintainerQuoted 18 lines · Jens Axboe
Quoted 8 lines · Tejun Heo
Conceptually,
root_iocg->hweight_donatingmust be less thanWEIGHT_ONEbut all hweight calculations round up and thus it may end up >=WEIGHT_ONEtriggering divide-by-zero and other issues. Bound the value to avoid surprises.Signed-off-by Tejun Heo <[email protected]>Fixes e08d02aa5fc9 ("blk-iocost: implement Andy's method for donation weight updates")Quoted 8 lines
Signed-off-by Tejun Heo <[email protected]>---
Jens, I was flipping between doingmax_t(, 1)over the whole divider and doingmin_t(, WEIGHT_ONE - 1)forhweight_donating. I thought that I as testing after the last change but it obviously wasn't and the previous patch doesn't compile due to missing type argument. Can you please apply this patch instead? I can send an incremental patch if that'd be better. My apologies.
Quoted 1 line
Sure, I replaced it. BTW, you had two signed-off-by's in there.
Yeah, sloppy all around. Sorry about that. Gotta slow down more when posting oh-shit-I-fucked-up stuff.
Thanks.
Signature · 1 line
tejun