From patchwork Mon Jun 30 16:05:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 32774 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1440D203C0 for ; Mon, 30 Jun 2014 16:07:26 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id v10sf40094651pde.7 for ; Mon, 30 Jun 2014 09:07:26 -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=sPOjStVVd2gHiAAFu49GsRcl8kohWgmAExI9dlp+GTA=; b=U+Y0EjsNFZ6Bo/IFY0ubrvISiCDAmgu6NnlLn3I8g/NOZAXDwtWezJIovI8UUivlBV zBq76qN7hAHW0+y87i8v0kPbP6nWAr2JyMSys3HoLCQ7s3Mt50wrjdYSglMhJZ1OUID7 sEmoeSx7RWTXkzYIAfnRPXeb5rOH6BzmAJynI5Iazl79cs3Y/w+ksSrIEPNkmCfdjFs/ 5m3sE+OaF60kt2dl6yDBvVIlRfrHciCstI92UgFDN1CYreKAeK4w/iVEFe/PMEKqka5v /11IvVKtWR0M5oSLsZ8UKecC2YADA9eTOU4WhA3f4sZQ38fMXr30VK4Qba3iHLulG5Cf PSXQ== X-Gm-Message-State: ALoCoQl6qk0boAoLoTklwFQM4dlrupySUiqXwO8a+OsThHU6j8tyPfEOyN16K1kUGtyss9uISbCx X-Received: by 10.68.230.193 with SMTP id ta1mr22418578pbc.6.1404144446285; Mon, 30 Jun 2014 09:07:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.30.165 with SMTP id d34ls1613443qgd.25.gmail; Mon, 30 Jun 2014 09:07:26 -0700 (PDT) X-Received: by 10.58.216.4 with SMTP id om4mr1290415vec.66.1404144446085; Mon, 30 Jun 2014 09:07:26 -0700 (PDT) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id cn9si10228940vcb.71.2014.06.30.09.07.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 09:07:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.180 as permitted sender) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id jw12so8340308veb.39 for ; Mon, 30 Jun 2014 09:07:26 -0700 (PDT) X-Received: by 10.58.112.65 with SMTP id io1mr1300886veb.61.1404144446001; Mon, 30 Jun 2014 09:07:26 -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 tc5csp151241vcb; Mon, 30 Jun 2014 09:07:25 -0700 (PDT) X-Received: by 10.66.65.204 with SMTP id z12mr52226574pas.97.1404144445286; Mon, 30 Jun 2014 09:07:25 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id dm2si23671463pbb.68.2014.06.30.09.07.24; Mon, 30 Jun 2014 09:07:24 -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 S1756564AbaF3QHA (ORCPT + 27 others); Mon, 30 Jun 2014 12:07:00 -0400 Received: from mail-wg0-f45.google.com ([74.125.82.45]:53800 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754530AbaF3QG5 (ORCPT ); Mon, 30 Jun 2014 12:06:57 -0400 Received: by mail-wg0-f45.google.com with SMTP id l18so8546956wgh.16 for ; Mon, 30 Jun 2014 09:06:54 -0700 (PDT) X-Received: by 10.180.207.48 with SMTP id lt16mr30731526wic.32.1404144414904; Mon, 30 Jun 2014 09:06:54 -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.53 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 09:06:54 -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 06/12] sched: add per rq cpu_power_orig Date: Mon, 30 Jun 2014 18:05:37 +0200 Message-Id: <1404144343-18720-7-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.180 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: , This new field cpu_power_orig reflects the available capacity of a CPUs unlike the cpu_power which reflects the current capacity that can be altered by frequency and rt tasks. Signed-off-by: Vincent Guittot Acked-by: Rik van Riel --- kernel/sched/core.c | 2 +- kernel/sched/fair.c | 1 + kernel/sched/sched.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 54f5722..92dd6d1 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6964,7 +6964,7 @@ void __init sched_init(void) #ifdef CONFIG_SMP rq->sd = NULL; rq->rd = NULL; - rq->cpu_capacity = SCHED_CAPACITY_SCALE; + rq->cpu_capacity = rq->cpu_capacity_orig = SCHED_CAPACITY_SCALE; rq->post_schedule = 0; rq->active_balance = 0; rq->next_balance = jiffies; diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index f0bba5f..7dff578 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5671,6 +5671,7 @@ static void update_cpu_capacity(struct sched_domain *sd, int cpu) capacity >>= SCHED_CAPACITY_SHIFT; + cpu_rq(cpu)->cpu_capacity_orig = capacity; sdg->sgc->capacity_orig = capacity; if (sched_feat(ARCH_CAPACITY)) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 2f86361..7b311de 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -568,6 +568,7 @@ struct rq { struct sched_domain *sd; unsigned long cpu_capacity; + unsigned long cpu_capacity_orig; unsigned char idle_balance; /* For active balancing */