From patchwork Mon Nov 14 22:22:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaohua Li X-Patchwork-Id: 9428575 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 DB4766047D for ; Mon, 14 Nov 2016 22:25:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC88828AAE for ; Mon, 14 Nov 2016 22:25:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF08628AE7; Mon, 14 Nov 2016 22:25:24 +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=unavailable 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 7B77828AAE for ; Mon, 14 Nov 2016 22:25:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965107AbcKNWXs (ORCPT ); Mon, 14 Nov 2016 17:23:48 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:55988 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965101AbcKNWW1 (ORCPT ); Mon, 14 Nov 2016 17:22:27 -0500 Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id uAEMJX9n003030 for ; Mon, 14 Nov 2016 14:22:27 -0800 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=cqCZDndd0Pcj4Jau2Q5FewPMoxFhtCmFk8dlGYXN4LI=; b=JyY7vBTOiSDe423txVG8VC8NHcUtw5fxFif/J+FqouBxplvc4JGQeBxOJ+xXnSPUNt8l hKKPUjvurJCFLRhGmb3bwpqDBM49G9CsAk9ZBziRZzT+yuXXWghQveVjDHn9RQqXgk+h wx8k2NPXUsTM/MDJsv/QDnt5IuPk0I/Tzro= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 26qjtr93s3-2 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Mon, 14 Nov 2016 14:22:27 -0800 Received: from mx-out.facebook.com (192.168.52.123) by PRN-CHUB09.TheFacebook.com (192.168.16.19) with Microsoft SMTP Server (TLS) id 14.3.294.0; Mon, 14 Nov 2016 14:22:26 -0800 Received: from facebook.com (2401:db00:21:603d:face:0:19:0) by mx-out.facebook.com (10.223.100.99) with ESMTP id d1d1d0ccaab811e6b87124be05956610-860e6a50 for ; Mon, 14 Nov 2016 14:22:25 -0800 Received: by devbig638.prn2.facebook.com (Postfix, from userid 11222) id EAE5842E3F59; Mon, 14 Nov 2016 14:22:22 -0800 (PST) From: Shaohua Li To: , CC: , , , Subject: [PATCH V4 14/15] blk-throttle: add interface for per-cgroup target latency Date: Mon, 14 Nov 2016 14:22:21 -0800 Message-ID: <93c7f38eb0d18995cd4d743cb15d986190e5f750.1479161136.git.shli@fb.com> X-Mailer: git-send-email 2.9.3 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-11-14_13:, , 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 interface for per-cgroup target latency. This latency is for 4k request. Signed-off-by: Shaohua Li --- block/blk-throttle.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index a05d351..ac4d9ea 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -147,6 +147,8 @@ struct throtl_grp { unsigned long last_check_time; int upgrade_check_batch; + + u64 latency_target; /* When did we start a new slice */ unsigned long slice_start[2]; unsigned long slice_end[2]; @@ -463,6 +465,7 @@ static struct blkg_policy_data *throtl_pd_alloc(gfp_t gfp, int node) tg->iops[rw][index] = -1; } } + /* target latency default 0, eg, always not meet */ return &tg->pd; } @@ -1572,6 +1575,64 @@ static ssize_t tg_set_limit(struct kernfs_open_file *of, return ret ?: nbytes; } +static u64 tg_prfill_latency_target(struct seq_file *sf, + struct blkg_policy_data *pd, int off) +{ + struct throtl_grp *tg = pd_to_tg(pd); + const char *dname = blkg_dev_name(pd->blkg); + + if (!dname) + return 0; + if (tg->latency_target == 0) + return 0; + + seq_printf(sf, "%s 4k_lat=%llu\n", dname, tg->latency_target); + return 0; +} + +static int tg_print_latency_target(struct seq_file *sf, void *v) +{ + blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), + tg_prfill_latency_target, &blkcg_policy_throtl, + seq_cft(sf)->private, false); + return 0; +} + +static ssize_t tg_set_latency_target(struct kernfs_open_file *of, + char *buf, size_t nbytes, loff_t off) +{ + struct blkcg *blkcg = css_to_blkcg(of_css(of)); + struct blkg_conf_ctx ctx; + struct throtl_grp *tg; + int ret = -EINVAL; + char tok[27]; + char *p; + u64 val; + + ret = blkg_conf_prep(blkcg, &blkcg_policy_throtl, buf, &ctx); + if (ret) + return ret; + + tg = blkg_to_tg(ctx.blkg); + + if (sscanf(ctx.body, "%26s", tok) != 1) + goto out_finish; + + p = tok; + strsep(&p, "="); + if (!p || kstrtou64(p, 10, &val)) + goto out_finish; + + if (strcmp(tok, "4k_lat")) + goto out_finish; + + tg->latency_target = val; + ret = 0; +out_finish: + blkg_conf_finish(&ctx); + return ret ?: nbytes; +} + static struct cftype throtl_files[] = { { .name = "high", @@ -1587,6 +1648,12 @@ static struct cftype throtl_files[] = { .write = tg_set_limit, .private = LIMIT_MAX, }, + { + .name = "latency_target", + .flags = CFTYPE_NOT_ON_ROOT, + .seq_show = tg_print_latency_target, + .write = tg_set_latency_target, + }, { } /* terminate */ };