From patchwork Thu Sep 15 16:23:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaohua Li X-Patchwork-Id: 9334213 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DF0CF6089F for ; Thu, 15 Sep 2016 16:25:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D590829A51 for ; Thu, 15 Sep 2016 16:25:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA5DA29A50; Thu, 15 Sep 2016 16:25:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E4AA2993F for ; Thu, 15 Sep 2016 16:25:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756229AbcIOQZB (ORCPT ); Thu, 15 Sep 2016 12:25:01 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:33475 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754872AbcIOQXW (ORCPT ); Thu, 15 Sep 2016 12:23:22 -0400 Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u8FGFE6W022591 for ; Thu, 15 Sep 2016 09:23:21 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=pVSh7YxsJAMl0yUoWNiYBz4ByjnqcYDT18l6iNU+Ihc=; b=j6TX3Sa01ttIVRB3KXqbCff0nVhlZPZWPSiomkh//Gw+TAdd+mtQ9tzPanaNkb7+LgLJ OkHWUfwhpr8Kfsd6HP56eTeSWlCePZYCfmw2AG38oWH9IwMjMkbnsZu0oLE5LfHnF28d 7xtaKWqBlVP6iWQKD85Z6LXH2zgLXxudIBA= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 25fww30vgw-2 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Thu, 15 Sep 2016 09:23:21 -0700 Received: from mx-out.facebook.com (192.168.52.123) by PRN-CHUB03.TheFacebook.com (192.168.16.13) with Microsoft SMTP Server (TLS) id 14.3.294.0; Thu, 15 Sep 2016 09:23:20 -0700 Received: from facebook.com (2401:db00:11:d0a2:face:0:39:0) by mx-out.facebook.com (10.223.100.97) with ESMTP id b68feb007b6011e6a8e524be0593f280-f85fba50 for ; Thu, 15 Sep 2016 09:23:19 -0700 Received: by devbig084.prn1.facebook.com (Postfix, from userid 11222) id 751D94754309; Thu, 15 Sep 2016 09:23:18 -0700 (PDT) From: Shaohua Li To: , CC: , , , , Subject: [PATCH V2 03/11] block-throttle: configure bps/iops limit for cgroup in high limit Date: Thu, 15 Sep 2016 09:23:10 -0700 Message-ID: <3d5ec2c037901f7e30478b1d5a3f8d7cacf657cf.1473953743.git.shli@fb.com> X-Mailer: git-send-email 2.8.0.rc2 In-Reply-To: References: X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-09-15_08:, , signatures=0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 02323fb..6bae1b4 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; } /**