From patchwork Mon Oct 3 21:20:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaohua Li X-Patchwork-Id: 9360949 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 DBD2C6075E for ; Mon, 3 Oct 2016 21:21:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D069C28842 for ; Mon, 3 Oct 2016 21:21:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C540528A6E; Mon, 3 Oct 2016 21:21:16 +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 5C15A28842 for ; Mon, 3 Oct 2016 21:21:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753528AbcJCVVO (ORCPT ); Mon, 3 Oct 2016 17:21:14 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:43057 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752378AbcJCVUg (ORCPT ); Mon, 3 Oct 2016 17:20:36 -0400 Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.16.0.17/8.16.0.17) with SMTP id u93LGc8p024552 for ; Mon, 3 Oct 2016 14:20:35 -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=9clE1LhQ3nfeGYYsNhUUWx9zXTOvcxtCdzUHO4e6iqI=; b=mEWI+3Unse75NfN53jafS7iYvd5fy18J5D/rW8rme/UxvHdtVqFDHcMw4e5XAnIo5hOJ 83YzK+ueh+0310Lhv/4FUjn6VzAE0XuLr7ZIGkspw4/4+EotYTdhJ0gPJaj+fg9YxDi+ 6n5pJPekNMARG2ehminsxZTZ7MExriCeBxg= Received: from mail.thefacebook.com ([199.201.64.23]) by m0001303.ppops.net with ESMTP id 25t8tbef39-2 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Mon, 03 Oct 2016 14:20:35 -0700 Received: from mx-out.facebook.com (192.168.52.123) by PRN-CHUB06.TheFacebook.com (192.168.16.16) with Microsoft SMTP Server (TLS) id 14.3.294.0; Mon, 3 Oct 2016 14:20:34 -0700 Received: from facebook.com (2401:db00:21:603d:face:0:19:0) by mx-out.facebook.com (10.223.101.97) with ESMTP id 3821076089af11e68fdf24be0595f910-daff9a50 for ; Mon, 03 Oct 2016 14:20:33 -0700 Received: by devbig638.prn2.facebook.com (Postfix, from userid 11222) id B243C42C11B0; Mon, 3 Oct 2016 14:20:31 -0700 (PDT) From: Shaohua Li To: , CC: , , , , Subject: [PATCH v3 11/11] blk-throttle: ignore idle cgroup limit Date: Mon, 3 Oct 2016 14:20:30 -0700 Message-ID: <5939a89cb0573615410f82baae3abbe0c3c1fd56.1475529372.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-10-03_12:, , 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 Last patch introduces a way to detect idle cgroup. We use it to make upgrade/downgrade decision. Signed-off-by: Shaohua Li --- block/blk-throttle.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index e8a2f31..c46d6e4 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -146,8 +146,6 @@ struct throtl_grp { unsigned long last_check_time; - unsigned long last_dispatch_time[2]; - /* When did we start a new slice */ unsigned long slice_start[2]; unsigned long slice_end[2]; @@ -489,8 +487,6 @@ static void throtl_pd_online(struct blkg_policy_data *pd) * Update has_rules[] after a new group is brought online. */ tg_update_has_rules(tg); - tg->last_dispatch_time[READ] = jiffies; - tg->last_dispatch_time[WRITE] = jiffies; } static void blk_throtl_update_valid_limit(struct throtl_data *td) @@ -1664,9 +1660,8 @@ static bool throtl_upgrade_check_one(struct throtl_grp *tg) return true; if (time_after_eq(jiffies, - tg->last_dispatch_time[READ] + tg->td->throtl_slice) && - time_after_eq(jiffies, - tg->last_dispatch_time[WRITE] + tg->td->throtl_slice)) + tg_last_high_overflow_time(tg) + tg->td->throtl_slice) && + throtl_tg_is_idle(tg)) return true; return false; } @@ -1715,6 +1710,19 @@ static bool throtl_can_upgrade(struct throtl_data *td, return true; } +static void throtl_upgrade_check(struct throtl_grp *tg) +{ + if (tg->td->limit_index != LIMIT_HIGH) + return; + + if (!time_after_eq(jiffies, + __tg_last_high_overflow_time(tg) + tg->td->throtl_slice)) + return; + + if (throtl_can_upgrade(tg->td, NULL)) + throtl_upgrade_state(tg->td); +} + static void throtl_upgrade_state(struct throtl_data *td) { struct cgroup_subsys_state *pos_css; @@ -1749,15 +1757,14 @@ static bool throtl_downgrade_check_one(struct throtl_grp *tg) struct throtl_data *td = tg->td; unsigned long now = jiffies; - if (time_after_eq(now, tg->last_dispatch_time[READ] + td->throtl_slice) && - time_after_eq(now, tg->last_dispatch_time[WRITE] + td->throtl_slice)) - return false; /* * If cgroup is below high limit, consider downgrade and throttle other * cgroups */ if (time_after_eq(now, td->high_upgrade_time + td->throtl_slice) && - time_after_eq(now, tg_last_high_overflow_time(tg) + td->throtl_slice)) + time_after_eq(now, tg_last_high_overflow_time(tg) + td->throtl_slice) && + (!throtl_tg_is_idle(tg) || + !list_empty(&tg_to_blkg(tg)->blkcg->css.children))) return true; return false; } @@ -1895,10 +1902,10 @@ bool blk_throtl_bio(struct request_queue *q, struct blkcg_gq *blkg, again: while (true) { - tg->last_dispatch_time[rw] = jiffies; if (tg->last_high_overflow_time[rw] == 0) tg->last_high_overflow_time[rw] = jiffies; throtl_downgrade_check(tg); + throtl_upgrade_check(tg); /* throtl is FIFO - if bios are already queued, should queue */ if (sq->nr_queued[rw]) break;