From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Weiner Subject: Re: [PATCH 4/9] sched: loadavg: consolidate LOAD_INT, LOAD_FRAC, CALC_LOAD Date: Wed, 12 Sep 2018 21:49:23 -0400 Message-ID: <20180913014923.GB2370@cmpxchg.org> References: <20180828172258.3185-1-hannes@cmpxchg.org> <20180828172258.3185-5-hannes@cmpxchg.org> <20180912162828.ae336d83e8c467345e70de17@linux-foundation.org> Mime-Version: 1.0 Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=kMMcs6t9a4FBai9ISvBemyGSg5veEzt5Pg9zYNstaK0=; b=PI54I1Mo+d9zKW+sB0FxBFNoV/yd8wE6aWruLvxKyri0R7zRtWzlbhdX8Mhco9fX6+ 6eY55NgPnAMuMmbN9WBinPo2esT8b36v2exGA08YgQiXPzHzyi/dtdPKb6hbm5/r8gLX 8+z4uiUr6vetS5DDSn0JtypzEWjjaJQd88iraXZV8tveilvhVItEhs46LjhdEJWLcobg V2gxccwRNo3PpHMW+WipUsaCcKItoUii8+Wy4TYYkLc83Klfgt5NYykM6O3ytizHuXGx 41C9CyTEnhRQNkMfgC1gFyEeB9tg+GKwY2vFt5206Il5cPoEl7ceR5Xxii7eV432BSlA 08fg== Content-Disposition: inline In-Reply-To: <20180912162828.ae336d83e8c467345e70de17@linux-foundation.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Andrew Morton Cc: Ingo Molnar , Peter Zijlstra , Linus Torvalds , 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 On Wed, Sep 12, 2018 at 04:28:28PM -0700, Andrew Morton wrote: > On Tue, 28 Aug 2018 13:22:53 -0400 Johannes Weiner wrote: > > > There are several definitions of those functions/macros in places that > > mess with fixed-point load averages. Provide an official version. > > missed blk-iolatency.c for some reason? Ah, that callsite came in with this merge window. Thanks for the fixup. > --- a/block/blk-iolatency.c~sched-loadavg-consolidate-load_int-load_frac-calc_load-fix > +++ a/block/blk-iolatency.c > @@ -512,7 +512,7 @@ static void iolatency_check_latencies(st > exp_idx = min_t(int, BLKIOLATENCY_NR_EXP_FACTORS - 1, > div64_u64(iolat->cur_win_nsec, > BLKIOLATENCY_EXP_BUCKET_SIZE)); > - CALC_LOAD(iolat->lat_avg, iolatency_exp_factors[exp_idx], stat.mean); > + calc_load(iolat->lat_avg, iolatency_exp_factors[exp_idx], stat.mean); The macro used to modify the avg parameter in place, but with the function we need an explicit assignment to update the variable: Signed-off-by: Johannes Weiner --- diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c index 335c22317757..8793f1344e11 100644 --- a/block/blk-iolatency.c +++ b/block/blk-iolatency.c @@ -512,7 +512,8 @@ static void iolatency_check_latencies(struct iolatency_grp *iolat, u64 now) exp_idx = min_t(int, BLKIOLATENCY_NR_EXP_FACTORS - 1, div64_u64(iolat->cur_win_nsec, BLKIOLATENCY_EXP_BUCKET_SIZE)); - calc_load(iolat->lat_avg, iolatency_exp_factors[exp_idx], stat.mean); + iolat->lat_avg = calc_load(iolat->lat_avg, + iolatency_exp_factors[exp_idx], stat.mean); /* Everything is ok and we don't need to adjust the scale. */ if (stat.mean <= iolat->min_lat_nsec &&