From patchwork Wed Feb 4 18:30:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morten Rasmussen X-Patchwork-Id: 44383 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C590E21173 for ; Wed, 4 Feb 2015 18:44:56 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id b6sf2531438lbj.0 for ; Wed, 04 Feb 2015 10:44:55 -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=ddFU/JK2RKXZPaFDlpwwyvfModkvcwnE/eP3i2REJUc=; b=fREDTojedbrVo6UEM5vCLV0kxKjcUnvq67cWM0/+pBdPbHbFhcGPBaG3/XeeF4VhpM 2axa47ZXm74lRlKEMNfs4MfKuH82c7RCCE1+qNyKt/tRFAOYyYEaIK47v3jJ+/mB+pJR sGdTsUn8Yo/vmX4E+1C3yFTmXgxfmEoOrYI9JJypcJ87uyfWy9Tn904prZbHgM+gG0iC iN9dWjTk/dJOdoGo/bkmv7rwEFEDODITJhJu1GOxgA9Qys1QWC+yr73AswRASkhKPfse t8TL0ABaMZhMUBisYSPOCQXZbFLoXGz2sj7Vujvy881EGhkocHGKByludHZlPUAF6GTJ Xiug== X-Gm-Message-State: ALoCoQn8VouIu/Qv0w4vrgctfVJVS+m504SqogMJ3tV2DAvaNpSM8NplA095alEUFb0W1vScSXwL X-Received: by 10.112.160.3 with SMTP id xg3mr1788303lbb.5.1423075495732; Wed, 04 Feb 2015 10:44:55 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.4.10 with SMTP id ca10ls75037lad.33.gmail; Wed, 04 Feb 2015 10:44:55 -0800 (PST) X-Received: by 10.112.198.1 with SMTP id iy1mr32117822lbc.13.1423075495524; Wed, 04 Feb 2015 10:44:55 -0800 (PST) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id sg5si2133507lbb.19.2015.02.04.10.44.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Feb 2015 10:44:55 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by mail-la0-f53.google.com with SMTP id gq15so3214438lab.12 for ; Wed, 04 Feb 2015 10:44:55 -0800 (PST) X-Received: by 10.112.140.74 with SMTP id re10mr4509508lbb.80.1423075495248; Wed, 04 Feb 2015 10:44:55 -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 h5csp671436lbj; Wed, 4 Feb 2015 10:44:54 -0800 (PST) X-Received: by 10.70.34.177 with SMTP id a17mr6030015pdj.123.1423075491670; Wed, 04 Feb 2015 10:44:51 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ak2si3038446pad.207.2015.02.04.10.44.50; Wed, 04 Feb 2015 10:44:51 -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 S1162285AbbBDSoq (ORCPT + 29 others); Wed, 4 Feb 2015 13:44:46 -0500 Received: from foss-mx-na.foss.arm.com ([217.140.108.86]:41499 "EHLO foss-mx-na.foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933942AbbBDSar (ORCPT ); Wed, 4 Feb 2015 13:30:47 -0500 Received: from foss-smtp-na-1.foss.arm.com (unknown [10.80.61.8]) by foss-mx-na.foss.arm.com (Postfix) with ESMTP id 2F1F0514; Wed, 4 Feb 2015 12:30:39 -0600 (CST) Received: from collaborate-mta1.arm.com (highbank-bc01-b06.austin.arm.com [10.112.81.134]) by foss-smtp-na-1.foss.arm.com (Postfix) with ESMTP id D3A425FAC2; Wed, 4 Feb 2015 12:30:36 -0600 (CST) Received: from e105550-lin.cambridge.arm.com (e105550-lin.cambridge.arm.com [10.2.131.193]) by collaborate-mta1.arm.com (Postfix) with ESMTP id 49E8413F6EE; Wed, 4 Feb 2015 12:30:35 -0600 (CST) From: Morten Rasmussen To: peterz@infradead.org, mingo@redhat.com Cc: vincent.guittot@linaro.org, dietmar.eggemann@arm.com, yuyang.du@intel.com, preeti@linux.vnet.ibm.com, mturquette@linaro.org, nico@linaro.org, rjw@rjwysocki.net, juri.lelli@arm.com, linux-kernel@vger.kernel.org Subject: [RFCv3 PATCH 03/48] sched: remove frequency scaling from cpu_capacity Date: Wed, 4 Feb 2015 18:30:40 +0000 Message-Id: <1423074685-6336-4-git-send-email-morten.rasmussen@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1423074685-6336-1-git-send-email-morten.rasmussen@arm.com> References: <1423074685-6336-1-git-send-email-morten.rasmussen@arm.com> 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: morten.rasmussen@arm.com 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.53 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: , From: Vincent Guittot 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 fad93d8..35fd296 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6030,13 +6030,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;