diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2013-11-11 20:16:13 +0530 |
|---|---|---|
| committer | Sireesh Tripurari <sireesh.tripurari@linaro.org> | 2013-11-14 09:58:34 +0530 |
| commit | d98c4a726bd450db69f8d19b39dbe4af406aa15b (patch) | |
| tree | 9520e71dad05b1292a3920e1cf72b310aba3d436 | |
| parent | 4c35bacf3c133cd7907ef0abbdca4cb3e950810f (diff) | |
| download | juice-linux-linaro-juice-2013.11.tar.gz | |
epoll: allow EPOLLWAKEUP flag if PM_SLEEP is enabledjuice-2013.11linux-linaro-juice-2013.11
I stumbled upon ENOMEM error from epoll_ctl() while bringing up Android-4.4
on a device that does not yet support PM_SLEEP.
While looking into the problem, I found that ep_create_wakeup_source()
reports ENOMEM if wakeup_source_register() returns NULL.
ep_create_wakeup_source() assumes that NULL is only returned if we run
into ENOMEM but NULL is also returned when CONFIG_PM_SLEEP is disabled.
If CONFIG_PM_SLEEP is disabled, stripping the EPOLLWAKEUP flag seems to
be a reasonable solution here, allowing the call to succeed, while
dropping the wakeup logic. While returning EINVAL might also be a good
solution, stripping the flag seems to follow the established behavior,
as is done when the process doesn't have sufficient capabilities to
block suspend.
I'd appreciate any thoughts or feedback!
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | fs/eventpoll.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 810c28fb8c3..f7045092a32 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -1818,7 +1818,8 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, goto error_tgt_fput; /* Check if EPOLLWAKEUP is allowed */ - if ((epds.events & EPOLLWAKEUP) && !capable(CAP_BLOCK_SUSPEND)) + if ((epds.events & EPOLLWAKEUP) && + (!capable(CAP_BLOCK_SUSPEND) || !IS_ENABLED(CONFIG_PM_SLEEP))) epds.events &= ~EPOLLWAKEUP; /* |