Linux block layer
 help / color / mirror / Atom feed
From: Kemeng Shi <shikemeng@huawei.com>
To: <tj@kernel.org>, <josef@toxicpanda.com>, <axboe@kernel.dk>
Cc: <cgroups@vger.kernel.org>, <linux-block@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>, <shikemeng@huawei.com>
Subject: [PATCH v2 08/10] blk-throttle: remove repeat check of elapsed time from last upgrade in throtl_hierarchy_can_downgrade
Date: Tue, 29 Nov 2022 11:01:45 +0800	[thread overview]
Message-ID: <20221129030147.27400-9-shikemeng@huawei.com> (raw)
In-Reply-To: <20221129030147.27400-1-shikemeng@huawei.com>

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.

Signed-off-by: Kemeng Shi <shikemeng@huawei.com>
Reported-by: kernel test robot <lkp@intel.com>
---
 block/blk-throttle.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 3ddd8a15aa3f..94d850b57462 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -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;
-- 
2.30.0


  parent reply	other threads:[~2022-11-29  3:02 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-29  3:01 [PATCH v2 00/10] A few bugfix and cleanup patches for blk-throttle Kemeng Shi
2022-11-29  3:01 ` [PATCH v2 01/10] blk-throttle: correct stale comment in throtl_pd_init Kemeng Shi
2022-11-30 21:08   ` Tejun Heo
2022-11-29  3:01 ` [PATCH v2 02/10] blk-throttle: Fix that bps of child could exceed bps limited in parent Kemeng Shi
2022-11-30 21:09   ` Tejun Heo
2022-11-29  3:01 ` [PATCH v2 03/10] blk-throttle: ignore cgroup without io queued in blk_throtl_cancel_bios Kemeng Shi
2022-11-29  3:01 ` [PATCH v2 04/10] blk-throttle: correct calculation of wait time in tg_may_dispatch Kemeng Shi
2022-11-30 21:27   ` Tejun Heo
2022-11-29  3:01 ` [PATCH v2 05/10] blk-throttle: simpfy low limit reached check in throtl_tg_can_upgrade Kemeng Shi
2022-11-30 22:09   ` Tejun Heo
2022-11-29  3:01 ` [PATCH v2 06/10] blk-throttle: fix typo in comment of throtl_adjusted_limit Kemeng Shi
2022-11-29  3:01 ` [PATCH v2 07/10] blk-throttle: remove incorrect comment for tg_last_low_overflow_time Kemeng Shi
2022-11-29  3:01 ` Kemeng Shi [this message]
2022-11-30 21:34   ` [PATCH v2 08/10] blk-throttle: remove repeat check of elapsed time from last upgrade in throtl_hierarchy_can_downgrade Tejun Heo
2022-11-29  3:01 ` [PATCH v2 09/10] blk-throttle: Use more siutable time_after check for update of slice_start Kemeng Shi
2022-11-30 21:34   ` Tejun Heo
2022-11-29  3:01 ` [PATCH v2 10/10] blk-throttle: avoid dead code in throtl_hierarchy_can_upgrade Kemeng Shi
2022-11-30 21:36   ` Tejun Heo
2022-12-01  1:36     ` Kemeng Shi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221129030147.27400-9-shikemeng@huawei.com \
    --to=shikemeng@huawei.com \
    --cc=axboe@kernel.dk \
    --cc=cgroups@vger.kernel.org \
    --cc=josef@toxicpanda.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tj@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox