From patchwork Thu Sep 15 16:23:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaohua Li X-Patchwork-Id: 9334185 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 7C0A9607FD for ; Thu, 15 Sep 2016 16:23:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7137729A47 for ; Thu, 15 Sep 2016 16:23:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65F6629A4C; Thu, 15 Sep 2016 16:23:46 +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 84D9129A49 for ; Thu, 15 Sep 2016 16:23:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754987AbcIOQX2 (ORCPT ); Thu, 15 Sep 2016 12:23:28 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:47801 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754805AbcIOQXW (ORCPT ); Thu, 15 Sep 2016 12:23:22 -0400 Received: from pps.filterd (m0044008.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u8FGJ48p010492 for ; Thu, 15 Sep 2016 09:23:22 -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=QSZceJV0CcXGb4JBSbCobHjvqwwXGdBpBGS1dBoubdQ=; b=Ki/9Q0Kne25SOyNNpvtoex2FMxTc341BVlhsuoIZRFImdN7Sb4q6MmxNMn+vLrMRV1TG 33pB/QQpSZFoDtv7p14AIckkTptQGy7sz2tBKgBXPNkQ23zKp86rWBlhklCSg2dJfdDc /ZeVTxMxuab+AGinUrH//JU2x0f4R80Tj9M= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 25fv64t0g3-2 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Thu, 15 Sep 2016 09:23:22 -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.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.99) with ESMTP id b67eee407b6011e680c424be05956610-7b8e2a50 for ; Thu, 15 Sep 2016 09:23:19 -0700 Received: by devbig084.prn1.facebook.com (Postfix, from userid 11222) id 485F2480071D; Thu, 15 Sep 2016 09:23:18 -0700 (PDT) From: Shaohua Li To: , CC: , , , , Subject: [PATCH V2 02/11] block-throttle: add .high interface Date: Thu, 15 Sep 2016 09:23:09 -0700 Message-ID: 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 Add high limit for cgroup and corresponding cgroup interface. Signed-off-by: Shaohua Li --- block/blk-throttle.c | 139 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 107 insertions(+), 32 deletions(-) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 71ecee7..02323fb 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -84,8 +84,9 @@ enum tg_state_flags { #define rb_entry_tg(node) rb_entry((node), struct throtl_grp, rb_node) enum { - LIMIT_MAX = 0, - LIMIT_CNT = 1, + LIMIT_HIGH = 0, + LIMIT_MAX = 1, + LIMIT_CNT = 2, }; struct throtl_grp { @@ -352,7 +353,7 @@ static struct blkg_policy_data *throtl_pd_alloc(gfp_t gfp, int node) RB_CLEAR_NODE(&tg->rb_node); for (rw = READ; rw <= WRITE; rw++) { - for (index = LIMIT_MAX; index < LIMIT_CNT; index++) { + for (index = LIMIT_HIGH; index < LIMIT_CNT; index++) { tg->bps[rw][index] = -1; tg->iops[rw][index] = -1; } @@ -414,6 +415,46 @@ static void throtl_pd_online(struct blkg_policy_data *pd) tg_update_has_rules(pd_to_tg(pd)); } +static void blk_throtl_update_valid_limit(struct throtl_data *td) +{ + struct cgroup_subsys_state *pos_css; + struct blkcg_gq *blkg; + bool high_valid = false; + + rcu_read_lock(); + blkg_for_each_descendant_post(blkg, pos_css, td->queue->root_blkg) { + struct throtl_grp *tg = blkg_to_tg(blkg); + + if (tg->bps[READ][LIMIT_HIGH] != -1 || + tg->bps[WRITE][LIMIT_HIGH] != -1 || + tg->iops[READ][LIMIT_HIGH] != -1 || + tg->iops[WRITE][LIMIT_HIGH] != -1) + high_valid = true; + } + rcu_read_unlock(); + + if (high_valid) + td->limit_valid[LIMIT_HIGH] = true; + else + td->limit_valid[LIMIT_HIGH] = false; +} + +static void throtl_pd_offline(struct blkg_policy_data *pd) +{ + struct throtl_grp *tg = pd_to_tg(pd); + + tg->bps[READ][LIMIT_HIGH] = -1; + tg->bps[WRITE][LIMIT_HIGH] = -1; + tg->iops[READ][LIMIT_HIGH] = -1; + tg->iops[WRITE][LIMIT_HIGH] = -1; + + blk_throtl_update_valid_limit(tg->td); + + if (tg->td->limit_index == LIMIT_HIGH && + !tg->td->limit_valid[LIMIT_HIGH]) + tg->td->limit_index = LIMIT_MAX; +} + static void throtl_pd_free(struct blkg_policy_data *pd) { struct throtl_grp *tg = pd_to_tg(pd); @@ -1281,7 +1322,7 @@ static struct cftype throtl_legacy_files[] = { { } /* terminate */ }; -static u64 tg_prfill_max(struct seq_file *sf, struct blkg_policy_data *pd, +static u64 tg_prfill_limit(struct seq_file *sf, struct blkg_policy_data *pd, int off) { struct throtl_grp *tg = pd_to_tg(pd); @@ -1290,36 +1331,32 @@ static u64 tg_prfill_max(struct seq_file *sf, struct blkg_policy_data *pd, if (!dname) return 0; - if (tg->bps[READ][LIMIT_MAX] == -1 && tg->bps[WRITE][LIMIT_MAX] == -1 && - tg->iops[READ][LIMIT_MAX] == -1 && tg->iops[WRITE][LIMIT_MAX] == -1) + if (tg->bps[READ][off] == -1 && tg->bps[WRITE][off] == -1 && + tg->iops[READ][off] == -1 && tg->iops[WRITE][off] == -1) return 0; - if (tg->bps[READ][LIMIT_MAX] != -1) - snprintf(bufs[0], sizeof(bufs[0]), "%llu", - tg->bps[READ][LIMIT_MAX]); - if (tg->bps[WRITE][LIMIT_MAX] != -1) - snprintf(bufs[1], sizeof(bufs[1]), "%llu", - tg->bps[WRITE][LIMIT_MAX]); - if (tg->iops[READ][LIMIT_MAX] != -1) - snprintf(bufs[2], sizeof(bufs[2]), "%u", - tg->iops[READ][LIMIT_MAX]); - if (tg->iops[WRITE][LIMIT_MAX] != -1) - snprintf(bufs[3], sizeof(bufs[3]), "%u", - tg->iops[WRITE][LIMIT_MAX]); + if (tg->bps[READ][off] != -1) + snprintf(bufs[0], sizeof(bufs[0]), "%llu", tg->bps[READ][off]); + if (tg->bps[WRITE][off] != -1) + snprintf(bufs[1], sizeof(bufs[1]), "%llu", tg->bps[WRITE][off]); + if (tg->iops[READ][off] != -1) + snprintf(bufs[2], sizeof(bufs[2]), "%u", tg->iops[READ][off]); + if (tg->iops[WRITE][off] != -1) + snprintf(bufs[3], sizeof(bufs[3]), "%u", tg->iops[WRITE][off]); seq_printf(sf, "%s rbps=%s wbps=%s riops=%s wiops=%s\n", dname, bufs[0], bufs[1], bufs[2], bufs[3]); return 0; } -static int tg_print_max(struct seq_file *sf, void *v) +static int tg_print_limit(struct seq_file *sf, void *v) { - blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), tg_prfill_max, + blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), tg_prfill_limit, &blkcg_policy_throtl, seq_cft(sf)->private, false); return 0; } -static ssize_t tg_set_max(struct kernfs_open_file *of, +static ssize_t tg_set_limit(struct kernfs_open_file *of, char *buf, size_t nbytes, loff_t off) { struct blkcg *blkcg = css_to_blkcg(of_css(of)); @@ -1327,6 +1364,7 @@ static ssize_t tg_set_max(struct kernfs_open_file *of, struct throtl_grp *tg; u64 v[4]; int ret; + int index = of_cft(of)->private; ret = blkg_conf_prep(blkcg, &blkcg_policy_throtl, buf, &ctx); if (ret) @@ -1334,10 +1372,10 @@ static ssize_t tg_set_max(struct kernfs_open_file *of, tg = blkg_to_tg(ctx.blkg); - v[0] = tg->bps[READ][LIMIT_MAX]; - v[1] = tg->bps[WRITE][LIMIT_MAX]; - v[2] = tg->iops[READ][LIMIT_MAX]; - v[3] = tg->iops[WRITE][LIMIT_MAX]; + v[0] = tg->bps[READ][index]; + v[1] = tg->bps[WRITE][index]; + v[2] = tg->iops[READ][index]; + v[3] = tg->iops[WRITE][index]; while (true) { char tok[27]; /* wiops=18446744073709551616 */ @@ -1374,11 +1412,37 @@ static ssize_t tg_set_max(struct kernfs_open_file *of, goto out_finish; } - tg->bps[READ][LIMIT_MAX] = v[0]; - tg->bps[WRITE][LIMIT_MAX] = v[1]; - tg->iops[READ][LIMIT_MAX] = v[2]; - tg->iops[WRITE][LIMIT_MAX] = v[3]; - + if (index == LIMIT_MAX) { + if ((v[0] < tg->bps[READ][LIMIT_HIGH] && + tg->bps[READ][LIMIT_HIGH] != -1) || + (v[1] < tg->bps[WRITE][LIMIT_HIGH] && + tg->bps[WRITE][LIMIT_HIGH] != -1) || + (v[2] < tg->iops[READ][LIMIT_HIGH] && + tg->iops[READ][LIMIT_HIGH] != -1) || + (v[3] < tg->iops[WRITE][LIMIT_HIGH] && + tg->iops[WRITE][LIMIT_HIGH] != -1)) { + ret = -EINVAL; + goto out_finish; + } + } else if (index == LIMIT_HIGH) { + if ((v[0] > tg->bps[READ][LIMIT_MAX] && v[0] != -1) || + (v[1] > tg->bps[WRITE][LIMIT_MAX] && v[1] != -1) || + (v[2] > tg->iops[READ][LIMIT_MAX] && v[2] != -1) || + (v[3] > tg->iops[WRITE][LIMIT_MAX] && v[3] != -1)) { + ret = -EINVAL; + goto out_finish; + } + } + tg->bps[READ][index] = v[0]; + tg->bps[WRITE][index] = v[1]; + tg->iops[READ][index] = v[2]; + tg->iops[WRITE][index] = v[3]; + + if (index == LIMIT_HIGH) { + blk_throtl_update_valid_limit(tg->td); + if (tg->td->limit_valid[LIMIT_HIGH]) + tg->td->limit_index = LIMIT_HIGH; + } tg_conf_updated(tg); ret = 0; out_finish: @@ -1388,10 +1452,18 @@ static ssize_t tg_set_max(struct kernfs_open_file *of, static struct cftype throtl_files[] = { { + .name = "high", + .flags = CFTYPE_NOT_ON_ROOT, + .seq_show = tg_print_limit, + .write = tg_set_limit, + .private = LIMIT_HIGH, + }, + { .name = "max", .flags = CFTYPE_NOT_ON_ROOT, - .seq_show = tg_print_max, - .write = tg_set_max, + .seq_show = tg_print_limit, + .write = tg_set_limit, + .private = LIMIT_MAX, }, { } /* terminate */ }; @@ -1410,6 +1482,7 @@ static struct blkcg_policy blkcg_policy_throtl = { .pd_alloc_fn = throtl_pd_alloc, .pd_init_fn = throtl_pd_init, .pd_online_fn = throtl_pd_online, + .pd_offline_fn = throtl_pd_offline, .pd_free_fn = throtl_pd_free, }; @@ -1587,7 +1660,9 @@ int blk_throtl_init(struct request_queue *q) q->td = td; td->queue = q; + td->limit_valid[LIMIT_HIGH] = false; td->limit_valid[LIMIT_MAX] = true; + td->limit_index = LIMIT_MAX; /* activate policy */ ret = blkcg_activate_policy(q, &blkcg_policy_throtl); if (ret)