All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shaohua Li <shli@fb.com>
To: <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <Kernel-team@fb.com>, <axboe@fb.com>, <tj@kernel.org>,
	<vgoyal@redhat.com>
Subject: [PATCH V4 03/15] blk-throttle: configure bps/iops limit for cgroup in high limit
Date: Mon, 14 Nov 2016 14:22:10 -0800	[thread overview]
Message-ID: <7a4f1b1b0f67bb02d0caadae808c1a89413c202d.1479161136.git.shli@fb.com> (raw)
In-Reply-To: <cover.1479161136.git.shli@fb.com>

each queue will have a state machine. Initially queue is in LIMIT_HIGH
state, which means all cgroups will be throttled according to their high
limit. After all cgroups with high limit cross the limit, the queue state
gets upgraded to LIMIT_MAX state.
cgroups without high limit will use max limit for their high limit.

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

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index a564215..ec53671 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -208,12 +208,29 @@ static struct throtl_data *sq_to_td(struct throtl_service_queue *sq)
 
 static uint64_t tg_bps_limit(struct throtl_grp *tg, int rw)
 {
-	return tg->bps[rw][tg->td->limit_index];
+	struct blkcg_gq *blkg = tg_to_blkg(tg);
+	uint64_t ret;
+
+	if (cgroup_subsys_on_dfl(io_cgrp_subsys) && !blkg->parent)
+		return -1;
+	ret = tg->bps[rw][tg->td->limit_index];
+	if (ret == -1 && tg->td->limit_index == LIMIT_HIGH)
+		return tg->bps[rw][LIMIT_MAX];
+
+	return ret;
 }
 
 static unsigned int tg_iops_limit(struct throtl_grp *tg, int rw)
 {
-	return tg->iops[rw][tg->td->limit_index];
+	struct blkcg_gq *blkg = tg_to_blkg(tg);
+	unsigned int ret;
+
+	if (cgroup_subsys_on_dfl(io_cgrp_subsys) && !blkg->parent)
+		return -1;
+	ret = tg->iops[rw][tg->td->limit_index];
+	if (ret == -1 && tg->td->limit_index == LIMIT_HIGH)
+		return tg->iops[rw][LIMIT_MAX];
+	return ret;
 }
 
 /**
-- 
2.9.3


  parent reply	other threads:[~2016-11-14 22:22 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-14 22:22 [PATCH V4 00/15] blk-throttle: add .high limit Shaohua Li
2016-11-14 22:22 ` [PATCH V4 01/15] blk-throttle: prepare support multiple limits Shaohua Li
2016-11-14 22:22 ` [PATCH V4 02/15] blk-throttle: add .high interface Shaohua Li
2016-11-22 20:02   ` Tejun Heo
2016-11-22 23:08     ` Shaohua Li
2016-11-23 21:11       ` Tejun Heo
2016-11-14 22:22 ` Shaohua Li [this message]
2016-11-22 20:16   ` [PATCH V4 03/15] blk-throttle: configure bps/iops limit for cgroup in high limit Tejun Heo
2016-11-22 23:11     ` Shaohua Li
2016-11-14 22:22 ` [PATCH V4 04/15] blk-throttle: add upgrade logic for LIMIT_HIGH state Shaohua Li
2016-11-14 22:22 ` [PATCH V4 05/15] blk-throttle: add downgrade logic Shaohua Li
2016-11-22 21:21   ` Tejun Heo
2016-11-22 21:42     ` Tejun Heo
2016-11-22 23:38       ` Shaohua Li
2016-11-14 22:22 ` [PATCH V4 06/15] blk-throttle: make sure expire time isn't too big Shaohua Li
2016-11-14 22:22 ` [PATCH V4 07/15] blk-throttle: make throtl_slice tunable Shaohua Li
2016-11-22 21:27   ` Tejun Heo
2016-11-22 23:18     ` Shaohua Li
2016-11-23 21:17       ` Tejun Heo
2016-11-14 22:22 ` [PATCH V4 08/15] blk-throttle: detect completed idle cgroup Shaohua Li
2016-11-14 22:22 ` [PATCH V4 09/15] blk-throttle: make bandwidth change smooth Shaohua Li
2016-11-23 21:23   ` Tejun Heo
2016-11-24  0:59     ` Shaohua Li
2016-11-14 22:22 ` [PATCH V4 10/15] blk-throttle: add a simple idle detection Shaohua Li
2016-11-23 21:46   ` Tejun Heo
2016-11-24  1:15     ` Shaohua Li
2016-11-28 22:21       ` Tejun Heo
2016-11-28 23:10         ` Shaohua Li
2016-11-29 17:08           ` Tejun Heo
2016-11-14 22:22 ` [PATCH V4 11/15] blk-throttle: add interface to configure think time threshold Shaohua Li
2016-11-23 21:32   ` Tejun Heo
2016-11-24  1:06     ` Shaohua Li
2016-11-28 22:08       ` Tejun Heo
2016-11-28 22:14         ` Shaohua Li
2016-11-14 22:22 ` [PATCH V4 12/15] blk-throttle: ignore idle cgroup limit Shaohua Li
2016-11-14 22:22 ` [PATCH V4 13/15] blk-throttle: add a mechanism to estimate IO latency Shaohua Li
2016-11-14 23:40   ` kbuild test robot
2016-11-15  3:57   ` kbuild test robot
2016-11-29 17:24   ` Tejun Heo
2016-11-29 18:30     ` Shaohua Li
2016-11-29 22:36       ` Tejun Heo
2016-11-14 22:22 ` [PATCH V4 14/15] blk-throttle: add interface for per-cgroup target latency Shaohua Li
2016-11-14 22:22 ` [PATCH V4 15/15] blk-throttle: add latency target support Shaohua Li
2016-11-29 17:31   ` Tejun Heo
2016-11-29 18:14     ` Shaohua Li
2016-11-29 22:54       ` Tejun Heo
2016-11-29 23:39         ` Shaohua Li
2016-11-14 22:46 ` [PATCH V4 00/15] blk-throttle: add .high limit Bart Van Assche
2016-11-15  0:05   ` Shaohua Li
2016-11-15  0:41     ` Bart Van Assche
2016-11-15  0:49       ` Shaohua Li
2016-11-15  1:18         ` Bart Van Assche
2016-11-15  1:28           ` Shaohua Li
2016-11-15 19:53             ` Bart Van Assche
2016-11-15 21:31               ` Shaohua Li

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=7a4f1b1b0f67bb02d0caadae808c1a89413c202d.1479161136.git.shli@fb.com \
    --to=shli@fb.com \
    --cc=Kernel-team@fb.com \
    --cc=axboe@fb.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.