From: Shaohua Li <shli@fb.com>
To: <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <axboe@fb.com>, <Kernel-team@fb.com>, <tj@kernel.org>,
<jmoyer@redhat.com>, <vgoyal@redhat.com>
Subject: [PATCH V2 11/11] blk-throttle: ignore idle cgroup limit
Date: Thu, 15 Sep 2016 09:23:18 -0700 [thread overview]
Message-ID: <8c687c3d686fda706084b748e757e8b9e1cffd47.1473953743.git.shli@fb.com> (raw)
In-Reply-To: <cover.1473953743.git.shli@fb.com>
Last patch introduces a way to detect idle cgroup. We use it to make
upgrade/downgrade decision.
Signed-off-by: Shaohua Li <shli@fb.com>
---
block/blk-throttle.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 0810e1b..276e71e 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -145,8 +145,6 @@ struct throtl_grp {
unsigned long last_check_time;
- unsigned long last_dispatch_time[2];
-
/* When did we start a new slice */
unsigned long slice_start[2];
unsigned long slice_end[2];
@@ -488,8 +486,6 @@ static void throtl_pd_online(struct blkg_policy_data *pd)
* Update has_rules[] after a new group is brought online.
*/
tg_update_has_rules(tg);
- tg->last_dispatch_time[READ] = jiffies;
- tg->last_dispatch_time[WRITE] = jiffies;
}
static void blk_throtl_update_valid_limit(struct throtl_data *td)
@@ -1661,9 +1657,8 @@ static bool throtl_upgrade_check_one(struct throtl_grp *tg)
return true;
if (time_after_eq(jiffies,
- tg->last_dispatch_time[READ] + tg->td->throtl_slice) &&
- time_after_eq(jiffies,
- tg->last_dispatch_time[WRITE] + tg->td->throtl_slice))
+ tg_last_high_overflow_time(tg) + tg->td->throtl_slice) &&
+ throtl_tg_is_idle(tg))
return true;
return false;
}
@@ -1712,6 +1707,19 @@ static bool throtl_can_upgrade(struct throtl_data *td,
return true;
}
+static void throtl_upgrade_check(struct throtl_grp *tg)
+{
+ if (tg->td->limit_index != LIMIT_HIGH)
+ return;
+
+ if (!time_after_eq(jiffies,
+ __tg_last_high_overflow_time(tg) + tg->td->throtl_slice))
+ return;
+
+ if (throtl_can_upgrade(tg->td, NULL))
+ throtl_upgrade_state(tg->td);
+}
+
static void throtl_upgrade_state(struct throtl_data *td)
{
struct cgroup_subsys_state *pos_css;
@@ -1746,15 +1754,13 @@ static bool throtl_downgrade_check_one(struct throtl_grp *tg)
struct throtl_data *td = tg->td;
unsigned long now = jiffies;
- if (time_after_eq(now, tg->last_dispatch_time[READ] + td->throtl_slice) &&
- time_after_eq(now, tg->last_dispatch_time[WRITE] + td->throtl_slice))
- return false;
/*
* If cgroup is below high limit, consider downgrade and throttle other
* cgroups
*/
if (time_after_eq(now, td->high_upgrade_time + td->throtl_slice) &&
- time_after_eq(now, tg_last_high_overflow_time(tg) + td->throtl_slice))
+ time_after_eq(now, tg_last_high_overflow_time(tg) + td->throtl_slice) &&
+ !throtl_tg_is_idle(tg))
return true;
return false;
}
@@ -1885,10 +1891,10 @@ bool blk_throtl_bio(struct request_queue *q, struct blkcg_gq *blkg,
again:
while (true) {
- tg->last_dispatch_time[rw] = jiffies;
if (tg->last_high_overflow_time[rw] == 0)
tg->last_high_overflow_time[rw] = jiffies;
throtl_downgrade_check(tg);
+ throtl_upgrade_check(tg);
/* throtl is FIFO - if bios are already queued, should queue */
if (sq->nr_queued[rw])
break;
--
2.8.0.rc2
prev parent reply other threads:[~2016-09-15 16:23 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-15 16:23 [PATCH V2 00/11] block-throttle: add .high limit Shaohua Li
2016-09-15 16:23 ` [PATCH V2 01/11] block-throttle: prepare support multiple limits Shaohua Li
2016-09-15 16:23 ` [PATCH V2 02/11] block-throttle: add .high interface Shaohua Li
2016-09-15 16:23 ` [PATCH V2 03/11] block-throttle: configure bps/iops limit for cgroup in high limit Shaohua Li
2016-09-15 16:23 ` [PATCH V2 04/11] block-throttle: add upgrade logic for LIMIT_HIGH state Shaohua Li
2016-09-15 16:23 ` [PATCH V2 05/11] block-throttle: add downgrade logic Shaohua Li
2016-09-15 16:23 ` [PATCH V2 06/11] blk-throttle: make sure expire time isn't too big Shaohua Li
2016-09-15 16:23 ` [PATCH V2 07/11] blk-throttle: make throtl_slice tunable Shaohua Li
2016-09-15 16:23 ` [PATCH V2 08/11] blk-throttle: detect completed idle cgroup Shaohua Li
2016-09-15 16:23 ` [PATCH V2 09/11] block-throttle: make bandwidth change smooth Shaohua Li
2016-09-15 16:23 ` [PATCH V2 10/11] block-throttle: add a simple idle detection Shaohua Li
2016-09-16 1:14 ` kbuild test robot
2016-09-15 16:23 ` Shaohua Li [this message]
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=8c687c3d686fda706084b748e757e8b9e1cffd47.1473953743.git.shli@fb.com \
--to=shli@fb.com \
--cc=Kernel-team@fb.com \
--cc=axboe@fb.com \
--cc=jmoyer@redhat.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.org \
--cc=vgoyal@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.