aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <[email protected]>2013-05-01 18:35:05 -0700
committerThomas Gleixner <[email protected]>2013-06-25 23:11:19 +0200
commit88c8004fd3a5fdd2378069de86b90b21110d33a4 (patch)
tree1cdd93902f986f02c981fa75f38c77f1b2f63265
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 <[email protected]> Cc: Rafael J. Wysocki <[email protected]> Cc: [email protected] Cc: Tejun Heo <[email protected]> Cc: Oleg Nesterov <[email protected]> Cc: Darren Hart <[email protected]> Cc: Randy Dunlap <[email protected]> Cc: Al Viro <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Thomas Gleixner <[email protected]>
-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 @@
#include <linux/ptrace.h>
#include <linux/sched/rt.h>
#include <linux/hugetlb.h>
+#include <linux/freezer.h>
#include <asm/futex.h>
@@ -1808,7 +1809,7 @@ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q,
* is no timeout, or if it has yet to expire.
*/
if (!timeout || timeout->task)
- schedule();
+ freezable_schedule();
}
__set_current_state(TASK_RUNNING);
}