From patchwork Tue Aug 28 17:22:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Weiner X-Patchwork-Id: 10578893 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EF95E5A4 for ; Tue, 28 Aug 2018 17:23:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D23D1286C0 for ; Tue, 28 Aug 2018 17:23:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C64DC2A579; Tue, 28 Aug 2018 17:23:41 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30BA6286C0 for ; Tue, 28 Aug 2018 17:23:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 568956B473F; Tue, 28 Aug 2018 13:23:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4F1EE6B4741; Tue, 28 Aug 2018 13:23:31 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 393DB6B4742; Tue, 28 Aug 2018 13:23:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-yb0-f198.google.com (mail-yb0-f198.google.com [209.85.213.198]) by kanga.kvack.org (Postfix) with ESMTP id 00C836B473F for ; Tue, 28 Aug 2018 13:23:31 -0400 (EDT) Received: by mail-yb0-f198.google.com with SMTP id 189-v6so1082052ybz.11 for ; Tue, 28 Aug 2018 10:23:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=7HJ/faUwNp70pvtX2vst2/bX0oNS92n5Rlox7XiLwSM=; b=nmH2mut9zBpGpkUeEVKnyjSHKcJfmVGnaWFbttXH+tfdKPGpcgPG63BEMlv249C0ce qj18Tr/ZK6kBaMlchk24Vfs8yY6VrgI719/qm65XL2oNQxtfUZDLLPMjaN+3P1AEB5da YR0QTsASYByEFqQHuFjfj+mthIdbriCYcyq+CZku+hS9PxyuNLk2EkKOZjO5xdDQNSmw kmolU+lx+/OigG01fxQcoM7B+9cjrYBfKInZksD0jDiTJTFDLRjEfBAdIMTI5eBN2GvC AcynAWCN7z6UaYk9Sv4yYGCWGpu0W+kJ1rqSI4fDewjdOVg+/e+7b9wyLr3hy0ZzG9zg arvg== X-Gm-Message-State: APzg51AF5IlTa7npk3bbSO2d2L+JCxGcfJE7PRryFGq6lxtHd7epZ733 99dxhN8xxxdrGKqZUOVoAV7jr1fOJ+wHcDTop+Bfi5tIjYMiD9vMwSUueEp7w1X3jh05lrpzLTU CseaADCu1JWuBz9VHNB7MbsxP/fjqKLWMN7grNk7QjuQVES0a7CyWsDliyQVnESg+SQfeYY66WA OzzVlqyqSnNC6irmU2b9pI8GYjRkg3bpnPJvXPTjBERnfsgj0PKhoeeHATX0IECDuh/qn3BDNbQ Q55233SKQpTyAMSImFSnLMLpLSZzleN/uv6l/Npl6YB7vCiPg75iXTBoHU7QKJ2XYNeD/eZIHxy NzEvfEGPcKG+Gu+hBVJ5ABXnR3bV+SoW+it3J5FUSF2w3Cdb6ZhgPMBnt5v7OqUcnCPwAxwXb8n s X-Received: by 2002:a25:be49:: with SMTP id d9-v6mr1357162ybm.407.1535477010715; Tue, 28 Aug 2018 10:23:30 -0700 (PDT) X-Received: by 2002:a25:be49:: with SMTP id d9-v6mr1357119ybm.407.1535477009717; Tue, 28 Aug 2018 10:23:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535477009; cv=none; d=google.com; s=arc-20160816; b=qm9wGOyEfDXd77MbguvPJZDkeUPkKPrM0FggQv2bGlT0rkdKYG1d5SiMOZrZMTCBOO Ma7BzKJ+pgYB0GLKkHZTxwimX2irGJv+Re20IAha/WIkRxtjLmhXYNooLVP/8f5aokmZ qNQb8YeLkDnbE6fIlzs+xjgaMCJE5iACxCpm9X7MVZ2MhHOI4sXWroX1svT6v4jI/CQw K5uyJ3DhJ+ZVHdwLZpGR1ca1PJj73F2ujDhBBPtNF5gVy+AvF8ydlprhGuJp+DuXNI9R vZsMxg6WIPZOBtKNWDTHyy+52ZTSkMeTd4WvnWJJ6CfsDp8xpq21nPE/q2etVYNdMwF4 E5nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=7HJ/faUwNp70pvtX2vst2/bX0oNS92n5Rlox7XiLwSM=; b=J+Jo6clhhByXss+CbMgMYBmtHcA+BEheBOkr/45pDHitT7Jwmc1biqYVFpgPC5Z8sB uZHTJlS0tufrm7RG7d3DmViOgCz1O2/dDAP9SYkJ+PF49YTPti6wOYibLKxRjUMMSfqO 4pLHQtE6EEEqd/obHHl7ZCqHOHCLTiLGkdXAgxdRp4X0Xah/+Q/S6kuuFiYg5loKbOZX MMdF72zwNlWcpYq38zv4ElVASsHQSrgY7XAgYH1Cj1UJfAmeHu1AbIP5GPWM11k/WjZJ YZsj4my4VO9MYL8GvdmcJLPc+HDm5rD45rZS9Arb1m4dHQ9xKAFrAPTqfS7K/Ui4Dj8q pJJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cmpxchg-org.20150623.gappssmtp.com header.s=20150623 header.b=jIhStVWD; spf=pass (google.com: domain of hannes@cmpxchg.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cmpxchg.org Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 201-v6sor431923ybn.159.2018.08.28.10.23.29 for (Google Transport Security); Tue, 28 Aug 2018 10:23:29 -0700 (PDT) Received-SPF: pass (google.com: domain of hannes@cmpxchg.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@cmpxchg-org.20150623.gappssmtp.com header.s=20150623 header.b=jIhStVWD; spf=pass (google.com: domain of hannes@cmpxchg.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cmpxchg.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7HJ/faUwNp70pvtX2vst2/bX0oNS92n5Rlox7XiLwSM=; b=jIhStVWDliq16204BH4yFa9JfJgW30tWLG33tq/hGkX5TwlOjEM92VNzEy1W/9O7pE cBjmnCwdKz8UyEdgbMFr76tZo60U94akOVfnGXPJwGhyJ2jAI6V5EDTlW3ue7cP8Yftu SO2cJUVsKNHMkuXOGhhs3rRs17g6cMePZcqzo3fCIh0X2kk147agMiJdTUrE/1sdntV7 tnRo+E4nB7P/z/MofV9CTqpmRHNbu2EVBa3T/hj8k/wUbpTq3DsTxnyZN+8+xiuxL+gf 97uIhkbqeig4moFP26DoLBm/yoFJkz7IdLsGW1BQoCbZHX5dSVYcG0/muFaHzH2Wi18f 3xhw== X-Google-Smtp-Source: ANB0VdaNGaFHS4gzWZuIso6V3BU/IJ/P6lbdlxSdFGuKMhZo33JAZOMAwn4+D5lt5EtqKGH3jOvo9Q== X-Received: by 2002:a25:6f84:: with SMTP id k126-v6mr1349981ybc.419.1535477009345; Tue, 28 Aug 2018 10:23:29 -0700 (PDT) Received: from localhost ([2620:10d:c091:200::1:de86]) by smtp.gmail.com with ESMTPSA id p126-v6sm609517ywf.22.2018.08.28.10.23.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Aug 2018 10:23:28 -0700 (PDT) From: Johannes Weiner To: Ingo Molnar , Peter Zijlstra , Andrew Morton , Linus Torvalds Cc: Tejun Heo , Suren Baghdasaryan , Daniel Drake , Vinayak Menon , Christopher Lameter , Peter Enderborg , Shakeel Butt , Mike Galbraith , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 5/9] sched: loadavg: make calc_load_n() public Date: Tue, 28 Aug 2018 13:22:54 -0400 Message-Id: <20180828172258.3185-6-hannes@cmpxchg.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180828172258.3185-1-hannes@cmpxchg.org> References: <20180828172258.3185-1-hannes@cmpxchg.org> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP It's going to be used in a later patch. Keep the churn separate. Signed-off-by: Johannes Weiner --- include/linux/sched/loadavg.h | 3 + kernel/sched/loadavg.c | 138 +++++++++++++++++----------------- 2 files changed, 72 insertions(+), 69 deletions(-) diff --git a/include/linux/sched/loadavg.h b/include/linux/sched/loadavg.h index cc9cc62bb1f8..4859bea47a7b 100644 --- a/include/linux/sched/loadavg.h +++ b/include/linux/sched/loadavg.h @@ -37,6 +37,9 @@ calc_load(unsigned long load, unsigned long exp, unsigned long active) return newload / FIXED_1; } +extern unsigned long calc_load_n(unsigned long load, unsigned long exp, + unsigned long active, unsigned int n); + #define LOAD_INT(x) ((x) >> FSHIFT) #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) diff --git a/kernel/sched/loadavg.c b/kernel/sched/loadavg.c index 54fbdfb2d86c..28a516575c18 100644 --- a/kernel/sched/loadavg.c +++ b/kernel/sched/loadavg.c @@ -91,6 +91,75 @@ long calc_load_fold_active(struct rq *this_rq, long adjust) return delta; } +/** + * fixed_power_int - compute: x^n, in O(log n) time + * + * @x: base of the power + * @frac_bits: fractional bits of @x + * @n: power to raise @x to. + * + * By exploiting the relation between the definition of the natural power + * function: x^n := x*x*...*x (x multiplied by itself for n times), and + * the binary encoding of numbers used by computers: n := \Sum n_i * 2^i, + * (where: n_i \elem {0, 1}, the binary vector representing n), + * we find: x^n := x^(\Sum n_i * 2^i) := \Prod x^(n_i * 2^i), which is + * of course trivially computable in O(log_2 n), the length of our binary + * vector. + */ +static unsigned long +fixed_power_int(unsigned long x, unsigned int frac_bits, unsigned int n) +{ + unsigned long result = 1UL << frac_bits; + + if (n) { + for (;;) { + if (n & 1) { + result *= x; + result += 1UL << (frac_bits - 1); + result >>= frac_bits; + } + n >>= 1; + if (!n) + break; + x *= x; + x += 1UL << (frac_bits - 1); + x >>= frac_bits; + } + } + + return result; +} + +/* + * a1 = a0 * e + a * (1 - e) + * + * a2 = a1 * e + a * (1 - e) + * = (a0 * e + a * (1 - e)) * e + a * (1 - e) + * = a0 * e^2 + a * (1 - e) * (1 + e) + * + * a3 = a2 * e + a * (1 - e) + * = (a0 * e^2 + a * (1 - e) * (1 + e)) * e + a * (1 - e) + * = a0 * e^3 + a * (1 - e) * (1 + e + e^2) + * + * ... + * + * an = a0 * e^n + a * (1 - e) * (1 + e + ... + e^n-1) [1] + * = a0 * e^n + a * (1 - e) * (1 - e^n)/(1 - e) + * = a0 * e^n + a * (1 - e^n) + * + * [1] application of the geometric series: + * + * n 1 - x^(n+1) + * S_n := \Sum x^i = ------------- + * i=0 1 - x + */ +unsigned long +calc_load_n(unsigned long load, unsigned long exp, + unsigned long active, unsigned int n) +{ + return calc_load(load, fixed_power_int(exp, FSHIFT, n), active); +} + #ifdef CONFIG_NO_HZ_COMMON /* * Handle NO_HZ for the global load-average. @@ -210,75 +279,6 @@ static long calc_load_nohz_fold(void) return delta; } -/** - * fixed_power_int - compute: x^n, in O(log n) time - * - * @x: base of the power - * @frac_bits: fractional bits of @x - * @n: power to raise @x to. - * - * By exploiting the relation between the definition of the natural power - * function: x^n := x*x*...*x (x multiplied by itself for n times), and - * the binary encoding of numbers used by computers: n := \Sum n_i * 2^i, - * (where: n_i \elem {0, 1}, the binary vector representing n), - * we find: x^n := x^(\Sum n_i * 2^i) := \Prod x^(n_i * 2^i), which is - * of course trivially computable in O(log_2 n), the length of our binary - * vector. - */ -static unsigned long -fixed_power_int(unsigned long x, unsigned int frac_bits, unsigned int n) -{ - unsigned long result = 1UL << frac_bits; - - if (n) { - for (;;) { - if (n & 1) { - result *= x; - result += 1UL << (frac_bits - 1); - result >>= frac_bits; - } - n >>= 1; - if (!n) - break; - x *= x; - x += 1UL << (frac_bits - 1); - x >>= frac_bits; - } - } - - return result; -} - -/* - * a1 = a0 * e + a * (1 - e) - * - * a2 = a1 * e + a * (1 - e) - * = (a0 * e + a * (1 - e)) * e + a * (1 - e) - * = a0 * e^2 + a * (1 - e) * (1 + e) - * - * a3 = a2 * e + a * (1 - e) - * = (a0 * e^2 + a * (1 - e) * (1 + e)) * e + a * (1 - e) - * = a0 * e^3 + a * (1 - e) * (1 + e + e^2) - * - * ... - * - * an = a0 * e^n + a * (1 - e) * (1 + e + ... + e^n-1) [1] - * = a0 * e^n + a * (1 - e) * (1 - e^n)/(1 - e) - * = a0 * e^n + a * (1 - e^n) - * - * [1] application of the geometric series: - * - * n 1 - x^(n+1) - * S_n := \Sum x^i = ------------- - * i=0 1 - x - */ -static unsigned long -calc_load_n(unsigned long load, unsigned long exp, - unsigned long active, unsigned int n) -{ - return calc_load(load, fixed_power_int(exp, FSHIFT, n), active); -} - /* * NO_HZ can leave us missing all per-CPU ticks calling * calc_load_fold_active(), but since a NO_HZ CPU folds its delta into