From patchwork Thu Nov 2 11:38:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Redpath X-Patchwork-Id: 117799 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2050091qgn; Thu, 2 Nov 2017 04:39:02 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Qx1z/TR9w6rbZ3lYjEGTSEN2ye6KG+R1R1bGxcGXrmRDZkfuDyE76lBUqlBJ7kEshVMbPZ X-Received: by 10.84.245.15 with SMTP id i15mr2982121pll.437.1509622742893; Thu, 02 Nov 2017 04:39:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509622742; cv=none; d=google.com; s=arc-20160816; b=Ah5rGUz0oWf2pEAHEwm69dWnPyZQmEQDCVGETo191NcDOgStUdw5aPJznt+rJPay9f EVnP0NDVPSDFfpAMeWfg6CIrKlBXL7jrnrygBIWnQWCpN3+Q3eqdT2jV1YJtZEhSvPnK kzGzDbKZThfpjiAFElbJ2x+swe+SGCF/sPneQKXLCNCuiDly6M2VQJnW21ULLUO5Xa+f MGq6tB9R9jl2e3fcgoZV0aersNrQ+nW3GhBdMMx/JNKYciaNq/C7EWfk+DvKOWwWNzL/ GjkjuSm1Aoh1VIdKj1yTXJAhk/qR8kZvAWX9vvnbQ8v/MwY8aK2vFjnq4kiTqaEfCmT0 wBJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Dr3LqmUeP9/tm7plCNt8hOfL09NyIk1gTEQl6+pHHHg=; b=zYmnehMkqVXFhH/UH6fxvsoIzEn/5fnk5eTs/t95i6p7AB+bZy4QafB49333KMHl50 v0IUwk8+9A4ujw9DAwSS4mthlHGspw9hV7siO0nwqrW+nJDPzT39KRJC0po28e9i/Ze/ yyE0oPetz1GZDFWpSLLqLit1cBBXR+4n8hnToudW7fGh31dfjaWh075Y2bHbxIeZmFA9 ycpXO/89j+nfBhBWBKkhMn+ZQM3S5JLe/avtTIvyJHqXzjGYS4Bt3oUiJHtmF2KD3xQ8 2uCOX3xCcqeOAgXEUxoBkmPDwF+IjyOqnxlzcV/Z6oHbpZO1PxQ5xZyLI/KyLxYw5cLq +78g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p4si3349060pga.269.2017.11.02.04.39.02; Thu, 02 Nov 2017 04:39:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750758AbdKBLjB (ORCPT + 11 others); Thu, 2 Nov 2017 07:39:01 -0400 Received: from foss.arm.com ([217.140.101.70]:58502 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750722AbdKBLjB (ORCPT ); Thu, 2 Nov 2017 07:39:01 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C65A91435; Thu, 2 Nov 2017 04:39:00 -0700 (PDT) Received: from e108031-lin.cambridge.arm.com (e108031-lin.cambridge.arm.com [10.1.211.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2972C3F3E1; Thu, 2 Nov 2017 04:38:59 -0700 (PDT) From: Chris Redpath To: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Cc: Morten Rasmussen , Dietmar Eggemann , Chris Redpath , "Rafael J . Wysocki" , Viresh Kumar , Ingo Molnar , Peter Zijlstra Subject: [PATCH v2] cpufreq: schedutil: Examine the correct CPU when we update util Date: Thu, 2 Nov 2017 11:38:40 +0000 Message-Id: <20171102113840.17439-1-chris.redpath@arm.com> X-Mailer: git-send-email 2.13.1.449.g02a2850 In-Reply-To: <20171102111022.GB4240@vireshk-i7> References: <20171102111022.GB4240@vireshk-i7> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Since: 4296f23ed cpufreq: schedutil: Fix per-CPU structure initialization in sugov_start() We lost the value of sg_cpu->cpu which is assigned during sugov_register. The memset in sugov_start overwrites it with zero. The change here was triggered by the commit adding the remote update functionality. 674e75411fc2 ("sched: cpufreq: Allow remote cpufreq callbacks") This leads to always looking at the utilization of CPU0 instead of the one we just updated when we do a utilization update callback. Let's fix this by consolidating the initialization code into sugov_start(). Fixes: 674e75411fc2 ("sched: cpufreq: Allow remote cpufreq callbacks") Signed-off-by: Chris Redpath Reviewed-by: Patrick Bellasi Reviewed-by: Brendan Jackman Cc: Rafael J. Wysocki Cc: Viresh Kumar Cc: Ingo Molnar Cc: Peter Zijlstra --- kernel/sched/cpufreq_schedutil.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -- 2.13.1.449.g02a2850 diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c index 6c1a7fcfa2a7..dc68a1ccdb33 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq_schedutil.c @@ -728,6 +728,7 @@ static int sugov_start(struct cpufreq_policy *policy) struct sugov_cpu *sg_cpu = &per_cpu(sugov_cpu, cpu); memset(sg_cpu, 0, sizeof(*sg_cpu)); + sg_cpu->cpu = cpu; sg_cpu->sg_policy = sg_policy; sg_cpu->flags = SCHED_CPUFREQ_RT; sg_cpu->iowait_boost_max = policy->cpuinfo.max_freq; @@ -793,11 +794,6 @@ struct cpufreq_governor *cpufreq_default_governor(void) static int __init sugov_register(void) { - int cpu; - - for_each_possible_cpu(cpu) - per_cpu(sugov_cpu, cpu).cpu = cpu; - return cpufreq_register_governor(&schedutil_gov); } fs_initcall(sugov_register);