Commit 9c9f209d authored by Kemeng Shi's avatar Kemeng Shi Committed by Jens Axboe
Browse files

blk-throttle: remove repeat check of elapsed time 



There is no need to check elapsed time from last upgrade for each node in
hierarchy. Move this check before traversing as throtl_can_upgrade do
to remove repeat check.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarKemeng Shi <shikemeng@huawei.com>
Link: https://lore.kernel.org/r/20221205115709.251489-9-shikemeng@huaweicloud.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e3031d4c

block/blk-throttle.c

+6 −2
Original line number Diff line number Diff line
@@ -1955,8 +1955,7 @@ static bool throtl_tg_can_downgrade(struct throtl_grp *tg) 
	 * If cgroup is below low limit, consider downgrade and throttle other

	 * cgroups

	 */

	if (time_after_eq(now, td->low_upgrade_time + td->throtl_slice) &&

	    time_after_eq(now, tg_last_low_overflow_time(tg) +

	if (time_after_eq(now, tg_last_low_overflow_time(tg) +

					td->throtl_slice) &&

	    (!throtl_tg_is_idle(tg) ||

	     !list_empty(&tg_to_blkg(tg)->blkcg->css.children)))
@@ -1966,6 +1965,11 @@ static bool throtl_tg_can_downgrade(struct throtl_grp *tg) 


static bool throtl_hierarchy_can_downgrade(struct throtl_grp *tg)

{

	struct throtl_data *td = tg->td;



	if (time_before(jiffies, td->low_upgrade_time + td->throtl_slice))

		return false;



	while (true) {

		if (!throtl_tg_can_downgrade(tg))

			return false;