From patchwork Tue Jun 9 03:09:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 49641 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 4F01921419 for ; Tue, 9 Jun 2015 03:09:54 +0000 (UTC) Received: by lbcue7 with SMTP id ue7sf1227055lbc.3 for ; Mon, 08 Jun 2015 20:09:53 -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:date:from:to:cc:subject:message-id :references:mime-version:content-type:content-disposition :in-reply-to:user-agent:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=O3oDIB5YtZM2UWbA3g4n9Qj/WYQs4JCFbK2iyCHGW6Y=; b=iOwog/SwIbcRvtPGMVnC1+s7FFi6mlL+QKtyv85d8h8WFsFeDlbF4oWo7lUH7uux1R wbnGLPrArIzfbWV3f3NDcPhcS6c+ZKjJVbPyPGQKUAKktkCUHoIW46AmvFpfjRxp9kyl 3XIeT3xpY27r9TDPrh9oHoziwXWit01CdeltIbEwgouX5+r30b7TdEh1cKiiG9UnQVuZ 3942+ptkcCp5DmVnlXAjD+N1u/j90Xw+HesTkV6vqPJYpLrO6c5MWyvI1IewcAs9sn+f m+xLNGNjMGKyB1eMP0cJ1bbB77ECB8WrTnJ2g166oXt+1TpfTy8n+ErlUQ9rABy2a8gi BcSg== X-Gm-Message-State: ALoCoQk1BCXPzhNkXS46GBG8aqG0CtlbjhpV1DtsWR7RFo+w3nER9iQDdhQqRTK9C955KK1XksVz X-Received: by 10.194.47.179 with SMTP id e19mr19863867wjn.4.1433819393265; Mon, 08 Jun 2015 20:09:53 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.7 with SMTP id m7ls16977laj.70.gmail; Mon, 08 Jun 2015 20:09:53 -0700 (PDT) X-Received: by 10.152.43.134 with SMTP id w6mr19764974lal.120.1433819393101; Mon, 08 Jun 2015 20:09:53 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id sj5si4539880lbb.44.2015.06.08.20.09.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jun 2015 20:09:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbbqq2 with SMTP id qq2so3026295lbb.3 for ; Mon, 08 Jun 2015 20:09:52 -0700 (PDT) X-Received: by 10.152.22.99 with SMTP id c3mr20456722laf.32.1433819392632; Mon, 08 Jun 2015 20:09:52 -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.108.230 with SMTP id hn6csp2284684lbb; Mon, 8 Jun 2015 20:09:51 -0700 (PDT) X-Received: by 10.70.90.1 with SMTP id bs1mr34918428pdb.10.1433819390782; Mon, 08 Jun 2015 20:09:50 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rf2si6786393pbc.225.2015.06.08.20.09.49; Mon, 08 Jun 2015 20:09:50 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750814AbbFIDJs (ORCPT + 11 others); Mon, 8 Jun 2015 23:09:48 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:34599 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752770AbbFIDJs (ORCPT ); Mon, 8 Jun 2015 23:09:48 -0400 Received: by payr10 with SMTP id r10so4612980pay.1 for ; Mon, 08 Jun 2015 20:09:47 -0700 (PDT) X-Received: by 10.68.224.72 with SMTP id ra8mr35005182pbc.29.1433819387628; Mon, 08 Jun 2015 20:09:47 -0700 (PDT) Received: from localhost ([122.167.219.251]) by mx.google.com with ESMTPSA id pa1sm3860775pdb.73.2015.06.08.20.09.46 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 08 Jun 2015 20:09:46 -0700 (PDT) Date: Tue, 9 Jun 2015 08:39:43 +0530 From: Viresh Kumar To: "Rafael J. Wysocki" Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, sboyd@codeaurora.org, prarit@redhat.com, skannan@codeaurora.org, Srivatsa Bhat Subject: Re: [PATCH V7 5/6] cpufreq: Restart governor as soon as possible Message-ID: <20150609030943.GF4829@linux> References: <5802c619494ba09e5c7621722e5a0778519c6a98.1433767914.git.viresh.kumar@linaro.org> <1969774.NfEI2hyvTT@vostro.rjw.lan> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1969774.NfEI2hyvTT@vostro.rjw.lan> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@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.173 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: , On 09-06-15, 01:27, Rafael J. Wysocki wrote: > Any explanation why this is correct here? Does this look better ? (Code isn't updated) From: Viresh Kumar Date: Thu, 19 Feb 2015 11:53:02 +0530 Subject: [PATCH] cpufreq: Restart governor as soon as possible __cpufreq_remove_dev_finish() is doing two things today: - Restarts the governor if some CPUs from concerned policy are still online. - Frees the policy if all CPUs are offline. The first task of restarting the governor can be moved to __cpufreq_remove_dev_prepare() to restart the governor early. There is no race between _prepare() and _finish() as they would be handling completely different cases. _finish() will only be required if we are going to free the policy and that has nothing to do with restarting the governor. [ Something similar attempted by Saravana earlier ] Signed-off-by: Viresh Kumar --- drivers/cpufreq/cpufreq.c | 59 +++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 8b810071ddd2..c355ab656dfb 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1428,8 +1428,8 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif) static int __cpufreq_remove_dev_prepare(struct device *dev, struct subsys_interface *sif) { - unsigned int cpu = dev->id, cpus; - int ret; + unsigned int cpu = dev->id; + int ret = 0; struct cpufreq_policy *policy; pr_debug("%s: unregistering CPU %u\n", __func__, cpu); @@ -1449,23 +1449,33 @@ static int __cpufreq_remove_dev_prepare(struct device *dev, } down_write(&policy->rwsem); - cpus = cpumask_weight(policy->cpus); + cpumask_clear_cpu(cpu, policy->cpus); - if (has_target() && cpus == 1) - strncpy(policy->last_governor, policy->governor->name, - CPUFREQ_NAME_LEN); + if (policy_is_inactive(policy)) { + if (has_target()) + strncpy(policy->last_governor, policy->governor->name, + CPUFREQ_NAME_LEN); + } else if (cpu == policy->cpu) { + /* Nominate new CPU */ + policy->cpu = cpumask_any(policy->cpus); + } up_write(&policy->rwsem); - if (cpu != policy->cpu) - return 0; + /* Start governor again for active policy */ + if (!policy_is_inactive(policy)) { + if (has_target()) { + ret = __cpufreq_governor(policy, CPUFREQ_GOV_START); + if (!ret) + ret = __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS); - if (cpus > 1) - /* Nominate new CPU */ - update_policy_cpu(policy, cpumask_any_but(policy->cpus, cpu)); - else if (cpufreq_driver->stop_cpu) + if (ret) + pr_err("%s: Failed to start governor\n", __func__); + } + } else if (cpufreq_driver->stop_cpu) { cpufreq_driver->stop_cpu(policy); + } - return 0; + return ret; } static int __cpufreq_remove_dev_finish(struct device *dev, @@ -1473,33 +1483,16 @@ static int __cpufreq_remove_dev_finish(struct device *dev, { unsigned int cpu = dev->id; int ret; - struct cpufreq_policy *policy = cpufreq_cpu_get_raw(cpu); + struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu); if (!policy) { pr_debug("%s: No cpu_data found\n", __func__); return -EINVAL; } - down_write(&policy->rwsem); - cpumask_clear_cpu(cpu, policy->cpus); - up_write(&policy->rwsem); - - /* Not the last cpu of policy, start governor again ? */ - if (!policy_is_inactive(policy)) { - if (!has_target()) - return 0; - - ret = __cpufreq_governor(policy, CPUFREQ_GOV_START); - if (!ret) - ret = __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS); - - if (ret) { - pr_err("%s: Failed to start governor\n", __func__); - return ret; - } - + /* Only proceed for inactive policies */ + if (!policy_is_inactive(policy)) return 0; - } /* If cpu is last user of policy, free policy */ if (has_target()) {