From patchwork Thu Jan 15 10:09:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 43164 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DEC12240BA for ; Thu, 15 Jan 2015 10:17:46 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id b57sf7656152eek.1 for ; Thu, 15 Jan 2015 02:17:46 -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=BVKhpgb96IhKYXKeERmcf8s9DHCFqmiJW+N4nMhRC0VlXkJGN4F3SGDDncq45d9KvW uDcKk58HRx5ApEWNYDBNAaOKHYzfx/ilMh6EHPi77llK0CKZzyLoTneNAMUXXwBVIEB2 RCZ1rw1eKmxW/YNAtqAoms54cplfMVVTSm645BeAcE39ng+fLVFB1yYOYmNsuDMkAzgz /QZ1Z93OBe63V5ypMsH37zqJmmiQ4RNnC+GeCnr6KDX8t/qfuEdg4jTytjjGCHvkcHxU A4cExM2I6NAPafnd5Vro27ctH6IgcL7Ukh0D1sDxOts1JYe56vQGjMqeUYqEi0Kil0Kk /siw== X-Gm-Message-State: ALoCoQnld2P6I2/6RA5pF9oNGPHQCADym3NIvEIyhqbzr28+xQW1nKVF5k4Y3DRzRFsV2fWfnPbC X-Received: by 10.194.176.200 with SMTP id ck8mr1143664wjc.0.1421317066079; Thu, 15 Jan 2015 02:17:46 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.161.198 with SMTP id xu6ls197974lab.86.gmail; Thu, 15 Jan 2015 02:17:45 -0800 (PST) X-Received: by 10.112.97.163 with SMTP id eb3mr2641220lbb.47.1421317065890; Thu, 15 Jan 2015 02:17:45 -0800 (PST) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id wn3si1019478lbb.25.2015.01.15.02.17.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 02:17:45 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by mail-lb0-f171.google.com with SMTP id w7so12483026lbi.2 for ; Thu, 15 Jan 2015 02:17:45 -0800 (PST) X-Received: by 10.112.90.170 with SMTP id bx10mr8781770lbb.69.1421317065798; Thu, 15 Jan 2015 02:17:45 -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.9.200 with SMTP id c8csp1982504lbb; Thu, 15 Jan 2015 02:17:44 -0800 (PST) X-Received: by 10.70.47.6 with SMTP id z6mr2982653pdm.82.1421317063946; Thu, 15 Jan 2015 02:17:43 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rl7si1271747pab.145.2015.01.15.02.17.42; Thu, 15 Jan 2015 02:17:43 -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 S1753436AbbAOKRj (ORCPT + 28 others); Thu, 15 Jan 2015 05:17:39 -0500 Received: from mail-we0-f173.google.com ([74.125.82.173]:46782 "EHLO mail-we0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752858AbbAOKMc (ORCPT ); Thu, 15 Jan 2015 05:12:32 -0500 Received: by mail-we0-f173.google.com with SMTP id q58so13732812wes.4 for ; Thu, 15 Jan 2015 02:12:31 -0800 (PST) X-Received: by 10.180.81.7 with SMTP id v7mr17197796wix.74.1421316751026; Thu, 15 Jan 2015 02:12:31 -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 fi10sm15113674wib.13.2015.01.15.02.12.27 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 02:12:30 -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 RESEND v9 03/10] sched: remove frequency scaling from cpu_capacity Date: Thu, 15 Jan 2015 11:09:23 +0100 Message-Id: <1421316570-23097-4-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1421316570-23097-1-git-send-email-vincent.guittot@linaro.org> References: <1421316570-23097-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.171 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;