From patchwork Fri Feb 27 15:54:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 45257 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2165B20674 for ; Fri, 27 Feb 2015 16:03:31 +0000 (UTC) Received: by lbdu10 with SMTP id u10sf15231362lbd.3 for ; Fri, 27 Feb 2015 08:03:30 -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=WZqF3saWOCboBTbBQgtwxSGUaAJrin/1X6Mm9MOikl8=; b=hSubcmT+L7vyrNKakFnHOXJbOYY2BUUUWGMj0MqTJJJMGE1Ct078onhJXdPuzQ6t8/ KZhBlshmtjYHhgIXKSKQ9fmDXIDV5eBEZKtTAbtPSxPmumrf+g0zF6vOi6ipZh8aO19G cn+wLm2gZ5kIzR82IW2ibm+xP7StahrDRT8dkTEpYsTOPOXXMTMUXgScv+JOXB7yYI36 Ussnc98qg/fSQP8wAAPWGeTKrIjAmaWYIMgvMpG210DnU9ju3OBxlkseJf8w4phsT2hi eMmqadOfZaRjNfT0zfD/rAiJPj2+le41RSereE20XWFeqiXKSLD3akBboD3U6g9vOpom CAgw== X-Gm-Message-State: ALoCoQk9GRekAvEbKHG5UEsCSWq7v/Tcn/vdHx0uAZoxb/txDKdBxPTMTeSuGuGIb0tNwDDHk/M3 X-Received: by 10.194.201.10 with SMTP id jw10mr2179158wjc.3.1425053010121; Fri, 27 Feb 2015 08:03:30 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.88.98 with SMTP id bf2ls188768lab.70.gmail; Fri, 27 Feb 2015 08:03:29 -0800 (PST) X-Received: by 10.112.73.104 with SMTP id k8mr12907570lbv.120.1425053009684; Fri, 27 Feb 2015 08:03:29 -0800 (PST) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id 7si3166500lai.138.2015.02.27.08.03.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Feb 2015 08:03:29 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by lbvn10 with SMTP id n10so18214635lbv.6 for ; Fri, 27 Feb 2015 08:03:29 -0800 (PST) X-Received: by 10.152.203.194 with SMTP id ks2mr13303779lac.88.1425053009542; Fri, 27 Feb 2015 08:03:29 -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.35.133 with SMTP id h5csp4032777lbj; Fri, 27 Feb 2015 08:03:28 -0800 (PST) X-Received: by 10.70.88.71 with SMTP id be7mr24869765pdb.41.1425053007674; Fri, 27 Feb 2015 08:03:27 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ay6si6176537pac.12.2015.02.27.08.03.25; Fri, 27 Feb 2015 08:03:27 -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 S1755342AbbB0QDU (ORCPT + 28 others); Fri, 27 Feb 2015 11:03:20 -0500 Received: from mail-wi0-f170.google.com ([209.85.212.170]:37270 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754605AbbB0PzI (ORCPT ); Fri, 27 Feb 2015 10:55:08 -0500 Received: by wivr20 with SMTP id r20so1195708wiv.2 for ; Fri, 27 Feb 2015 07:55:06 -0800 (PST) X-Received: by 10.194.122.38 with SMTP id lp6mr29999206wjb.24.1425052506495; Fri, 27 Feb 2015 07:55:06 -0800 (PST) Received: from lmenx30s.lme.st.com (LPuteaux-656-1-48-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPSA id y3sm6519459wju.14.2015.02.27.07.55.04 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 27 Feb 2015 07:55:05 -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 Cc: riel@redhat.com, efault@gmx.de, nicolas.pitre@linaro.org, dietmar.eggemann@arm.com, linaro-kernel@lists.linaro.org, Vincent Guittot Subject: [PATCH v10 03/11] sched: remove frequency scaling from cpu_capacity Date: Fri, 27 Feb 2015 16:54:06 +0100 Message-Id: <1425052454-25797-4-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1425052454-25797-1-git-send-email-vincent.guittot@linaro.org> References: <1425052454-25797-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.217.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: , 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 Acked-by: Morten Rasmussen --- kernel/sched/fair.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index d94a865..e54231f 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6042,13 +6042,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;