[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <25831792648e40834563bac2e81a449260a52c20.1462923578.git.shli@fb.com>
Date: Tue, 10 May 2016 17:16:33 -0700
From: Shaohua Li <shli@...com>
To: <linux-block@...r.kernel.org>, <linux-kernel@...r.kernel.org>
CC: <tj@...nel.org>, <vgoyal@...hat.com>, <axboe@...com>,
<jmoyer@...hat.com>, <Kernel-team@...com>
Subject: [PATCH 03/10] block-throttle: configure bps/iops limit for cgroup in low limit
each queue will have a state machine. Initially queue is in LOW_LIMIT
state, which means all cgroups will be throttled according to their low
limit. After all cgroups with low limit cross the limit, the queue state
gets upgraded to high/max state. This will guarantee cgroups with low
limit have at least low limit bandwidth/iops before other cgroups can
use the disk.
For cgroups without low limit, they are assigned a small bps/iops to
avoid completed stall.
Signed-off-by: Shaohua Li <shli@...com>
---
block/blk-throttle.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index e69a3db..bdcf1b7 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -213,12 +213,37 @@ 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 == 0 && tg->td->limit_index == LIMIT_LOW) {
+ if (tg->iops[rw][LIMIT_LOW])
+ return -1;
+ /* assign a small default */
+ return 64 * 1024;
+ }
+
+ 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 == 0 && tg->td->limit_index == LIMIT_LOW) {
+ if (tg->bps[rw][LIMIT_LOW])
+ return -1;
+ /* assign a small default */
+ return 16;
+ }
+ return ret;
}
/**
--
2.8.0.rc2
Powered by blists - more mailing lists