From: Amit Pundir <amit.pundir@linaro.org>
To: "Arve Hjønnevåg" <arve@android.com>,
"Rafael J. Wysocki" <rjw@sisk.pl>,
"Alexander Viro" <viro@zeniv.linux.org.uk>
Cc: John Stultz <john.stultz@linaro.org>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
Android Kernel Team <kernel-team@android.com>
Subject: [RFC][PATCH] epoll: allow EPOLLWAKEUP flag if PM_SLEEP is enabled
Date: Mon, 11 Nov 2013 23:26:31 +0530 [thread overview]
Message-ID: <1384192591-20916-1-git-send-email-amit.pundir@linaro.org> (raw)
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>
---
fs/eventpoll.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 473e09d..7a83079 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1820,7 +1820,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;
/*
--
1.7.10.4
next reply other threads:[~2013-11-11 17:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-11 17:56 Amit Pundir [this message]
2013-11-11 21:22 ` [RFC][PATCH] epoll: allow EPOLLWAKEUP flag if PM_SLEEP is enabled Rafael J. Wysocki
2013-11-12 19:24 ` John Stultz
2013-11-12 23:46 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1384192591-20916-1-git-send-email-amit.pundir@linaro.org \
--to=amit.pundir@linaro.org \
--cc=arve@android.com \
--cc=john.stultz@linaro.org \
--cc=kernel-team@android.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).