Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752451AbcJCVWI (ORCPT ); Mon, 3 Oct 2016 17:22:08 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:54284 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753590AbcJCVVZ (ORCPT ); Mon, 3 Oct 2016 17:21:25 -0400 From: Shaohua Li To: , CC: , , , , Subject: [PATCH v3 03/11] block-throttle: configure bps/iops limit for cgroup in high limit Date: Mon, 3 Oct 2016 14:20:22 -0700 Message-ID: X-Mailer: git-send-email 2.9.3 In-Reply-To: References: X-FB-Internal: Safe MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-10-03_11:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1510 Lines: 49 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 --- 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 59d4b4c..e2b3704 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