From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_NEOMUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A888AC04AB1 for ; Thu, 9 May 2019 08:45:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 827D221479 for ; Thu, 9 May 2019 08:45:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726678AbfEIIpk (ORCPT ); Thu, 9 May 2019 04:45:40 -0400 Received: from foss.arm.com ([217.140.101.70]:34416 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725847AbfEIIpk (ORCPT ); Thu, 9 May 2019 04:45:40 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A3761374; Thu, 9 May 2019 01:45:39 -0700 (PDT) Received: from e110439-lin (e110439-lin.cambridge.arm.com [10.1.194.43]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id ADA693F575; Thu, 9 May 2019 01:45:36 -0700 (PDT) Date: Thu, 9 May 2019 09:45:34 +0100 From: Patrick Bellasi To: Peter Zijlstra Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-api@vger.kernel.org, Ingo Molnar , Tejun Heo , "Rafael J . Wysocki" , Vincent Guittot , Viresh Kumar , Paul Turner , Quentin Perret , Dietmar Eggemann , Morten Rasmussen , Juri Lelli , Todd Kjos , Joel Fernandes , Steve Muckle , Suren Baghdasaryan Subject: Re: [PATCH v8 04/16] sched/core: uclamp: Add system default clamps Message-ID: <20190509084534.weyrsq5vl7r3ryns@e110439-lin> References: <20190402104153.25404-1-patrick.bellasi@arm.com> <20190402104153.25404-5-patrick.bellasi@arm.com> <20190508190011.GB32547@worktop.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190508190011.GB32547@worktop.programming.kicks-ass.net> User-Agent: NeoMutt/20180716 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08-May 21:00, Peter Zijlstra wrote: > > There was a bunch of repetition that seemed fragile; does something like > the below make sense? Absolutely yes... will add to v9, thanks. > Index: linux-2.6/kernel/sched/core.c > =================================================================== > --- linux-2.6.orig/kernel/sched/core.c > +++ linux-2.6/kernel/sched/core.c > @@ -770,6 +770,9 @@ unsigned int sysctl_sched_uclamp_util_ma > /* All clamps are required to be less or equal than these values */ > static struct uclamp_se uclamp_default[UCLAMP_CNT]; > > +#define for_each_clamp_id(clamp_id) \ > + for ((clamp_id) = 0; (clamp_id) < UCLAMP_CNT; (clamp_id)++) > + > /* Integer rounded range for each bucket */ > #define UCLAMP_BUCKET_DELTA DIV_ROUND_CLOSEST(SCHED_CAPACITY_SCALE, UCLAMP_BUCKETS) > > @@ -790,6 +793,12 @@ static inline unsigned int uclamp_none(i > return SCHED_CAPACITY_SCALE; > } > > +static inline void uclamp_se_set(struct uclamp_se *uc_se, unsigned int value) > +{ > + uc_se->value = value; > + uc_se->bucket_id = uclamp_bucket_id(value); > +} > + > static inline unsigned int > uclamp_idle_value(struct rq *rq, unsigned int clamp_id, unsigned int clamp_value) > { > @@ -977,7 +986,7 @@ static inline void uclamp_rq_inc(struct > if (unlikely(!p->sched_class->uclamp_enabled)) > return; > > - for (clamp_id = 0; clamp_id < UCLAMP_CNT; ++clamp_id) > + for_each_clamp_id(clamp_id) > uclamp_rq_inc_id(p, rq, clamp_id); > > /* Reset clamp idle holding when there is one RUNNABLE task */ > @@ -992,7 +1001,7 @@ static inline void uclamp_rq_dec(struct > if (unlikely(!p->sched_class->uclamp_enabled)) > return; > > - for (clamp_id = 0; clamp_id < UCLAMP_CNT; ++clamp_id) > + for_each_clamp_id(clamp_id) > uclamp_rq_dec_id(p, rq, clamp_id); > } > > @@ -1021,16 +1030,13 @@ int sysctl_sched_uclamp_handler(struct c > } > > if (old_min != sysctl_sched_uclamp_util_min) { > - uclamp_default[UCLAMP_MIN].value = > - sysctl_sched_uclamp_util_min; > - uclamp_default[UCLAMP_MIN].bucket_id = > - uclamp_bucket_id(sysctl_sched_uclamp_util_min); > + uclamp_se_set(&uclamp_default[UCLAMP_MIN], > + sysctl_sched_uclamp_util_min); > } > + > if (old_max != sysctl_sched_uclamp_util_max) { > - uclamp_default[UCLAMP_MAX].value = > - sysctl_sched_uclamp_util_max; > - uclamp_default[UCLAMP_MAX].bucket_id = > - uclamp_bucket_id(sysctl_sched_uclamp_util_max); > + uclamp_se_set(&uclamp_default[UCLAMP_MAX], > + sysctl_sched_uclamp_util_max); > } > > /* > @@ -1052,7 +1058,7 @@ static void uclamp_fork(struct task_stru > { > unsigned int clamp_id; > > - for (clamp_id = 0; clamp_id < UCLAMP_CNT; ++clamp_id) > + for_each_clamp_id(clamp_id) > p->uclamp[clamp_id].active = false; > } > > @@ -1067,17 +1073,12 @@ static void __init init_uclamp(void) > cpu_rq(cpu)->uclamp_flags = 0; > } > > - for (clamp_id = 0; clamp_id < UCLAMP_CNT; ++clamp_id) { > - struct uclamp_se *uc_se = &init_task.uclamp_req[clamp_id]; > - > - uc_se->value = uclamp_none(clamp_id); > - uc_se->bucket_id = uclamp_bucket_id(uc_se->value); > - } > + for_each_clamp_id(clamp_id) > + uclamp_se_set(&init_task.uclamp_req[clamp_id], uclamp_none(clamp_id)); > > /* System defaults allow max clamp values for both indexes */ > - uc_max.value = uclamp_none(UCLAMP_MAX); > - uc_max.bucket_id = uclamp_bucket_id(uc_max.value); > - for (clamp_id = 0; clamp_id < UCLAMP_CNT; ++clamp_id) > + uclamp_se_set(&uc_max, uclamp_none(UCLAMP_MAX)); > + for_each_clamp_id(clamp_id) > uclamp_default[clamp_id] = uc_max; > } > > -- #include Patrick Bellasi