aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2013-05-01 21:35:05 -0400
committerNitin Garg <nitin.garg@freescale.com>2014-04-17 22:53:30 -0400
commit3eeea892e148312b47e39bbe270bdfe1cefa6f2e (patch)
tree61247413b060611a15d8a3a5b55d0c497b788d46 /kernel
parenta246b650400125644a0918cccc05095afda44de7 (diff)
futex: Use freezable blocking call
Avoid waking up every thread sleeping in a futex_wait call during suspend and resume by calling a freezable blocking call. Previous patches modified the freezer to avoid sending wakeups to threads that are blocked in freezable blocking calls. This call was selected to be converted to a freezable call because it doesn't hold any locks or release any resources when interrupted that might be needed by another freezing task or a kernel driver during suspend, and is a common site where idle userspace tasks are blocked. Signed-off-by: Colin Cross <ccross@android.com> Cc: Rafael J. Wysocki <rjw@sisk.pl> Cc: arve@android.com Cc: Tejun Heo <tj@kernel.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Darren Hart <dvhart@linux.intel.com> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Al Viro <viro@zeniv.linux.org.uk> Link: http://lkml.kernel.org/r/1367458508-9133-8-git-send-email-ccross@android.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/futex.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index 66d4e36eb9bf..d1de9375416e 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -62,6 +62,7 @@
62#include <linux/ptrace.h> 62#include <linux/ptrace.h>
63#include <linux/sched/rt.h> 63#include <linux/sched/rt.h>
64#include <linux/hugetlb.h> 64#include <linux/hugetlb.h>
65#include <linux/freezer.h>
65 66
66#include <asm/futex.h> 67#include <asm/futex.h>
67 68
@@ -1797,7 +1798,7 @@ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q,
1797 * is no timeout, or if it has yet to expire. 1798 * is no timeout, or if it has yet to expire.
1798 */ 1799 */
1799 if (!timeout || timeout->task) 1800 if (!timeout || timeout->task)
1800 schedule(); 1801 freezable_schedule();
1801 } 1802 }
1802 __set_current_state(TASK_RUNNING); 1803 __set_current_state(TASK_RUNNING);
1803} 1804}