linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Viresh Kumar <viresh.kumar@linaro.org>
To: rjw@sisk.pl
Cc: linaro-kernel@lists.linaro.org, patches@linaro.org,
	cpufreq@vger.kernel.org, linux-pm@vger.kernel.org,
	linux-kernel@vger.kernel.org, robin.randhawa@arm.com,
	Steve.Bannister@arm.com, Liviu.Dudau@arm.com,
	charles.garcia-tobin@arm.com, arvind.chauhan@arm.com,
	dave.martin@arm.com, Viresh Kumar <viresh.kumar@linaro.org>
Subject: [PATCH 13/13] cpufreq: make sure frequency transitions are serialized
Date: Wed, 19 Jun 2013 14:23:07 +0530	[thread overview]
Message-ID: <0bebf56a27f799a282cc00d0c17c187f9941f122.1371630975.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1371630975.git.viresh.kumar@linaro.org>
In-Reply-To: <cover.1371630975.git.viresh.kumar@linaro.org>

Whenever we are changing frequency of a cpu, we are calling PRECHANGE and
POSTCHANGE notifiers. They must be serialized. i.e. PRECHANGE or POSTCHANGE
shouldn't be called twice contiguously.

This can happen due to bugs in users of __cpufreq_driver_target() or actual
cpufreq drivers who are sending these notifiers.

This patch adds some protection against this. Now, we keep track of the last
transaction and see if something went wrong.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
 drivers/cpufreq/cpufreq.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 2d53f47..92cb8b3 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -107,6 +107,9 @@ static void handle_update(struct work_struct *work);
 static BLOCKING_NOTIFIER_HEAD(cpufreq_policy_notifier_list);
 static struct srcu_notifier_head cpufreq_transition_notifier_list;
 
+/* Tracks status of transition */
+static int transition_ongoing;
+
 static bool init_cpufreq_transition_notifier_list_called;
 static int __init init_cpufreq_transition_notifier_list(void)
 {
@@ -264,6 +267,8 @@ void __cpufreq_notify_transition(struct cpufreq_policy *policy,
 	switch (state) {
 
 	case CPUFREQ_PRECHANGE:
+		WARN_ON(transition_ongoing++);
+
 		/* detect if the driver reported a value as "old frequency"
 		 * which is not equal to what the cpufreq core thinks is
 		 * "old frequency".
@@ -283,6 +288,8 @@ void __cpufreq_notify_transition(struct cpufreq_policy *policy,
 		break;
 
 	case CPUFREQ_POSTCHANGE:
+		WARN_ON(!transition_ongoing--);
+
 		adjust_jiffies(CPUFREQ_POSTCHANGE, freqs);
 		pr_debug("FREQ: %lu - CPU: %lu", (unsigned long)freqs->new,
 			(unsigned long)freqs->cpu);
@@ -1458,6 +1465,8 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy,
 
 	if (cpufreq_disabled())
 		return -ENODEV;
+	if (transition_ongoing)
+		return -EBUSY;
 
 	/* Make sure that target_freq is within supported range */
 	if (target_freq > policy->max)
-- 
1.7.12.rc2.18.g61b472e


  parent reply	other threads:[~2013-06-19  8:56 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-19  8:52 [PATCH 00/13] CPUFreq: Fix {PRE|POST}CHANGE notification sequence Viresh Kumar
2013-06-19  8:52 ` [PATCH 01/13] cpufreq: acpi: call CPUFREQ_POSTCHANGE notfier in error cases Viresh Kumar
2013-06-19  8:52 ` [PATCH 02/13] cpufreq: arm-big-little: " Viresh Kumar
2013-06-19  8:52 ` [PATCH 03/13] cpufreq: davinci: " Viresh Kumar
2013-06-19  8:58   ` Sekhar Nori
2013-06-19  8:52 ` [PATCH 04/13] cpufreq: dbx500: " Viresh Kumar
2013-06-19 19:42   ` Linus Walleij
2013-06-19  8:52 ` [PATCH 05/13] cpufreq: e_powersave: " Viresh Kumar
2013-06-19 12:22   ` Simon Horman
2013-06-19 14:54     ` Viresh Kumar
2013-06-19 15:08       ` Dave Jones
2013-06-19  8:53 ` [PATCH 06/13] cpufreq: exynos: " Viresh Kumar
2013-06-19  8:53 ` [PATCH 07/13] cpufreq: imx6q: " Viresh Kumar
2013-06-20  2:52   ` Shawn Guo
2013-06-19  8:53 ` [PATCH 08/13] cpufreq: omap: " Viresh Kumar
2013-06-19 14:44   ` Santosh Shilimkar
2013-06-19  8:53 ` [PATCH 09/13] cpufreq: pcc: " Viresh Kumar
2013-06-19  8:53 ` [PATCH 10/13] cpufreq: powernow-k8: " Viresh Kumar
2013-06-19  8:53 ` [PATCH 11/13] cpufreq: s3c64xx: " Viresh Kumar
2013-06-19  8:53 ` [PATCH 12/13] cpufreq: tegra: " Viresh Kumar
2013-06-19 17:11   ` Stephen Warren
2013-06-19  8:53 ` Viresh Kumar [this message]
2013-06-24 11:43   ` [PATCH 13/13] cpufreq: make sure frequency transitions are serialized Rafael J. Wysocki
2013-06-24 13:08     ` Viresh Kumar
2013-06-24 13:23       ` Rafael J. Wysocki
2013-06-24 13:16         ` Viresh Kumar
2013-06-24 13:33           ` Rafael J. Wysocki
2013-06-24 13:31             ` Viresh Kumar
2013-06-26 21:57               ` Rafael J. Wysocki
2013-06-27  4:56                 ` Viresh Kumar
2013-06-27 12:15                   ` Rafael J. Wysocki
2013-06-24 11:58 ` [PATCH 00/13] CPUFreq: Fix {PRE|POST}CHANGE notification sequence Rafael J. Wysocki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0bebf56a27f799a282cc00d0c17c187f9941f122.1371630975.git.viresh.kumar@linaro.org \
    --to=viresh.kumar@linaro.org \
    --cc=Liviu.Dudau@arm.com \
    --cc=Steve.Bannister@arm.com \
    --cc=arvind.chauhan@arm.com \
    --cc=charles.garcia-tobin@arm.com \
    --cc=cpufreq@vger.kernel.org \
    --cc=dave.martin@arm.com \
    --cc=linaro-kernel@lists.linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=patches@linaro.org \
    --cc=rjw@sisk.pl \
    --cc=robin.randhawa@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).