Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A1CCC43603 for ; Sat, 7 Dec 2019 01:13:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 145FD2173E for ; Sat, 7 Dec 2019 01:13:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="pe9HQPX4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726410AbfLGBNZ (ORCPT ); Fri, 6 Dec 2019 20:13:25 -0500 Received: from mail-pj1-f74.google.com ([209.85.216.74]:45380 "EHLO mail-pj1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726371AbfLGBNZ (ORCPT ); Fri, 6 Dec 2019 20:13:25 -0500 Received: by mail-pj1-f74.google.com with SMTP id t7so4517231pjg.12 for ; Fri, 06 Dec 2019 17:13:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=qkPBWqSaPLsjY9/IqoXF5kFK8MbvPPCmUvWE5QHTamc=; b=pe9HQPX47HYDIkrLYMthZt10djFx+jepVBx7yJbcDIQ2EkWE99xpHXLTyV3AQS0QKH 88P7Hc3506KNG58nqx0SMxTw9PoysvTWKDSYXorh/ycUZ3/RXibr/mAJ6x0/xlrD8O23 I5JUduBUzyjCQsMueApdiKAwqOUTs/DHZWtCylMUJjLDz2Uj0mqT8dpW4vAhpUGXfzPb b3yZXn6PM800MQtbFePDJqAmqruBDPGzavtkaI7kk8Jl/6nZCjOGVqFogdaWZETMhwWw 6kbFB/giZzDXeroYKWIGc45IJjaXYrfKjYKcdcddBZvEIYyqqrtrbsPQyV6U3EASf8FK jW4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=qkPBWqSaPLsjY9/IqoXF5kFK8MbvPPCmUvWE5QHTamc=; b=tF/K9wcXtnVt0sC7y2vykmb1o52jQ+sSob/H4hUjQplGJXfOtpV/g2n9oj7PZ59ciZ aO9U7YEMJhzzEBu7bWWjw3LBX3X0jju3hM23yG8CMGMe1c5r91V8B1YOPObq6wFRBntc o3aTkzAYF8UiZnW8Hl9+AIbDoNB5i/5kI9Qybek7UPfsZob/OoMkEwbZgsAcTV6KyHWu gIl6LNreBR/k0L2DEbnP3BhfDjVo/ejCJTP1zUf5uDmuesHrn5Dk+CTqIqPA/Swz7tJz ceIrOBdt/lA6uP2E1j2TRrfAFNVo178Awe2aqd9vweUEvEhscFuTPEW0LUXg1aXwTl6S SFmw== X-Gm-Message-State: APjAAAUtkEb+rRaxF7bkQurfqzK76LU+njQA0zfGxp5qmwQvsHbFawS/ XPFjKgTpbnRuxoXSIezmomiLr/3j7BCi X-Google-Smtp-Source: APXvYqyFXxOOfWAE3sfEbPHSi7KYTSTlE9LckJFWGjfoqUSGR/iAKR1Tb5tKeWzwMn4ljjaS+RRDm7v6ycjp X-Received: by 2002:a63:b20f:: with SMTP id x15mr6624818pge.65.1575681204432; Fri, 06 Dec 2019 17:13:24 -0800 (PST) Date: Fri, 6 Dec 2019 17:13:21 -0800 Message-Id: <20191207011321.123774-1-xueweiz@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.24.0.393.g34dc348eaf-goog Subject: [PATCH v3.16] sched/fair: Scale bandwidth quota and period without losing quota/period ratio precision From: Xuewei Zhang To: Greg KH Cc: stable@vger.kernel.org, Xuewei Zhang , Phil Auld , Peter Zijlstra , Anton Blanchard , Ben Segall , Dietmar Eggemann , Juri Lelli , Linus Torvalds , Mel Gorman , Steven Rostedt , Thomas Gleixner , Vincent Guittot , Ingo Molnar Content-Type: text/plain; charset="UTF-8" Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org commit 4929a4e6faa0f13289a67cae98139e727f0d4a97 upstream. The quota/period ratio is used to ensure a child task group won't get more bandwidth than the parent task group, and is calculated as: normalized_cfs_quota() = [(quota_us << 20) / period_us] If the quota/period ratio was changed during this scaling due to precision loss, it will cause inconsistency between parent and child task groups. See below example: A userspace container manager (kubelet) does three operations: 1) Create a parent cgroup, set quota to 1,000us and period to 10,000us. 2) Create a few children cgroups. 3) Set quota to 1,000us and period to 10,000us on a child cgroup. These operations are expected to succeed. However, if the scaling of 147/128 happens before step 3, quota and period of the parent cgroup will be changed: new_quota: 1148437ns, 1148us new_period: 11484375ns, 11484us And when step 3 comes in, the ratio of the child cgroup will be 104857, which will be larger than the parent cgroup ratio (104821), and will fail. Scaling them by a factor of 2 will fix the problem. Tested-by: Phil Auld Signed-off-by: Xuewei Zhang Signed-off-by: Peter Zijlstra (Intel) Acked-by: Phil Auld Cc: Anton Blanchard Cc: Ben Segall Cc: Dietmar Eggemann Cc: Juri Lelli Cc: Linus Torvalds Cc: Mel Gorman Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Thomas Gleixner Cc: Vincent Guittot Fixes: 2e8e19226398 ("sched/fair: Limit sched_cfs_period_timer() loop to avoid hard lockup") Link: https://lkml.kernel.org/r/20191004001243.140897-1-xueweiz@google.com Signed-off-by: Ingo Molnar --- kernel/sched/fair.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index ea2d33aa1f55..773135f534ef 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3753,20 +3753,28 @@ static enum hrtimer_restart sched_cfs_period_timer(struct hrtimer *timer) if (++count > 3) { u64 new, old = ktime_to_ns(cfs_b->period); - new = (old * 147) / 128; /* ~115% */ - new = min(new, max_cfs_quota_period); - - cfs_b->period = ns_to_ktime(new); - - /* since max is 1s, this is limited to 1e9^2, which fits in u64 */ - cfs_b->quota *= new; - cfs_b->quota = div64_u64(cfs_b->quota, old); - - pr_warn_ratelimited( - "cfs_period_timer[cpu%d]: period too short, scaling up (new cfs_period_us %lld, cfs_quota_us = %lld)\n", - smp_processor_id(), - div_u64(new, NSEC_PER_USEC), - div_u64(cfs_b->quota, NSEC_PER_USEC)); + /* + * Grow period by a factor of 2 to avoid losing precision. + * Precision loss in the quota/period ratio can cause __cfs_schedulable + * to fail. + */ + new = old * 2; + if (new < max_cfs_quota_period) { + cfs_b->period = ns_to_ktime(new); + cfs_b->quota *= 2; + + pr_warn_ratelimited( + "cfs_period_timer[cpu%d]: period too short, scaling up (new cfs_period_us = %lld, cfs_quota_us = %lld)\n", + smp_processor_id(), + div_u64(new, NSEC_PER_USEC), + div_u64(cfs_b->quota, NSEC_PER_USEC)); + } else { + pr_warn_ratelimited( + "cfs_period_timer[cpu%d]: period too short, but cannot scale up without losing precision (cfs_period_us = %lld, cfs_quota_us = %lld)\n", + smp_processor_id(), + div_u64(old, NSEC_PER_USEC), + div_u64(cfs_b->quota, NSEC_PER_USEC)); + } /* reset count so we don't come right back in here */ count = 0; -- 2.24.0.393.g34dc348eaf-goog