From patchwork Fri Jun 9 10:15:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 103454 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp134495qgd; Fri, 9 Jun 2017 03:16:47 -0700 (PDT) X-Received: by 10.84.209.199 with SMTP id y65mr39941215plh.205.1497003407290; Fri, 09 Jun 2017 03:16:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497003407; cv=none; d=google.com; s=arc-20160816; b=OOZWJjej3OvebDDumitt/+DzMj+ZQtmpa0d0zv1HgKm050qghRPCxzKAKt5jDZphLo t9+uFHaP3I+XKMlAx7Tby4eKBIuuLjUBp97lTffIThAyZxQI41w5UnlDUJDE5TISK+v1 Dd4wj8AIHjcEvIn2yhnDLx2SzTX51XL81m8QMunx3Yk/MIRC3fUU06q4GT4APJa/UmcN EFv9Jai6/JDoUPzYj6UwsneHxfwXuViztaO5WQ0+2b/Or4Dy9Cgx8bSLQeJuthp1zDB+ lGcmdF3CSjIipJgbgaqQ+U22lXpWCFyd1pCyu+9bnDtFht1LhrvTDcTnBQnabMxY+Xh/ DBEQ== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=iNIPBUzu78kEopRMpFZEn3IhqMyZEPxVfPvhE9rQhL0=; b=vFoyGgojfIqBxaS8XiM4MijXoPTrNs+IZ6ALtTeE0E/SGLPSgATMw3UGXoVwa/vrMR tW+xwYC49s9ZsCjmSj91FGj11Zp9ZFEIj3QNEC1wJJS/1ZOazNryki+E4LHay6tZcvEz +Sodzwfg7TNw+CrFbVndcIojnsDrYMguCu/Jx+HOM7uvHgYWvQmszu/VSO5fCPAc80bE OH9cYEBebNfHcb8fkabpOIv7F1aLVGkIrCO8wQEqxwSlb0fSlsw/X6UIrdUL9AmRnUE8 kdaGl73RdbZSGlrvYiXRdVg1whJsFTMZnNQcvkKFeEE7z7tx2cNAcyL1zbUR6fT/wQfY cbsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p26si6671216pgc.348.2017.06.09.03.16.47; Fri, 09 Jun 2017 03:16:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751721AbdFIKQn (ORCPT + 25 others); Fri, 9 Jun 2017 06:16:43 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:32964 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751616AbdFIKQP (ORCPT ); Fri, 9 Jun 2017 06:16:15 -0400 Received: by mail-pf0-f169.google.com with SMTP id 83so27095319pfr.0 for ; Fri, 09 Jun 2017 03:16:15 -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:in-reply-to:references :in-reply-to:references; bh=iNIPBUzu78kEopRMpFZEn3IhqMyZEPxVfPvhE9rQhL0=; b=k1Mx5wHM7J/9J7J8OIT1aSAbSnthGvcLyyYsJcyyzIhmv5UmVfRXY12X2VMnYXiB2c A1NPo4K27WDrmQeDsfHmD1GDmnsZSm9HtyUIwrd1KTOYz3fkzCyVZM6zeyHF8ZJmKAg0 8VofnRwXtwGCwaXDiMDKP1XJFc1bM607Qwnjc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=iNIPBUzu78kEopRMpFZEn3IhqMyZEPxVfPvhE9rQhL0=; b=dU5NzJfXlGaEZJ1EPpz/HFmdUnu83jtrEeg9xBc1Buj/zABcJz5ACot/u23vb3zmnL F7vB3cdIUOqrRZ5P5yw65Aiu/a7qHMmL6nUoXtzBxSpsD71MBTSZA+eSWbChbCRHYBGf qLxKACeAXkp7I5G33QFWoh9yM35qjgOLRN4Fej0jQctDBQxlR3BKuRtN1byGPEzj5con hPj/Vqd3V5LLKhvDJUaDY445dTVIdNgREFr7nNCKcTYXwkAboJZ1hVilgBLat8MGPexY t0V8+LbiUfxVP7VoutzD1AzxXLKJ+zY8H1LDCX5x205upRPotYWJrC1MksqiZtIaMbLP MZdg== X-Gm-Message-State: AODbwcAOnpK683pi/bYyajdKDbcklJS3MKzFhMoKb1k4RjSfB8EFgWmO qv8CL6oHkenl4hW1 X-Received: by 10.84.135.129 with SMTP id 1mr39115233plj.57.1497003374661; Fri, 09 Jun 2017 03:16:14 -0700 (PDT) Received: from localhost ([122.172.91.138]) by smtp.gmail.com with ESMTPSA id 71sm1617192pgd.57.2017.06.09.03.16.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Jun 2017 03:16:14 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , Srinivas Pandruvada , Len Brown , Viresh Kumar Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Vincent Guittot , Juri Lelli , Ingo Molnar , Peter Zijlstra , patrick.bellasi@arm.com, john.ettedgui@gmail.com, Joel Fernandes , Morten Rasmussen Subject: [PATCH 3/3] cpufreq: intel_pstate: Provide resolve_freq() to fix regression Date: Fri, 9 Jun 2017 15:45:56 +0530 Message-Id: X-Mailer: git-send-email 2.13.0.70.g6367777092d9 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When the schedutil governor calls cpufreq_driver_resolve_freq() for the intel_pstate (in passive mode) driver, it simply returns the requested frequency as there is no ->resolve_freq() callback provided. The result is that get_next_freq() doesn't get a chance to know the frequency which will be set eventually and we can hit a potential regression as explained in the following paragraph. For example, consider the possible range of frequencies as 900 MHz, 1 GHz, 1.1 GHz, and 1.2 GHz. If the current frequency is 1.1 GHz and the next frequency (based on current utilization) is 1 GHz, then the schedutil governor will try to set the average of these as the next frequency (i.e. 1.05 GHz). Because we always try to find the lowest frequency greater than equal to the target frequency, the intel_pstate driver will end up setting the frequency as 1.1 GHz. Though the sg_policy->next_freq field gets updated with the average frequency only. And so we will finally select the min frequency when the next_freq is 1 more than the min frequency as the average then will be equal to the min frequency. But that will also take lots of iterations of the schedutil update callbacks. Fix that by providing a resolve_freq() callback. Tested on desktop with Intel Skylake processors. Fixes: 39b64aa1c007 ("cpufreq: schedutil: Reduce frequencies slower") Signed-off-by: Viresh Kumar --- drivers/cpufreq/intel_pstate.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- 2.13.0.70.g6367777092d9 diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 029a93bfb558..e177352180c3 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -2213,6 +2213,19 @@ static int intel_cpufreq_target(struct cpufreq_policy *policy, return 0; } +unsigned int intel_cpufreq_resolve_freq(struct cpufreq_policy *policy, + unsigned int target_freq) +{ + struct cpudata *cpu = all_cpu_data[policy->cpu]; + int target_pstate; + + update_turbo_state(); + + target_pstate = DIV_ROUND_UP(target_freq, cpu->pstate.scaling); + target_pstate = intel_pstate_prepare_request(cpu, target_pstate); + return target_pstate * cpu->pstate.scaling; +} + static unsigned int intel_cpufreq_fast_switch(struct cpufreq_policy *policy, unsigned int target_freq) { @@ -2246,6 +2259,7 @@ static struct cpufreq_driver intel_cpufreq = { .flags = CPUFREQ_CONST_LOOPS, .verify = intel_cpufreq_verify_policy, .target = intel_cpufreq_target, + .resolve_freq = intel_cpufreq_resolve_freq, .fast_switch = intel_cpufreq_fast_switch, .init = intel_cpufreq_cpu_init, .exit = intel_pstate_cpu_exit,