aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa on 11/24/2022 2:18 AM, Tejun Heo wrote: > On Wed, Nov 23, 2022 at 02:03:54PM +0800, Kemeng Shi wrote: >> If bps and iops both reach limit, we always return bps wait time as >> tg_within_iops_limit is after "tg_within_bps_limit(tg, bio, bps_limit) &&" >> and will not be called if tg_within_bps_limit return true. Here is a mistake, the right word should be: tg_within_iops_limit is after "tg_within_bps_limit(tg, bio, bps_limit) &&" and will not be called if tg_within_bps_limit return *false*. > Maybe it's obvious but it'd be better to explain "why" this change is being > made. In C language, When executing "if (expression1 && expression2)" and expression1 return false, the expression2 may not be executed. For "tg_within_bps_limit(tg, bio, bps_limit, &bps_wait) && tg_within_iops_limit(tg, bio, iops_limit, &iops_wait))", if bps is limited, tg_within_bps_limit will return false and tg_within_iops_limit will not be called. So even bps and iops are both limited, iops_wait will not be calculated and is zero here. So wait time of bps is always returned. >> @@ -939,8 +926,9 @@ static bool tg_may_dispatch(struct throtl_grp *tg, struct bio *bio, >> jiffies + tg->td->throtl_slice); >> } >> >> - if (tg_within_bps_limit(tg, bio, bps_limit, &bps_wait) && >> - tg_within_iops_limit(tg, bio, iops_limit, &iops_wait)) { >> + bps_wait = tg_within_bps_limit(tg, bio, bps_limit); >> + iops_wait = tg_within_iops_limit(tg, bio, iops_limit); >> + if (bps_wait + iops_wait == 0) { >> if (wait) >> *wait = 0; >> return true; > > So, max_wait is supposed to be maximum in the whole traversal path in the > tree, not just the max value in this tg, so after this, the code should be > changed to sth like the following, right? > > max_wait = max(max, max(bps_wait, iops_wait)); > > Thanks. > -- Best wishes Kemeng Shi