From patchwork Fri Oct 31 08:47:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 39871 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8A30C202FE for ; Fri, 31 Oct 2014 08:50:32 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id ge10sf3833470lab.9 for ; Fri, 31 Oct 2014 01:50:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=ZcYG9TWqOxQArkArGLzY7SUGGHy9Mk6UstuiA80vjPU=; b=WiQvw153oZumRY2dtmTV5S8zuhe7uftshSk/qYtKWOXMU21MgbIP3yL/ra9T7FwXzg 8vFz+c+Em9VwZc+yLZ821sSkawDVFqQZbqSwhKpzWBwSGZ1SklXZgVpZmDW0CA5yUSsm BaW5gaOZvVoIhSn5O6sFM+BTF5+H5aP2WIqukZSzcdHlUBoZljVpNaSGN3aonqCazpnd yf31VHabblc/jKA587+RzDaorFxondotGGkOC23TeEYVy+xD0BTxihCXWLuKhm94oKgx t13ZgVVgxZjdBna6Q516dFgQvbg4HxooyLmmWOnss2JOpcbd6XJ1Q9c9MWxk3f9gnRX1 fmZA== X-Gm-Message-State: ALoCoQmZSFQYyEIxfbspWvsVZWWABHc2ZJ9eIfsIvDx8tJ5ylTHrBVv39QiyRtG2phGrcirag0rw X-Received: by 10.112.217.102 with SMTP id ox6mr104382lbc.19.1414745431434; Fri, 31 Oct 2014 01:50:31 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.133 with SMTP id r5ls404782laa.65.gmail; Fri, 31 Oct 2014 01:50:31 -0700 (PDT) X-Received: by 10.112.170.131 with SMTP id am3mr1437656lbc.97.1414745431276; Fri, 31 Oct 2014 01:50:31 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id ri5si15569450lbb.115.2014.10.31.01.50.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 01:50:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id 10so5584762lbg.22 for ; Fri, 31 Oct 2014 01:50:31 -0700 (PDT) X-Received: by 10.152.29.8 with SMTP id f8mr24639222lah.56.1414745431143; Fri, 31 Oct 2014 01:50:31 -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.112.84.229 with SMTP id c5csp168248lbz; Fri, 31 Oct 2014 01:50:30 -0700 (PDT) X-Received: by 10.66.222.100 with SMTP id ql4mr23156544pac.123.1414745429637; Fri, 31 Oct 2014 01:50:29 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id uy3si8810392pab.42.2014.10.31.01.50.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Oct 2014 01:50:29 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xk7t9-0003PR-FE; Fri, 31 Oct 2014 08:48:55 +0000 Received: from mail-wi0-f173.google.com ([209.85.212.173]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xk7sh-00039O-0D for linux-arm-kernel@lists.infradead.org; Fri, 31 Oct 2014 08:48:27 +0000 Received: by mail-wi0-f173.google.com with SMTP id n3so673227wiv.6 for ; Fri, 31 Oct 2014 01:48:04 -0700 (PDT) X-Received: by 10.180.90.105 with SMTP id bv9mr2321029wib.53.1414745284491; Fri, 31 Oct 2014 01:48:04 -0700 (PDT) Received: from lmenx30s.st.com. (pas72-3-88-189-71-117.fbx.proxad.net. [88.189.71.117]) by mx.google.com with ESMTPSA id u5sm11636547wiz.9.2014.10.31.01.48.02 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 01:48:03 -0700 (PDT) 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.linux.org.uk, linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 02/10] sched: remove frequency scaling from cpu_capacity Date: Fri, 31 Oct 2014 09:47:24 +0100 Message-Id: <1414745252-4895-3-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1414745252-4895-1-git-send-email-vincent.guittot@linaro.org> References: <1414745252-4895-1-git-send-email-vincent.guittot@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141031_014827_229286_5F4FED66 X-CRM114-Status: UNSURE ( 9.28 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.173 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.212.173 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: nicolas.pitre@linaro.org, riel@redhat.com, efault@gmx.de, Vincent Guittot , linaro-kernel@lists.linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.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.177 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 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 c3674da..bd214d2 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5784,13 +5784,6 @@ static void update_cpu_capacity(struct sched_domain *sd, int cpu) cpu_rq(cpu)->cpu_capacity_orig = capacity; 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;