Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756555AbcLOUdv (ORCPT ); Thu, 15 Dec 2016 15:33:51 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:47688 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756409AbcLOUdV (ORCPT ); Thu, 15 Dec 2016 15:33:21 -0500 Smtp-Origin-Hostprefix: devbig From: Shaohua Li Smtp-Origin-Hostname: devbig638.prn2.facebook.com To: , CC: , , , Smtp-Origin-Cluster: prn2c22 Subject: [PATCH V5 04/17] blk-throttle: configure bps/iops limit for cgroup in low limit Date: Thu, 15 Dec 2016 12:32:55 -0800 Message-ID: <04bae2f6239c13d3160d7c0196c97217c5e4b4c3.1481833017.git.shli@fb.com> 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-12-15_14:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1321 Lines: 41 each queue will have a state machine. Initially queue is in LIMIT_LOW 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 LIMIT_MAX state. For max limit, cgroup will use the limit configured by user. For low limit, cgroup will use the minimal between low limit and max limit configured by user. Last patch already did the convertion. Signed-off-by: Shaohua Li --- block/blk-throttle.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index fcc4199..e55bd36 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -212,11 +212,21 @@ static struct throtl_data *sq_to_td(struct throtl_service_queue *sq) static uint64_t tg_bps_limit(struct throtl_grp *tg, int rw) { + struct blkcg_gq *blkg = tg_to_blkg(tg); + uint64_t ret; + + if (cgroup_subsys_on_dfl(io_cgrp_subsys) && !blkg->parent) + return U64_MAX; return tg->bps[rw][tg->td->limit_index]; } static unsigned int tg_iops_limit(struct throtl_grp *tg, int rw) { + struct blkcg_gq *blkg = tg_to_blkg(tg); + unsigned int ret; + + if (cgroup_subsys_on_dfl(io_cgrp_subsys) && !blkg->parent) + return UINT_MAX; return tg->iops[rw][tg->td->limit_index]; } -- 2.9.3