From e2db2cceeb223443022ee44001768d8aed273f52 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 6 May 2013 23:50:16 +0000 Subject: [PATCH] ANDROID: fs: epoll: use freezable blocking call Avoid waking up every thread sleeping in an epoll_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. Bug: 77139736 Bug: 120440023 [ccross: This was upstream (https://lkml.org/lkml/2013/5/6/823), but reverted because it reportedly caused memory corruption on 32-bit x86 (https://patchwork.kernel.org/patch/3162301/).] Acked-by: Tejun Heo Signed-off-by: Colin Cross Signed-off-by: Rafael J. Wysocki [gregkh: add this back after the 5.11-rc1 merge mess] Signed-off-by: Greg Kroah-Hartman Change-Id: Ia8268d310c00f0cfa6c01f36f3fa528e04f206e0 --- fs/eventpoll.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index a829af074eb5..1e470030f918 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -1839,8 +1840,8 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events, write_unlock_irq(&ep->lock); if (!eavail) - timed_out = !schedule_hrtimeout_range(to, slack, - HRTIMER_MODE_ABS); + timed_out = !freezable_schedule_hrtimeout_range(to, slack, + HRTIMER_MODE_ABS); __set_current_state(TASK_RUNNING); /*