Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1543054

[PATCH V5 13/17] blk-throttle: ignore idle cgroup limit

Show all headers | View raw

Last patch introduces a way to detect idle cgroup. We use it to make
upgrade/downgrade decision. And the new algorithm can detect completely
idle cgroup too, so we can delete the corresponding code.

Signed-off-by: Shaohua Li <shli@fb.com>
---
 block/blk-throttle.c | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 0218ff9..62fe72ea 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -151,8 +151,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];
@@ -495,8 +493,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)
@@ -1669,9 +1665,8 @@ static bool throtl_tg_can_upgrade(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_low_overflow_time(tg) + tg->td->throtl_slice) &&
+	    throtl_tg_is_idle(tg))
 		return true;
 	return false;
 }
@@ -1718,6 +1713,26 @@ static bool throtl_can_upgrade(struct throtl_data *td,
 	return true;
 }
 
+static void throtl_upgrade_check(struct throtl_grp *tg)
+{
+	unsigned long now = jiffies;
+
+	if (tg->td->limit_index != LIMIT_LOW)
+		return;
+
+	if (time_after(tg->last_check_time + tg->td->throtl_slice, now))
+		return;
+
+	tg->last_check_time = now;
+
+	if (!time_after_eq(now,
+	     __tg_last_low_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;
@@ -1759,18 +1774,15 @@ static bool throtl_tg_can_downgrade(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 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) +
-					td->throtl_slice))
+					td->throtl_slice) &&
+	    (!throtl_tg_is_idle(tg) ||
+	     !list_empty(&tg_to_blkg(tg)->blkcg->css.children)))
 		return true;
 	return false;
 }
@@ -1904,10 +1916,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_low_overflow_time[rw] == 0)
 			tg->last_low_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.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH V5 00/17] blk-throttle: add .low limit Shaohua Li <shli@fb.com> - 2016-12-15 21:40 +0100
  [PATCH V5 14/17] blk-throttle: add interface for per-cgroup target latency Shaohua Li <shli@fb.com> - 2016-12-15 21:40 +0100
  [PATCH V5 15/17] block: track request size in blk_issue_stat Shaohua Li <shli@fb.com> - 2016-12-15 21:40 +0100
  [PATCH V5 17/17] blk-throttle: add latency target support Shaohua Li <shli@fb.com> - 2016-12-15 21:40 +0100
  [PATCH V5 11/17] blk-throttle: add a simple idle detection Shaohua Li <shli@fb.com> - 2016-12-15 21:40 +0100
  [PATCH V5 08/17] blk-throttle: make throtl_slice tunable Shaohua Li <shli@fb.com> - 2016-12-15 21:40 +0100
  [PATCH V5 12/17] blk-throttle: add interface to configure idle time threshold Shaohua Li <shli@fb.com> - 2016-12-15 21:40 +0100
  [PATCH V5 09/17] blk-throttle: detect completed idle cgroup Shaohua Li <shli@fb.com> - 2016-12-15 21:40 +0100
  [PATCH V5 13/17] blk-throttle: ignore idle cgroup limit Shaohua Li <shli@fb.com> - 2016-12-15 21:40 +0100
  [PATCH V5 04/17] blk-throttle: configure bps/iops limit for cgroup in low limit Shaohua Li <shli@fb.com> - 2016-12-15 21:40 +0100
  [PATCH V5 03/17] blk-throttle: add .low interface Shaohua Li <shli@fb.com> - 2016-12-15 21:40 +0100
  [PATCH V5 02/17] blk-throttle: prepare support multiple limits Shaohua Li <shli@fb.com> - 2016-12-15 21:40 +0100
  [PATCH V5 01/17] blk-throttle: use U64_MAX/UINT_MAX to replace -1 Shaohua Li <shli@fb.com> - 2016-12-15 21:40 +0100
  [PATCH V5 10/17] blk-throttle: make bandwidth change smooth Shaohua Li <shli@fb.com> - 2016-12-15 21:40 +0100

csiph-web