aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/futex.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2013-05-01 21:35:05 -0400
committerThomas Gleixner <tglx@linutronix.de>2013-06-25 17:11:19 -0400
commit88c8004fd3a5fdd2378069de86b90b21110d33a4 (patch)
tree1cdd93902f986f02c981fa75f38c77f1b2f63265 /kernel/futex.c
parent13d60f4b6ab5b702dc8d2ee20999f98a93728aec (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/futex.c')
-rw-r--r--kernel/futex.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index 49dacfb45745..c3a1a55a5214 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
@@ -1808,7 +1809,7 @@ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q,
1808 * is no timeout, or if it has yet to expire. 1809 * is no timeout, or if it has yet to expire.
1809 */ 1810 */
1810 if (!timeout || timeout->task) 1811 if (!timeout || timeout->task)
1811 schedule(); 1812 freezable_schedule();
1812 } 1813 }
1813 __set_current_state(TASK_RUNNING); 1814 __set_current_state(TASK_RUNNING);
1814} 1815}