linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Neil Zhang <zhangwm@marvell.com>
To: rjw@sisk.pl, daniel.lezcano@linaro.org
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
	Neil Zhang <zhangwm@marvell.com>
Subject: [PATCH] cpuidle: coupled: fix dead loop corner case
Date: Tue, 20 Aug 2013 13:17:44 +0800	[thread overview]
Message-ID: <1376975864-31487-1-git-send-email-zhangwm@marvell.com> (raw)

There is a corener case when no peripheral irqs route to secondary
cores.
Let's take dual core system for example, the sequence is as following:

		Core 0			        Core1
1.			           set waiting bit and enter waiting loop
2. set waiting bit and poke core1
3. 				   clear poke in irq and enter safe state
4. set ready bit and enter ready loop

Since there is no peripheral irq route to core 1, so it will stay in
safe state forever, and core 0 will dead loop in the following code.
	while (!cpuidle_coupled_cpus_ready(coupled)) {
		/* Check if any other cpus bailed out of idle. */
		if (!cpuidle_coupled_cpus_waiting(coupled))
	}

The solution is don't let secondary core enter safe state when it has
already handled the poke interrupt.

Signed-off-by: Neil Zhang <zhangwm@marvell.com>
Reviewed-by: Fangsuo Wu <fswu@marvell.com>
---
 drivers/cpuidle/coupled.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/cpuidle/coupled.c b/drivers/cpuidle/coupled.c
index 2a297f8..a37c718 100644
--- a/drivers/cpuidle/coupled.c
+++ b/drivers/cpuidle/coupled.c
@@ -119,6 +119,7 @@ struct cpuidle_coupled {
 #define CPUIDLE_COUPLED_NOT_IDLE	(-1)
 
 static DEFINE_MUTEX(cpuidle_coupled_lock);
+static DEFINE_PER_CPU(bool, poke_sync);
 static DEFINE_PER_CPU(struct call_single_data, cpuidle_coupled_poke_cb);
 
 /*
@@ -295,6 +296,7 @@ static void cpuidle_coupled_poked(void *info)
 {
 	int cpu = (unsigned long)info;
 	cpumask_clear_cpu(cpu, &cpuidle_coupled_poked_mask);
+	__this_cpu_write(poke_sync, true);
 }
 
 /**
@@ -473,6 +475,7 @@ retry:
 	 * allowed for a single cpu.
 	 */
 	while (!cpuidle_coupled_cpus_waiting(coupled)) {
+		__this_cpu_write(poke_sync, false);
 		if (cpuidle_coupled_clear_pokes(dev->cpu)) {
 			cpuidle_coupled_set_not_waiting(dev->cpu, coupled);
 			goto out;
@@ -483,6 +486,10 @@ retry:
 			goto out;
 		}
 
+		if (cpuidle_coupled_cpus_waiting(coupled)
+			&& __this_cpu_read(poke_sync))
+			break;
+
 		entered_state = cpuidle_enter_state(dev, drv,
 			dev->safe_state_index);
 	}
-- 
1.7.4.1

             reply	other threads:[~2013-08-20  5:17 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-20  5:17 Neil Zhang [this message]
2013-08-20 12:36 ` [PATCH] cpuidle: coupled: fix dead loop corner case Rafael J. Wysocki
2013-08-22 10:11   ` Neil Zhang
2013-08-22 21:08 ` Colin Cross
2013-08-23  3:17   ` Neil Zhang

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=1376975864-31487-1-git-send-email-zhangwm@marvell.com \
    --to=zhangwm@marvell.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=rjw@sisk.pl \
    /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).