From patchwork Wed May 11 00:16:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaohua Li X-Patchwork-Id: 9064251 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 52C669F1C3 for ; Wed, 11 May 2016 00:17:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7536A20172 for ; Wed, 11 May 2016 00:17:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 591EE20160 for ; Wed, 11 May 2016 00:17:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753238AbcEKARA (ORCPT ); Tue, 10 May 2016 20:17:00 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:52723 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753210AbcEKAQ7 (ORCPT ); Tue, 10 May 2016 20:16:59 -0400 Received: from pps.filterd (m0044008.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u4B0Gvbq018072 for ; Tue, 10 May 2016 17:16:58 -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=77OuUlgvpXDa4FG2KlpAfmqRUiUha3Kay37ygFGayqw=; b=IcuC+3M4wah49mMng0YOGwVWCTwCEDI7uIVHuBHcCGUiPuW3O0ddJAJA9yHRAcPxIsgs Z+AZplYjP+czAnlAhse6OazXLYeMYjP9JfgxjZ1wUW6kRYUsUVfIwHnu2u1vK/QvKWdO MX7dUM0PSUK4hE12AVmaOmvfMiK4y9p3LCI= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 22usuar1v4-4 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Tue, 10 May 2016 17:16:58 -0700 Received: from mx-out.facebook.com (192.168.52.123) by PRN-CHUB05.TheFacebook.com (192.168.16.15) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 10 May 2016 17:16:42 -0700 Received: from facebook.com (2401:db00:11:d0a2:face:0:39:0) by mx-out.facebook.com (10.212.236.89) with ESMTP id a3414524170d11e6a00f0002c95209d8-9c4f7c50 for ; Tue, 10 May 2016 17:16:42 -0700 Received: by devbig084.prn1.facebook.com (Postfix, from userid 11222) id 4F7064B0177E; Tue, 10 May 2016 17:16:41 -0700 (PDT) From: Shaohua Li To: , CC: , , , , Subject: [PATCH 03/10] block-throttle: configure bps/iops limit for cgroup in low limit Date: Tue, 10 May 2016 17:16:33 -0700 Message-ID: <25831792648e40834563bac2e81a449260a52c20.1462923578.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-05-10_13:, , signatures=0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-8.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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; } /**