From patchwork Tue Aug 26 11:06:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 35984 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4F39820551 for ; Tue, 26 Aug 2014 11:08:25 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id rl12sf46947614iec.9 for ; Tue, 26 Aug 2014 04:08:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=IkEyqUTGng75SE7e+Wrmew2XN4+VRBOkl5YElj2qiKc=; b=KICssPGJVsKmP1g/EBH1K095ZqBemzYGucY7fjr9SgeUnzlo0LJ9Z1FjmBIUtN/pBP O6bSiA2NEVUWkv5Pia4VjdovFDRlBIPocSlPaZ+1Ht4wL784jVR4t5smKJnVa0wRyCJJ mG7SLK1vOce9ebUFuezLEp3s2NZpUGwnclYZPHkWwXguOJbZbi3K3QNVtCtU2BYMKjnj J+ZR/sA3zABWusH0dKVhT8eyPVUWIa1SxnLN9f+WoOPl1U82+jh3WV4UCSx+zxXJ4hRW l+GQ5vMiatsez1T2J+f3G4SQ53iG3/BPQkG1HIadQc15dhD1wLroFY4knnL/jxQ68r2x zmsw== X-Gm-Message-State: ALoCoQnDH9cIa8rwtOxK0+aBg5MeQ8C5k+NWnzJCXFZks/hhWITeNpDnkB7jopl3HyqFKC9t80JI X-Received: by 10.182.4.73 with SMTP id i9mr17885721obi.28.1409051304781; Tue, 26 Aug 2014 04:08:24 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.23.201 with SMTP id 67ls101586qgp.45.gmail; Tue, 26 Aug 2014 04:08:24 -0700 (PDT) X-Received: by 10.220.202.9 with SMTP id fc9mr10655635vcb.40.1409051304681; Tue, 26 Aug 2014 04:08:24 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id yv8si1259109vcb.5.2014.08.26.04.08.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Aug 2014 04:08:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id lf12so16780646vcb.12 for ; Tue, 26 Aug 2014 04:08:24 -0700 (PDT) X-Received: by 10.52.127.5 with SMTP id nc5mr202897vdb.59.1409051304580; Tue, 26 Aug 2014 04:08:24 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp189081vcb; Tue, 26 Aug 2014 04:08:24 -0700 (PDT) X-Received: by 10.66.161.41 with SMTP id xp9mr19712688pab.120.1409051303530; Tue, 26 Aug 2014 04:08:23 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id oy3si3949283pdb.50.2014.08.26.04.08.22 for ; Tue, 26 Aug 2014 04:08:23 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757647AbaHZLH4 (ORCPT + 26 others); Tue, 26 Aug 2014 07:07:56 -0400 Received: from mail-wg0-f45.google.com ([74.125.82.45]:56504 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755724AbaHZLHw (ORCPT ); Tue, 26 Aug 2014 07:07:52 -0400 Received: by mail-wg0-f45.google.com with SMTP id x12so14152151wgg.28 for ; Tue, 26 Aug 2014 04:07:51 -0700 (PDT) X-Received: by 10.180.101.65 with SMTP id fe1mr21389351wib.53.1409051271219; Tue, 26 Aug 2014 04:07:51 -0700 (PDT) Received: from lmenx30s.lme.st.com (LPuteaux-656-01-48-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPSA id q6sm2494891wjy.47.2014.08.26.04.07.49 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Aug 2014 04:07:50 -0700 (PDT) From: Vincent Guittot To: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, preeti@linux.vnet.ibm.com, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org Cc: riel@redhat.com, Morten.Rasmussen@arm.com, efault@gmx.de, nicolas.pitre@linaro.org, linaro-kernel@lists.linaro.org, daniel.lezcano@linaro.org, dietmar.eggemann@arm.com, Vincent Guittot Subject: [PATCH v5 04/12] sched: Allow all archs to set the capacity_orig Date: Tue, 26 Aug 2014 13:06:47 +0200 Message-Id: <1409051215-16788-5-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409051215-16788-1-git-send-email-vincent.guittot@linaro.org> References: <1409051215-16788-1-git-send-email-vincent.guittot@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: vincent.guittot@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , capacity_orig is only changed for system with a SMT sched_domain level in order to reflect the lower capacity of CPUs. Heterogenous system also have to reflect an original capacity that is different from the default value. Create a more generic function arch_scale_cpu_capacity that can be also used by non SMT platform to set capacity_orig. The weak behavior of arch_scale_cpu_capacity is the previous SMT one in order to keep backward compatibility in the use of capacity_orig. arch_scale_smt_capacity and default_scale_smt_capacity have been removed as they were not use elsewhere than in arch_scale_cpu_capacity. Signed-off-by: Vincent Guittot Reviewed-by: Kamalesh Babulal Reviewed-by: Preeti U. Murthy --- kernel/sched/fair.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index b85e9f7..8176bda 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5705,19 +5705,12 @@ unsigned long __weak arch_scale_freq_capacity(struct sched_domain *sd, int cpu) return default_scale_capacity(sd, cpu); } -static unsigned long default_scale_smt_capacity(struct sched_domain *sd, int cpu) +unsigned long __weak arch_scale_cpu_capacity(struct sched_domain *sd, int cpu) { - unsigned long weight = sd->span_weight; - unsigned long smt_gain = sd->smt_gain; + if ((sd->flags & SD_SHARE_CPUCAPACITY) && (sd->span_weight > 1)) + return sd->smt_gain / sd->span_weight; - smt_gain /= weight; - - return smt_gain; -} - -unsigned long __weak arch_scale_smt_capacity(struct sched_domain *sd, int cpu) -{ - return default_scale_smt_capacity(sd, cpu); + return SCHED_CAPACITY_SCALE; } static unsigned long scale_rt_capacity(int cpu) @@ -5756,18 +5749,12 @@ static unsigned long scale_rt_capacity(int cpu) static void update_cpu_capacity(struct sched_domain *sd, int cpu) { - unsigned long weight = sd->span_weight; unsigned long capacity = SCHED_CAPACITY_SCALE; struct sched_group *sdg = sd->groups; - if ((sd->flags & SD_SHARE_CPUCAPACITY) && weight > 1) { - if (sched_feat(ARCH_CAPACITY)) - capacity *= arch_scale_smt_capacity(sd, cpu); - else - capacity *= default_scale_smt_capacity(sd, cpu); + capacity *= arch_scale_cpu_capacity(sd, cpu); - capacity >>= SCHED_CAPACITY_SHIFT; - } + capacity >>= SCHED_CAPACITY_SHIFT; sdg->sgc->capacity_orig = capacity;