From patchwork Mon Nov 3 16:54:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 40050 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BC2A821894 for ; Mon, 3 Nov 2014 16:56:27 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id d17sf3083326eek.11 for ; Mon, 03 Nov 2014 08:56:27 -0800 (PST) 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=RlnlXKTMBxtbsuN2sE1td16JUEBzXLPuta6skOVqCe4=; b=lD07Brb/IyFOI0J/ClrumJDmBeNkGM4G5gI2KoNlOzbzGpxBzghKSutYJbWVg0V7pi Ss8TrSbE50+2hHlX3SFHNb58gIHit7rHLqP/qo7ds9TS7qdcvnh2CJUtzGzZlzjv2xug AA1Ccq5xakc6214NWzKTOT0h4ZWUJZW3XnEQLCY/DQNu7bdpRGTFGJlosQiXUx1xq6AD jPNpYu8l/P5xwNiwZdeCdHW8uhTJ8HtPtVboodewfFcmz5GxycbfYam7+fcxU09UEXER 6JRomdojrKElUzleWko5551izSbZ0+j9DOouAORbFWD4fSNI6AH0fUEtqMbOvLHIjBYr iUUw== X-Gm-Message-State: ALoCoQlRaHJ6lqOL14Y2m48xwm/psjJhnfCeV1ybJW0puACYcWLMWuOUA/7LY38/geMof5PHrIiJ X-Received: by 10.112.55.10 with SMTP id n10mr656120lbp.14.1415033787022; Mon, 03 Nov 2014 08:56:27 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.9 with SMTP id p9ls787106lag.80.gmail; Mon, 03 Nov 2014 08:56:26 -0800 (PST) X-Received: by 10.112.150.41 with SMTP id uf9mr5081743lbb.100.1415033786842; Mon, 03 Nov 2014 08:56:26 -0800 (PST) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id ui10si33237383lbb.62.2014.11.03.08.56.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Nov 2014 08:56:26 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by mail-la0-f45.google.com with SMTP id pn19so4442801lab.4 for ; Mon, 03 Nov 2014 08:56:26 -0800 (PST) X-Received: by 10.112.12.35 with SMTP id v3mr52207978lbb.80.1415033786684; Mon, 03 Nov 2014 08:56:26 -0800 (PST) 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.112.141.34 with SMTP id rl2csp20958lbb; Mon, 3 Nov 2014 08:56:25 -0800 (PST) X-Received: by 10.68.138.196 with SMTP id qs4mr44912987pbb.39.1415033785062; Mon, 03 Nov 2014 08:56:25 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ko3si15808133pdb.14.2014.11.03.08.56.24 for ; Mon, 03 Nov 2014 08:56:25 -0800 (PST) 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 S1753408AbaKCQ4U (ORCPT + 25 others); Mon, 3 Nov 2014 11:56:20 -0500 Received: from mail-wi0-f172.google.com ([209.85.212.172]:58551 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753306AbaKCQ4G (ORCPT ); Mon, 3 Nov 2014 11:56:06 -0500 Received: by mail-wi0-f172.google.com with SMTP id bs8so7061444wib.5 for ; Mon, 03 Nov 2014 08:56:03 -0800 (PST) X-Received: by 10.180.13.11 with SMTP id d11mr17675376wic.19.1415033763530; Mon, 03 Nov 2014 08:56:03 -0800 (PST) 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 s8sm22798078wjx.9.2014.11.03.08.56.01 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Nov 2014 08:56:02 -0800 (PST) From: Vincent Guittot To: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, preeti@linux.vnet.ibm.com, Morten.Rasmussen@arm.com, kamalesh@linux.vnet.ibm.com, linux-arm-kernel@lists.infradead.org Cc: riel@redhat.com, efault@gmx.de, nicolas.pitre@linaro.org, linaro-kernel@lists.linaro.org, Vincent Guittot Subject: [PATCH v9 03/10] sched: remove frequency scaling from cpu_capacity Date: Mon, 3 Nov 2014 17:54:40 +0100 Message-Id: <1415033687-23294-4-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415033687-23294-1-git-send-email-vincent.guittot@linaro.org> References: <1415033687-23294-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.215.45 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: , Now that arch_scale_cpu_capacity has been introduced to scale the original capacity, the arch_scale_freq_capacity is no longer used (it was previously used by ARM arch). Remove arch_scale_freq_capacity from the computation of cpu_capacity. The frequency invariance will be handled in the load tracking and not in the CPU capacity. arch_scale_freq_capacity will be revisited for scaling load with the current frequency of the CPUs in a later patch. Signed-off-by: Vincent Guittot --- kernel/sched/fair.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index a171e1b..a96affd 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5823,13 +5823,6 @@ static void update_cpu_capacity(struct sched_domain *sd, int cpu) sdg->sgc->capacity_orig = capacity; - if (sched_feat(ARCH_CAPACITY)) - capacity *= arch_scale_freq_capacity(sd, cpu); - else - capacity *= default_scale_capacity(sd, cpu); - - capacity >>= SCHED_CAPACITY_SHIFT; - capacity *= scale_rt_capacity(cpu); capacity >>= SCHED_CAPACITY_SHIFT;