From patchwork Fri Aug 19 01:55:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Muckle X-Patchwork-Id: 9289127 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 42E97600CB for ; Fri, 19 Aug 2016 01:56:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 326992917C for ; Fri, 19 Aug 2016 01:56:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25EDE2918D; Fri, 19 Aug 2016 01:56:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9EFDC2917C for ; Fri, 19 Aug 2016 01:56:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754522AbcHSB4H (ORCPT ); Thu, 18 Aug 2016 21:56:07 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:34655 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754221AbcHSBzt (ORCPT ); Thu, 18 Aug 2016 21:55:49 -0400 Received: by mail-pa0-f47.google.com with SMTP id fi15so11017816pac.1 for ; Thu, 18 Aug 2016 18:55:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=AvhQg7xfZqCP9dFx1ZmK6SDS0+/8P2gkoIIjkexOmpY=; b=gkzRCE3kReG7EB2OqQ/Xw+FxInGISsIyw/i1VVNgzAlsKXYG5Umbys9wfBO3Caxypi oPcUc3uHXbQDg8xjWbknHTO17xwhubXC2LQ5qw8slYCSLMzD3bZd+UVrdg2p0ClaptcM DiglYmc3w190l3yoYUXPmcNNBv7RL+9AXwrnE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=AvhQg7xfZqCP9dFx1ZmK6SDS0+/8P2gkoIIjkexOmpY=; b=QHcvg4INP5Iw/5NlQ2xV28Dr4Ez802Ni6QSTdBFFFbT5tW0rJwxObJSFrkFUTTo8eq 3S/ef/qOKPib4AdtJVE4r4gQ1oeBro/cLMtFhOuQ7fMSDgQnWl1QBgoOXvc9ynZo/OlR oXoZIAN3ztonUHAOYmXnAWyafoCJCr5nl0T86B9drODF6fShtBdF/GfDu3n9bsJAJcSi B90boU55DSEF6ar1JJ6WvbaF8WxtyfXejtcYm3VwKUDZ0RbBt09aHME4BhN7DZo1zFZD tM4qLOgxg46jHCQKcKVckkkSwnwBoHri1HRbFmjSuJP5BmxNcrp8a9gcWDlXHlmiZ3Go JEfg== X-Gm-Message-State: AEkoouvm3jXt2CPzxbmD3ST8rIVNVLB/0v8U/8JwNTe2faT86N8gcFprUnREjcpVV60cYWUx X-Received: by 10.66.52.47 with SMTP id q15mr9011255pao.67.1471571748200; Thu, 18 Aug 2016 18:55:48 -0700 (PDT) Received: from graphite.smuckle.net (cpe-76-167-105-107.san.res.rr.com. [76.167.105.107]) by smtp.gmail.com with ESMTPSA id p4sm1652921pfp.60.2016.08.18.18.55.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Aug 2016 18:55:47 -0700 (PDT) From: Steve Muckle X-Google-Original-From: Steve Muckle To: Peter Zijlstra , Ingo Molnar Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, "Rafael J . Wysocki" , Vincent Guittot , Morten Rasmussen , Dietmar Eggemann , Juri Lelli , Patrick Bellasi , Steve Muckle Subject: [PATCH] sched: fix incorrect PELT values on SMT Date: Thu, 18 Aug 2016 18:55:41 -0700 Message-Id: <1471571741-19504-1-git-send-email-smuckle@linaro.org> X-Mailer: git-send-email 2.7.3 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP PELT scales its util_sum and util_avg values via arch_scale_cpu_capacity(). If that function is passed the CPU's sched domain then it will reduce the scaling capacity if SD_SHARE_CPUCAPACITY is set. PELT does not pass in the sd however. The other caller of arch_scale_cpu_capacity, update_cpu_capacity(), does. This means util_sum and util_avg scale beyond the CPU capacity on SMT. On an Intel i7-3630QM for example rq->cpu_capacity_orig is 589 but util_avg scales up to 1024. Fix this by passing in the sd in __update_load_avg() as well. Signed-off-by: Steve Muckle --- kernel/sched/fair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 61d485421bed..95d34b337152 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2731,7 +2731,7 @@ __update_load_avg(u64 now, int cpu, struct sched_avg *sa, sa->last_update_time = now; scale_freq = arch_scale_freq_capacity(NULL, cpu); - scale_cpu = arch_scale_cpu_capacity(NULL, cpu); + scale_cpu = arch_scale_cpu_capacity(cpu_rq(cpu)->sd, cpu); /* delta_w is the amount already accumulated against our next period */ delta_w = sa->period_contrib;