From patchwork Wed Aug 1 15:13:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Weiner X-Patchwork-Id: 10552431 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 C447415E9 for ; Wed, 1 Aug 2018 15:10:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B1E0A2B899 for ; Wed, 1 Aug 2018 15:10:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AFB952B701; Wed, 1 Aug 2018 15:10:48 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID 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 00DBD2B875 for ; Wed, 1 Aug 2018 15:10:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4AB5C6B000A; Wed, 1 Aug 2018 11:10:38 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3E7F26B000E; Wed, 1 Aug 2018 11:10:38 -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 F019E6B0010; Wed, 1 Aug 2018 11:10:37 -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 B594E6B000D for ; Wed, 1 Aug 2018 11:10:37 -0400 (EDT) Received: by mail-qt0-f197.google.com with SMTP id b7-v6so16072968qtp.14 for ; Wed, 01 Aug 2018 08:10:37 -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:reply-to; bh=eqQ2drM6ZB7t7xA4Vh6Us/fahKGTELhOpcUpFPV0E1Y=; b=Lu01vEhGDk4jTavGWwdvYrXq0v1bwSPl+YVarjZod0y4EyWRj+r2h0fTNtT7xqbgti 2BF2Iw0uA5LbMZ66TzkEaTH1PCdSYP7PNEA/4xerDMbVoiG33MVIdxKeQy1KCVP9D9zr bTzSsMN606n4D/qPK5KfR+ivy/g7qc2AwqgTT0dxPg56Amlvq47SS/56kSyiqr7jGBVC fQSBKfSN9FGJdMewOWM13oaWt/OxozdP4w+oPRS5gaYzhXWqEnF/yjmAphLXPa19EhAN mUp2aRO9NTCT3Vb5pJdiWXQGOxuRbtn8mSmWNy925kJMWoRCiMyhCBFmFBXP/bKnq3J6 iajA== X-Gm-Message-State: AOUpUlFpFw8o1CdUF4d7OtBX3lBxQd0LT7zhMw4Jc5UyPCu2C/gcmldS uEDwakKjMi1Sva0imgzGcFIWhcsr8GHILrwhu7U/cVboUv6iLcL9AIPtikg1pHSsld7SW8dbnN3 9rAi6wEODC0JwmqBvRggqnXozdmsl0x6BDcbdinvYrvoYIYxltSl5MroFt9ac6STJfauNL26Nfx vouaicKH8qY8LAKn9g6ruNm/aYKI/1W0iQdjO+KKQObaI2dnRkPTDkcggAOGWS+2Q6Nej8zEZYM lIKCTzv54yY+qHygvcYVBMoTU3lNJWa+z6/Ak/lHvzFEeCErj6jg3Dx/yBaPE/MRnOmidoXKKw4 Tkp/w1dpR7nPuW5rshwVxD5lA+3cCdbeq7Kdm9+G3cqzU4kO/oYU8ESo/shcdD/4+P8PVhUd8xH F X-Received: by 2002:a0c:d112:: with SMTP id a18-v6mr23685940qvh.200.1533136237459; Wed, 01 Aug 2018 08:10:37 -0700 (PDT) X-Received: by 2002:a0c:d112:: with SMTP id a18-v6mr23685793qvh.200.1533136235582; Wed, 01 Aug 2018 08:10:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533136235; cv=none; d=google.com; s=arc-20160816; b=FdanX7X6Kv7VlnlU/J1M473xegOhnv7h0ePbRl+F1wC830ZX+Xq68fijZ3RWFVnNV5 jvoOpsbBlJ40s7IJorz7zz0VcgYBP1UV+taWaorFf6WKKNOv5IQdliCFj5AMZ0NiN2GH wYAzHVfi5k4Rd9DstvHt+LGq90RgcVUH1z6+a+zx7jISQKwTEugP/D+SaZF6zjUfqOi+ 3Y5iBxgiCEhfkSSrI9mbjaqrQ/LI2pcLVJurVnUsZDYnzTALwN+TLxDdjuBAlA3Z54vo bw18pV3C0c/4uQqJhVFbj3pJmi6CrDwhscJW1a4dtkGMfmyoRm3p4F40iOnfVgMkAO3K EMgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=reply-to:references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=eqQ2drM6ZB7t7xA4Vh6Us/fahKGTELhOpcUpFPV0E1Y=; b=O2uDvIzre6b6SLnbLnCZp4tc6pX5tVJy9tpXrjOZ6DhpeLDqDcO+r7DsP8zyIg6A9Y X7MZmokrIshcyyVnsqJqprxANdS+EnQaNndqKjrrQWpSxv2GLiGUFCl1EBHGRuh+fXbw 3T9O5+jcqF9yICOLrXic6vOufnDswfBK59h0e1VQ8uxkMshlcSjGZpvY8nTuZ0Lw1co3 gFG007WbRRuYX3wK7jIm5zg+dbi6b8VrPPwHN1briMeCdqaOjfpbDakEEfaWazm7xu/x uvVVhMA6E0tMJLsox4Dxn1i0S3qG4s6rY2FPVvrBoV35Dr8gmQj7JahknQuIgy//1F2w sReQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cmpxchg-org.20150623.gappssmtp.com header.s=20150623 header.b=1mDNeCZa; 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 35-v6sor8112669qty.41.2018.08.01.08.10.35 for (Google Transport Security); Wed, 01 Aug 2018 08:10:35 -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=1mDNeCZa; 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:reply-to; bh=eqQ2drM6ZB7t7xA4Vh6Us/fahKGTELhOpcUpFPV0E1Y=; b=1mDNeCZahAC19dpgCqHO8FLElRRTMHQhQaZunImfz4JyTBYYJna6IcZHYTqGGnsqkH Kemssrlv2vIEmI/Dq3VP86W4aOxWK2UpYCYIqqlCggGevM44i9VBA3Qv8othKhq1K3Nk F02/cCV4Edbp8k/7+wnYz3j0pEsv2jjiPvidvAzRpdaFVMLzVcaiKcD00i4qCkhOGlEP qSd0xyoqZpshE/AvPr3xTgwpAgnMwcUNiuvfhXzKCPs14x5VbbLbNP2IdWiiHvatzU0x v0hjhfOcD4QuF2/JX0SmF9wUGcFn2a84dke7HrNaauYL6AbRHvYWHGvrSVUv3GbbHAIg QV7Q== X-Google-Smtp-Source: AAOMgpdnYSf4lJs3QDi78Y4Kb00U+4WqNLl/xFqcL/6QYYjfwZSorbURRjJbyoGrre0j5OsPE2hwwQ== X-Received: by 2002:ac8:4102:: with SMTP id q2-v6mr26414825qtl.222.1533136235254; Wed, 01 Aug 2018 08:10:35 -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 e206-v6sm9366288qkb.4.2018.08.01.08.10.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Aug 2018 08:10:34 -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 4/9] sched: loadavg: consolidate LOAD_INT, LOAD_FRAC, CALC_LOAD Date: Wed, 1 Aug 2018 11:13:03 -0400 Message-Id: <20180801151308.32234-5-hannes@cmpxchg.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180801151308.32234-1-hannes@cmpxchg.org> References: <20180801151308.32234-1-hannes@cmpxchg.org> Reply-To: "[PATCH 0/9]"@kvack.org, "psi:pressure"@kvack.org, stall@kvack.org, information@kvack.org, for@kvack.org, CPU@kvack.org, memory@kvack.org, and@kvack.org, IO@kvack.org, v3@kvack.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 There are several definitions of those functions/macros in places that mess with fixed-point load averages. Provide an official version. Signed-off-by: Johannes Weiner --- .../platforms/cell/cpufreq_spudemand.c | 2 +- arch/powerpc/platforms/cell/spufs/sched.c | 9 +++----- arch/s390/appldata/appldata_os.c | 4 ---- drivers/cpuidle/governors/menu.c | 4 ---- fs/proc/loadavg.c | 3 --- include/linux/sched/loadavg.h | 21 +++++++++++++++---- kernel/debug/kdb/kdb_main.c | 7 +------ kernel/sched/loadavg.c | 15 ------------- 8 files changed, 22 insertions(+), 43 deletions(-) diff --git a/arch/powerpc/platforms/cell/cpufreq_spudemand.c b/arch/powerpc/platforms/cell/cpufreq_spudemand.c index 882944c36ef5..5d8e8b6bb1cc 100644 --- a/arch/powerpc/platforms/cell/cpufreq_spudemand.c +++ b/arch/powerpc/platforms/cell/cpufreq_spudemand.c @@ -49,7 +49,7 @@ static int calc_freq(struct spu_gov_info_struct *info) cpu = info->policy->cpu; busy_spus = atomic_read(&cbe_spu_info[cpu_to_node(cpu)].busy_spus); - CALC_LOAD(info->busy_spus, EXP, busy_spus * FIXED_1); + info->busy_spus = calc_load(info->busy_spus, EXP, busy_spus * FIXED_1); pr_debug("cpu %d: busy_spus=%d, info->busy_spus=%ld\n", cpu, busy_spus, info->busy_spus); diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c index ccc421503363..70101510b19d 100644 --- a/arch/powerpc/platforms/cell/spufs/sched.c +++ b/arch/powerpc/platforms/cell/spufs/sched.c @@ -987,9 +987,9 @@ static void spu_calc_load(void) unsigned long active_tasks; /* fixed-point */ active_tasks = count_active_contexts() * FIXED_1; - CALC_LOAD(spu_avenrun[0], EXP_1, active_tasks); - CALC_LOAD(spu_avenrun[1], EXP_5, active_tasks); - CALC_LOAD(spu_avenrun[2], EXP_15, active_tasks); + spu_avenrun[0] = calc_load(spu_avenrun[0], EXP_1, active_tasks); + spu_avenrun[1] = calc_load(spu_avenrun[1], EXP_5, active_tasks); + spu_avenrun[2] = calc_load(spu_avenrun[2], EXP_15, active_tasks); } static void spusched_wake(struct timer_list *unused) @@ -1071,9 +1071,6 @@ void spuctx_switch_state(struct spu_context *ctx, } } -#define LOAD_INT(x) ((x) >> FSHIFT) -#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) - static int show_spu_loadavg(struct seq_file *s, void *private) { int a, b, c; diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata_os.c index 433a994b1a89..54f375627532 100644 --- a/arch/s390/appldata/appldata_os.c +++ b/arch/s390/appldata/appldata_os.c @@ -25,10 +25,6 @@ #include "appldata.h" - -#define LOAD_INT(x) ((x) >> FSHIFT) -#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) - /* * OS data * diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index 1bfe03ceb236..3738b670df7a 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c @@ -133,10 +133,6 @@ struct menu_device { int interval_ptr; }; - -#define LOAD_INT(x) ((x) >> FSHIFT) -#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) - static inline int get_loadavg(unsigned long load) { return LOAD_INT(load) * 10 + LOAD_FRAC(load) / 10; diff --git a/fs/proc/loadavg.c b/fs/proc/loadavg.c index b572cc865b92..8bee50a97c0f 100644 --- a/fs/proc/loadavg.c +++ b/fs/proc/loadavg.c @@ -10,9 +10,6 @@ #include #include -#define LOAD_INT(x) ((x) >> FSHIFT) -#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) - static int loadavg_proc_show(struct seq_file *m, void *v) { unsigned long avnrun[3]; diff --git a/include/linux/sched/loadavg.h b/include/linux/sched/loadavg.h index 80bc84ba5d2a..cc9cc62bb1f8 100644 --- a/include/linux/sched/loadavg.h +++ b/include/linux/sched/loadavg.h @@ -22,10 +22,23 @@ extern void get_avenrun(unsigned long *loads, unsigned long offset, int shift); #define EXP_5 2014 /* 1/exp(5sec/5min) */ #define EXP_15 2037 /* 1/exp(5sec/15min) */ -#define CALC_LOAD(load,exp,n) \ - load *= exp; \ - load += n*(FIXED_1-exp); \ - load >>= FSHIFT; +/* + * a1 = a0 * e + a * (1 - e) + */ +static inline unsigned long +calc_load(unsigned long load, unsigned long exp, unsigned long active) +{ + unsigned long newload; + + newload = load * exp + active * (FIXED_1 - exp); + if (active >= load) + newload += FIXED_1-1; + + return newload / FIXED_1; +} + +#define LOAD_INT(x) ((x) >> FSHIFT) +#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) extern void calc_global_load(unsigned long ticks); diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index e405677ee08d..a8f5aca5eb5e 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c @@ -2556,16 +2556,11 @@ static int kdb_summary(int argc, const char **argv) } kdb_printf("%02ld:%02ld\n", val.uptime/(60*60), (val.uptime/60)%60); - /* lifted from fs/proc/proc_misc.c::loadavg_read_proc() */ - -#define LOAD_INT(x) ((x) >> FSHIFT) -#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) kdb_printf("load avg %ld.%02ld %ld.%02ld %ld.%02ld\n", LOAD_INT(val.loads[0]), LOAD_FRAC(val.loads[0]), LOAD_INT(val.loads[1]), LOAD_FRAC(val.loads[1]), LOAD_INT(val.loads[2]), LOAD_FRAC(val.loads[2])); -#undef LOAD_INT -#undef LOAD_FRAC + /* Display in kilobytes */ #define K(x) ((x) << (PAGE_SHIFT - 10)) kdb_printf("\nMemTotal: %8lu kB\nMemFree: %8lu kB\n" diff --git a/kernel/sched/loadavg.c b/kernel/sched/loadavg.c index a171c1258109..54fbdfb2d86c 100644 --- a/kernel/sched/loadavg.c +++ b/kernel/sched/loadavg.c @@ -91,21 +91,6 @@ long calc_load_fold_active(struct rq *this_rq, long adjust) return delta; } -/* - * a1 = a0 * e + a * (1 - e) - */ -static unsigned long -calc_load(unsigned long load, unsigned long exp, unsigned long active) -{ - unsigned long newload; - - newload = load * exp + active * (FIXED_1 - exp); - if (active >= load) - newload += FIXED_1-1; - - return newload / FIXED_1; -} - #ifdef CONFIG_NO_HZ_COMMON /* * Handle NO_HZ for the global load-average.