linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] PM/Memory-hotplug: Avoid task freezing failures
@ 2011-11-10 16:42 Srivatsa S. Bhat
  2011-11-14 20:05 ` Tejun Heo
  0 siblings, 1 reply; 3+ messages in thread
From: Srivatsa S. Bhat @ 2011-11-10 16:42 UTC (permalink / raw)
  To: rjw; +Cc: pavel, lenb, ak, tj, linux-kernel, linux-pm, linux-mm

The lock_system_sleep() function is used in the memory hotplug code at
several places in order to implement mutual exclusion with hibernation.
However, this function tries to acquire the 'pm_mutex' lock using
mutex_lock() and hence blocks in TASK_UNINTERRUPTIBLE state if it doesn't
get the lock. This would lead to task freezing failures and hence
hibernation failure as a consequence, even though the hibernation call path
successfully acquired the lock.

This patch fixes this issue by modifying lock_system_sleep() to use
mutex_lock_interruptible() instead of mutex_lock(), so that it blocks in the
TASK_INTERRUPTIBLE state. This would allow the freezer to freeze the blocked
task. Also, since the freezer could use signals to freeze tasks, it is quite
likely that mutex_lock_interruptible() returns -EINTR (and fails to acquire
the lock). Hence we keep retrying in a loop until we acquire the lock. Also,
we call try_to_freeze() within the loop, so that we don't cause freezing
failures due to busy looping.

Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
---

 include/linux/suspend.h |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 57a6924..02a0d09 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -5,6 +5,7 @@
 #include <linux/notifier.h>
 #include <linux/init.h>
 #include <linux/pm.h>
+#include <linux/freezer.h>
 #include <linux/mm.h>
 #include <asm/errno.h>
 
@@ -380,7 +381,22 @@ static inline void unlock_system_sleep(void) {}
 
 static inline void lock_system_sleep(void)
 {
-	mutex_lock(&pm_mutex);
+	/*
+	 * We should not use mutex_lock() here because, in case we fail to
+	 * acquire the lock, it would put us to sleep in TASK_UNINTERRUPTIBLE
+	 * state, which would lead to task freezing failures. As a
+	 * consequence, hibernation would fail (even though it had acquired
+	 * the 'pm_mutex' lock).
+	 *
+	 * Note that mutex_lock_interruptible() returns -EINTR if we happen
+	 * to get a signal when we are waiting to acquire the lock (and this
+	 * is very likely here because the freezer could use signals to freeze
+	 * tasks). Hence we have to keep retrying until we get the lock. But
+	 * we have to use try_to_freeze() in the loop, so that we don't cause
+	 * freezing failures due to busy looping.
+	 */
+	while (mutex_lock_interruptible(&pm_mutex))
+		try_to_freeze();
 }
 
 static inline void unlock_system_sleep(void)

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-11-15  7:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-10 16:42 [PATCH] PM/Memory-hotplug: Avoid task freezing failures Srivatsa S. Bhat
2011-11-14 20:05 ` Tejun Heo
2011-11-15  7:08   ` Srivatsa S. Bhat

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).