From patchwork Wed Aug 1 15:19:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Weiner X-Patchwork-Id: 10552463 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 8BC6F14E2 for ; Wed, 1 Aug 2018 15:17:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7CBDB2B5AF for ; Wed, 1 Aug 2018 15:17:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 709FE2B703; Wed, 1 Aug 2018 15:17:31 +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 C17392B5AF for ; Wed, 1 Aug 2018 15:17:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6C62F6B027C; Wed, 1 Aug 2018 11:17:29 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 676156B027E; Wed, 1 Aug 2018 11:17:29 -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 53C946B027F; Wed, 1 Aug 2018 11:17:29 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt0-f200.google.com (mail-qt0-f200.google.com [209.85.216.200]) by kanga.kvack.org (Postfix) with ESMTP id 24C7B6B027C for ; Wed, 1 Aug 2018 11:17:29 -0400 (EDT) Received: by mail-qt0-f200.google.com with SMTP id o6-v6so16092787qtp.15 for ; Wed, 01 Aug 2018 08:17:29 -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=eqQ2drM6ZB7t7xA4Vh6Us/fahKGTELhOpcUpFPV0E1Y=; b=OlHFvPmzdlF1LjPEdUEJ+V7Jvxfd3D3sXkfnCpaniTI0RMEaVPMD9hgkyJ/6a3y7hD 902ewCBd0eiQXMEb+EaJ0p93g2JslFf2NfkmbSoK8DxfJ3yao3snioXrJKmMCei5KlKt o3AReHNE3Vptwh+nMcsTrKUDSUEevdY0TkIalOez200qF+gCe1dRsoHDNxb51l2+CSs3 lqHvCdK+cZCdyeKXjzBXnziiLgbNKoBGDrCT8QTX0fYkX2GwGepct50BA4RH+Eu0ojP5 bkDMBIb16EAeIAp9BNMSVolNDLVAdHygHISRjnN70ilzYqJaCOXgc0YwOFCp1q0xQ7kD yg9g== X-Gm-Message-State: AOUpUlGKNeyaucEq5XA4Smb3k8eXe+aDB3Z8t4hcAxIPR18jSRnYpvtY keLo5wp6s4nSontRoPo3tkvNv6bwUe436iR0RariZ25ELK5qAqzn6A8gtH5HwdjinW9uVP3mgRH y+4ry+KaHdZ+604LaqaDfWKmkGzCTLcUjLkogNz6W6cinfVmR12Lbilo5oI2p0phQ4hbnO2b596 6G36rG21sOFBlz+WEjLvLylLammGjc1FFkcs911ylSR4dOMaQMs1qjipG3YOirKzmmglQnkEXY1 4JRWoEFnFpfy2jkaZw64ZOsascpLfzeE9Ay8rROneHPww/B2uR8z1RB816ehskj/z2a5pJtIiKL XLYe8XdtajpcaK4u1NgyeykR4GmCRWrMKxaQXbfAMXJmDOSDU6ReNxr3jU2RXgJBu9IM9nw94/4 p X-Received: by 2002:a0c:8d8e:: with SMTP id t14-v6mr23895562qvb.32.1533136648913; Wed, 01 Aug 2018 08:17:28 -0700 (PDT) X-Received: by 2002:a0c:8d8e:: with SMTP id t14-v6mr23895506qvb.32.1533136648200; Wed, 01 Aug 2018 08:17:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533136648; cv=none; d=google.com; s=arc-20160816; b=oZV9/yO2g/C4WJHx/lKJhHF0aHNy/I8bn3Fqpx5VxZUgAIfsc+B4I7rDXyxVG2b8mJ YDKdFb+Kv4aFEKwihZhOZrPPHDQeXMvdm49QnuLwO0JPxECbtvtqYOcTABqviqbP34lT puFfp/wCQpPrIHYihmP9acki9tcikvfO0BANkawvkY+tcYEgl90bEZgXB7AMdWbdfF5Z RLbhGlghyQNvBs5EfxtiAby0M/77pNNaPMh1LCJPK1gxhyuRPoBVMH6XaXyjA5Gu862k EaTAW7GpHy+97sFLbUx6yqnECuww+AJczyTJpS196MSmyIbtdUEuI5MOD61nOORPFZeB /3bw== 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=eqQ2drM6ZB7t7xA4Vh6Us/fahKGTELhOpcUpFPV0E1Y=; b=LfLZGv216ZuOI9lDzwGmtQ3q0ct0QAlOteLsIttgbmYPTH/hAy5jy3SGEmEGNOrj4K KYeQ++Zssh5ZMKl5U3iNhchj/XrIb1U6hTiGzH3hLLLZPVlgAehD61XOlJGEHmwSSwZe +dM/Yg0lssoYI+abXgaDnVBOcJZCSk1CFaA6mCC9+5wER1RH2TuMgvIxjMAKVkrYi36H RrY6LPRIkQozIEyXqL7AagWzIDto2keZzOQCT+5DjdYlhXOrBPQaPNMg4WvBmzB3KakH Kln2ibuNIhHQw0rgJWz37mNq7nocMcCKwG+US12vAmfuGHu2J8ODmYjSsUcswQtHs6mU InkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cmpxchg-org.20150623.gappssmtp.com header.s=20150623 header.b=wuHK9XyX; 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 e10-v6sor7882843qvd.60.2018.08.01.08.17.28 for (Google Transport Security); Wed, 01 Aug 2018 08:17:28 -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=wuHK9XyX; 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=eqQ2drM6ZB7t7xA4Vh6Us/fahKGTELhOpcUpFPV0E1Y=; b=wuHK9XyXw0rF+Tp2cArx0YiZqM/GjpVtqcyTSrQeYiIS+B02zaDa+3gDsB8r9chs3T 6wcThnIY0N8pzjRHhlNIQmTU5fh8GLb1Fob9wXWMv6gFP3uQOPlmNiGg2Qz9i9fA5lkb ZPH7f5zg6kA7DgSYXrtNJpKGKXGNX+Z6D+ZdxZKzPFWjB+ggK2J+dnxyxU7IUO0ZxL5+ 2puJqTqNlCwmu7rM/O+vUSEyll0576DLkwWzoaTZmgg3Uk2/ZhM9cvbgvz7MtV3Dubji 3c2eic5pUxlRK8eO79t1PVgcoesY4Tit5dLqNm8JpVfd6pV/ndmwAc89/ZZkZzj9+HRB tgkw== X-Google-Smtp-Source: AAOMgpfdE+g17VHbSJNxFYjTtyP1v2VW2n2tTjC8/WU1h5l37pndW5+lVrNduKVKQhqkbfXA7cAD3A== X-Received: by 2002:a0c:fa4e:: with SMTP id k14-v6mr23408603qvo.35.1533136647891; Wed, 01 Aug 2018 08:17:27 -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 v4-v6sm11040590qth.23.2018.08.01.08.17.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Aug 2018 08:17:26 -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:19:53 -0400 Message-Id: <20180801151958.32590-5-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 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.