From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1153505-1520117424-2-14309507340687052976 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.249, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1520117423; b=W5Ln7LGDLNZrQMjCBAtI6qhaofhnp6YI+RmuqTWeYl74Wg9 1TeVAnY3pdG8Y28QPlhvB8LQpTa3u5ecKyzWpcgNcKa6iPyGVGdQjd7bw4ZbvamD SzIecnc6FhUg8uDP+OeBeWiEX/U9O3f/JXOmFU9RWuqmKD5p/nS88nsrx5opYUCj v0OMWETJhHLHNuwt9FZc7QJxzwRGbY4+u7m2CuIMDBPq2Ew4GwvN6l8aeNe41GyP byxfeZUgjQFeBjwn/iCTGqOphoSKiVpXF5qxgUyiKtW4dXKY7sK7fEupeEq55jNC n/AFE0Hk0j5yyYHUG1UpM7jHYhZlRf0zHZwzJSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1520117423; bh=fU9wez 0SF83Zsr+6DRERqX+O/5qoLdD9Y7NvoBdnIXU=; b=UwE3HESI0+wNHwp4XJL+2k 0dD1D4O5I2dM/e2Nhs27PILPA5V3qipOy/1bKO0NsCLLfiIV2282FO6oDUR1THxq 4YmvB8QKwrClr5iJdnF6N5M6OCx2gOfxs8oIkVi05JM1GK5CAEFRrn8VC6On0oCL EZJsJsgS3xg3awLnDzp/CLN7ZnfYCjYoHIrKycht5oWqG773xPyGorSEe6QyI8vv WluJ8iI0L77dM+E2Fsh1l5g+2RLauK4JmSVeq5o03QRc0flVv79MKimScuyLHmh7 wqVTkPbVlczGDSHsZr+JtRQeW78aeBwLhH7CBDbIHc7fkEVuBxKIQKJTckeBYYZQ == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=IoGzLKN9 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=IoGzLKN9 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934956AbeCCWlO (ORCPT ); Sat, 3 Mar 2018 17:41:14 -0500 Received: from mail-by2nam01on0095.outbound.protection.outlook.com ([104.47.34.95]:48488 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935444AbeCCWlL (ORCPT ); Sat, 3 Mar 2018 17:41:11 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Shaohua Li , Jens Axboe , Sasha Levin Subject: [PATCH AUTOSEL for 3.18 23/63] blk-throttle: make sure expire time isn't too big Thread-Topic: [PATCH AUTOSEL for 3.18 23/63] blk-throttle: make sure expire time isn't too big Thread-Index: AQHTsz+jbYiSndvDjEuQsOLiV6vzYw== Date: Sat, 3 Mar 2018 22:33:23 +0000 Message-ID: <20180303223228.27323-23-alexander.levin@microsoft.com> References: <20180303223228.27323-1-alexander.levin@microsoft.com> In-Reply-To: <20180303223228.27323-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB0940;7:n2q/3+ghysEB+J5tw3oNQwg6w80y1AiLvuBx8mxl9aCRvoFPq2l15RNOlbQUFk1aJMY53JJRMbga3cj0Lx0kHQ3qorsb2XjG6FVrGhA+DeAxEWZt6hnLF4V7ckkN+3MOFALBGxulnsvbiRcuhIC5tejT4z1++TmpOFruUB6bHvz3oLhUREClcNqbbpw11Sd5jyBN5XUyk7ww1yejBpVJXKk0gHRveaWUAOZ3fmKLlpd7/5YdvzaRh9o8drpWX3M1 x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 350a4385-bd94-4d33-7613-08d58157dac6 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603307)(7193020);SRVR:MW2PR2101MB0940; x-ms-traffictypediagnostic: MW2PR2101MB0940: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(67672495146484); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231220)(944501244)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:MW2PR2101MB0940;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB0940; x-forefront-prvs: 0600F93FE1 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(39380400002)(346002)(366004)(39860400002)(396003)(199004)(189003)(106356001)(68736007)(6486002)(25786009)(22452003)(6436002)(186003)(2906002)(81156014)(81166006)(10090500001)(66066001)(8676002)(36756003)(6512007)(2900100001)(316002)(97736004)(59450400001)(102836004)(53936002)(6506007)(3280700002)(26005)(4326008)(5250100002)(305945005)(2501003)(76176011)(2950100002)(86362001)(99286004)(3846002)(72206003)(14454004)(3660700001)(478600001)(1076002)(5660300001)(10290500003)(6666003)(6116002)(7736002)(86612001)(107886003)(110136005)(54906003)(105586002)(8936002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB0940;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: tP1kCzd2F1yOKQBHBs67bDZbZzRnHmBeBqSdosZBdW8/KcIhlO2vGi0wBw8xfIURRp/LHu/TI7TVBOTXKb+7jCQ1+utw18a260y5qk6JQrs8gXhefp/3nv3iAfPZWVe3dFLhZUSwMnGM+7qnFmPEZV9tj7JBzzIy1lc1ZxjzN6E= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 350a4385-bd94-4d33-7613-08d58157dac6 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:33:23.5755 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB0940 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Shaohua Li [ Upstream commit 06cceedcca67a93ac7f7aa93bbd9980c7496d14e ] cgroup could be throttled to a limit but when all cgroups cross high limit, queue enters a higher state and so the group should be throttled to a higher limit. It's possible the cgroup is sleeping because of throttle and other cgroups don't dispatch IO any more. In this case, nobody can trigger current downgrade/upgrade logic. To fix this issue, we could either set up a timer to wakeup the cgroup if other cgroups are idle or make sure this cgroup doesn't sleep too long. Setting up a timer means we must change the timer very frequently. This patch chooses the latter. Making cgroup sleep time not too big wouldn't change cgroup bps/iops, but could make it wakeup more frequently, which isn't a big issue because throtl_slice * 8 is already quite big. Signed-off-by: Shaohua Li Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/blk-throttle.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 5b9c6d5c3636..fd51c8be247d 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -648,6 +648,17 @@ static void throtl_dequeue_tg(struct throtl_grp *tg) static void throtl_schedule_pending_timer(struct throtl_service_queue *sq, unsigned long expires) { + unsigned long max_expire =3D jiffies + 8 * throtl_slice; + + /* + * Since we are adjusting the throttle limit dynamically, the sleep + * time calculated according to previous limit might be invalid. It's + * possible the cgroup sleep time is very long and no other cgroups + * have IO running so notify the limit changes. Make sure the cgroup + * doesn't sleep too long to avoid the missed notification. + */ + if (time_after(expires, max_expire)) + expires =3D max_expire; mod_timer(&sq->pending_timer, expires); throtl_log(sq, "schedule timer. delay=3D%lu jiffies=3D%lu", expires - jiffies, jiffies); --=20 2.14.1