From patchwork Wed Aug 1 15:19: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: 10552465 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 C2B6E14E2 for ; Wed, 1 Aug 2018 15:17:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B335E2B5AF for ; Wed, 1 Aug 2018 15:17:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A6F9D2B703; Wed, 1 Aug 2018 15:17:34 +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 0F59B2B5AF for ; Wed, 1 Aug 2018 15:17:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 58C9F6B027E; Wed, 1 Aug 2018 11:17:32 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 51F236B0280; Wed, 1 Aug 2018 11:17:32 -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 394A16B0281; Wed, 1 Aug 2018 11:17:32 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt0-f197.google.com (mail-qt0-f197.google.com [209.85.216.197]) by kanga.kvack.org (Postfix) with ESMTP id 063446B027E for ; Wed, 1 Aug 2018 11:17:32 -0400 (EDT) Received: by mail-qt0-f197.google.com with SMTP id i23-v6so16083420qtf.9 for ; Wed, 01 Aug 2018 08:17:32 -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=Njg/1A8ljMtlYqg/rhcRWIvpvyGgPevdRDBF80KHJOxOlvtGedBHOnie2Lg/Bm7HvW kZEY3L6i+DUkTC1O0kmBwOVmKyKvXU4k9cgpkrRgeGXIt+8xlBa8tuwBQROh/VYBEmAR /B1yclv4W5jzTeaajas2aqPKss63OehmP4urF4TtNCtSLZuD5pRPv2s43mI9QcAxE+n8 qVs24YlcVQehzqC7rcrWjMQ+qnYh1jAvWpuNKeZyMt8T19p4Qipkup7KQGh9pW97wBCE eSHgJMNfZwA62smVWrxofeeR4t3bxooTPF8STDbb7hio0VgOz7f/1nWdh3NGpuHYkpwn 3zYw== X-Gm-Message-State: AOUpUlHG/VwdVUKB6osqAaKMc2Yeeqapn4smjdmszS+nN0IO7zQktl76 1b7yhxBp5R21hv+itHq6z/FLeX4SyFoTwM+QthAF+5xu2HbhLd05dlfW3JJdnsiW90gya6ufGuA 1egZGkOK44gPSN1MD1L/IJo0g7YX4HkWLuH/6P9Dj6GkqcSdIyyj4/hD4oSj8uswbSQl5ZM327L JM9cvW4DtybzT8jrLMC9ipcAQ2xhzWv0plQO81ziUQjMs0l3JOuhE9Z4WqUVaB8aaDrCyE4Qcb8 LmKIas2mjhC7bzzEzP3oceoqBMmyFsoHY9Lwx24G6oGomWQAf3MGZgdfGCFPiblOlDWmlyD3igK RyRsRbxTw1/izCEmA+7HhBMmr70kCPEu3n57qLVVs21cvAJMVI4fwL16CWj6dnFaaQwk+9PKBYj p X-Received: by 2002:a0c:9915:: with SMTP id h21-v6mr23989241qvd.122.1533136651809; Wed, 01 Aug 2018 08:17:31 -0700 (PDT) X-Received: by 2002:a0c:9915:: with SMTP id h21-v6mr23989122qvd.122.1533136650387; Wed, 01 Aug 2018 08:17:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533136650; cv=none; d=google.com; s=arc-20160816; b=tLSw+1Fdyht01j2Z2UJCtRZTRjYXN1qSw4QrDDe5FM7oJ4qzhSnvf6ifFR9zADhlFD NgHSIyP6AyX9SB/hLAE91t/F1/kKTFRMhkBhv3JwWRZfhBw+yVKF3k5COlbCwmxi5FVq leiMD9RuIJ0DIsGkyk47NE73qbihPtJ00AMDFG3eZpxnC3Z4GZ/SeEQLxP2fClYmaeK0 CgH5qrATyyFq+1LqG67TRlGIxnnFTVE47GF/qXYwdgGtWX6qvKYOJbB/RCFED9F8xw+l urk0p7mNbHZ5lBX0tWjE8n4qOVlZM5VOmKMUHwBnwhnUbej2odUU8wZy5h0aDOaJdnmF /2JA== 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=fxz7geNxhBuwJy1CeYyExrECfdIrmZaXFJctfVRwf345Ox5APNn9O5cjrRDEjdUvWz 4hw1AiswjL+a20wcpkDWPHWDM0DG4C6oKOkGca+SwZQeAKnUVAbT9nF+rTvm1qqD70Nb mX/9F39owV9rqKbesA42gqQLO2J2xDT0NdHfiwQ0DyFmwysEJq3B8dgGRey8zJeXJ6vA 5ZQ5s8chZ1PtIMJpdkwKgAsnVgTsY965nfZry9Dxy6lj6u9uRMB5PReI3NSLmvXSmdBc KR8WFoQAmAdDvZcPbINVQeQ4BvjNRS7SqwI3R1j2rwuRCGUT4OoA4DCHaJD52linGMoe 8bkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cmpxchg-org.20150623.gappssmtp.com header.s=20150623 header.b=DPctK5zf; 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 e40-v6sor8241832qte.64.2018.08.01.08.17.30 for (Google Transport Security); Wed, 01 Aug 2018 08:17:30 -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=DPctK5zf; 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=DPctK5zfYaQ0V4YIT0cOc+G2ibXQKwNsexBwhBszDgpcxVUcfrnx9WMrfKc89CpzWh DmYcv1soQq2VwT3zcvMIUKLLXwi7dgDFW2s8ZmC8sqY3YEjrAc6KPhIzyb83bim9RZIL 6EX7rvRwWH3wYHU+3AgXrQlfKub5GgQui0IGNFSIm9y8nAHMSO78eLwT72940dbXZgi4 XxhT6jMElMtHXZAHx8zuyjBtH7w0twHKqHL8aEBHOIMpi92YVD+KXJvpUg+tB50/0v3h 9Fv3op0mXYXYijb0hMh26+uwl4p3E8GNPT3CVKUyxOxO5cr/UjWFRJ3/6TSkO0snLH3s wuYQ== X-Google-Smtp-Source: AAOMgpdbWpoM7qIjETQdOzVbQgH12G2t7WjQg9oaO/HXxSR73Ckh2cPo3WyzbVTfp8SMPQBIG39a5g== X-Received: by 2002:ac8:460b:: with SMTP id p11-v6mr26602836qtn.418.1533136650080; Wed, 01 Aug 2018 08:17:30 -0700 (PDT) Received: from localhost (216.49.36.201.res-cmts.bus.ptd.net. [216.49.36.201]) by smtp.gmail.com with ESMTPSA id t11-v6sm14624295qtc.2.2018.08.01.08.17.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Aug 2018 08:17:29 -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 , Mike Galbraith , Shakeel Butt , Peter Enderborg , 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: Wed, 1 Aug 2018 11:19:54 -0400 Message-Id: <20180801151958.32590-6-hannes@cmpxchg.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180801151958.32590-1-hannes@cmpxchg.org> References: <20180801151958.32590-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