From patchwork Mon Jun 30 16:05:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 32783 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f200.google.com (mail-ig0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E8ACA203C0 for ; Mon, 30 Jun 2014 16:10:12 +0000 (UTC) Received: by mail-ig0-f200.google.com with SMTP id hn18sf18711631igb.11 for ; Mon, 30 Jun 2014 09:10:12 -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=4+5d5CDXkUyJqToG9zGWHb4nI1tmfizkyn5azvzz5fs=; b=W5S7cQqYpRBjr0hMd8pniLWcrzHMnEFppEMweZeAb7qggrdJkqBj7yy4093IOKIhGG QeZYqfdAVogoN+nRIfHAOnkinAjTjk3tbPN2CZ0IX9dudO/hMJ+gcRwibff/GBI+bAxo 6Chz0G9eriEK2nBms1aPyVhLF+Ouh0iGH1eQsUkr98NraVDRy1/Wl10mASIF2E72kgls swgYFASiVrfyrUEUC4DffQUqZJ0b2fsohMpkRKw6s7dEJmGUPN1Kk0xIrPulpq9fswNU SW+wGoHkPSq6xmbsGi5sY2UjDSXWcG6AQTzhrPjvUf/HiZLMC862TS3yCgrxnrJIoUg9 iTUw== X-Gm-Message-State: ALoCoQndrhqZZrKJIglMGIOflmWzcAdRicSQrWfWPQZ/72I1/6zst/Pc5gSJUCw2Mhj3hhgx1eGH X-Received: by 10.42.208.72 with SMTP id gb8mr19905607icb.24.1404144612498; Mon, 30 Jun 2014 09:10:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.51.3 with SMTP id t3ls1400259qga.82.gmail; Mon, 30 Jun 2014 09:10:12 -0700 (PDT) X-Received: by 10.52.137.109 with SMTP id qh13mr1116103vdb.63.1404144612410; Mon, 30 Jun 2014 09:10:12 -0700 (PDT) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id ig16si6844753vec.99.2014.06.30.09.10.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 09:10:12 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.182 as permitted sender) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id oy12so8536829veb.27 for ; Mon, 30 Jun 2014 09:10:12 -0700 (PDT) X-Received: by 10.58.209.7 with SMTP id mi7mr710904vec.80.1404144612350; Mon, 30 Jun 2014 09:10:12 -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.37.5 with SMTP id tc5csp151433vcb; Mon, 30 Jun 2014 09:10:11 -0700 (PDT) X-Received: by 10.66.159.34 with SMTP id wz2mr52051210pab.96.1404144611428; Mon, 30 Jun 2014 09:10:11 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id la14si23616213pab.163.2014.06.30.09.10.10; Mon, 30 Jun 2014 09:10:10 -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 S1756687AbaF3QKD (ORCPT + 27 others); Mon, 30 Jun 2014 12:10:03 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:56722 "EHLO mail-we0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756080AbaF3QGw (ORCPT ); Mon, 30 Jun 2014 12:06:52 -0400 Received: by mail-we0-f173.google.com with SMTP id t60so8464523wes.4 for ; Mon, 30 Jun 2014 09:06:51 -0700 (PDT) X-Received: by 10.180.205.138 with SMTP id lg10mr23898957wic.49.1404144411331; Mon, 30 Jun 2014 09:06: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 lo18sm32896271wic.1.2014.06.30.09.06.49 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 09:06:50 -0700 (PDT) From: Vincent Guittot To: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org Cc: preeti@linux.vnet.ibm.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 v3 04/12] sched: Allow all archs to set the power_orig Date: Mon, 30 Jun 2014 18:05:35 +0200 Message-Id: <1404144343-18720-5-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1404144343-18720-1-git-send-email-vincent.guittot@linaro.org> References: <1404144343-18720-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.128.182 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: , power_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_power that can be also used by non SMT platform to set power_orig. The weak behavior of arch_scale_cpu_power is the previous SMT one in order to keep backward compatibility in the use of power_orig. Signed-off-by: Vincent Guittot Acked-by: Rik van Riel --- kernel/sched/fair.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 148b277..f0bba5f 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5614,6 +5614,20 @@ unsigned long __weak arch_scale_smt_capacity(struct sched_domain *sd, int cpu) return default_scale_smt_capacity(sd, cpu); } +unsigned long __weak arch_scale_cpu_capacity(struct sched_domain *sd, int cpu) +{ + unsigned long weight = sd->span_weight; + + if ((sd->flags & SD_SHARE_CPUCAPACITY) && weight > 1) { + if (sched_feat(ARCH_CAPACITY)) + return arch_scale_smt_capacity(sd, cpu); + else + return default_scale_smt_capacity(sd, cpu); + } + + return SCHED_CAPACITY_SCALE; +} + static unsigned long scale_rt_capacity(int cpu) { struct rq *rq = cpu_rq(cpu); @@ -5650,18 +5664,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;