[PATCH v3] epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled

[PATCH v3] epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled

[Amit Pundir]

Drop EPOLLWAKEUP from epoll events mask if CONFIG_PM_SLEEP is disabled.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
---
Changes in v3:
 Renamed ep_epollwakeup_check() to ep_take_care_of_epollwakeup().
 Didn't update ep_create_wakeup_source() to return -ENOSYS if PM_SLEEP is unset.
---
 fs/eventpoll.c                 |    3 +--
 include/uapi/linux/eventpoll.h |   13 ++++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 473e09d..dbf382b 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1820,8 +1820,7 @@ 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))
-		epds.events &= ~EPOLLWAKEUP;
+	ep_take_care_of_epollwakeup(&epds);
 
 	/*
 	 * We have to check that the file structure underneath the file descriptor
diff --git a/include/uapi/linux/eventpoll.h b/include/uapi/linux/eventpoll.h
index 2c267bc..bc81fb2 100644
--- a/include/uapi/linux/eventpoll.h
+++ b/include/uapi/linux/eventpoll.h
@@ -61,5 +61,16 @@ struct epoll_event {
 	__u64 data;
 } EPOLL_PACKED;
 
-
+#ifdef CONFIG_PM_SLEEP
+static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev)
+{
+	if ((epev->events & EPOLLWAKEUP) && !capable(CAP_BLOCK_SUSPEND))
+		epev->events &= ~EPOLLWAKEUP;
+}
+#else
+static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev)
+{
+	epev->events &= ~EPOLLWAKEUP;
+}
+#endif
 #endif /* _UAPI_LINUX_EVENTPOLL_H */
-- 
1.7.10.4

Re: [PATCH v3] epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled

[Rafael J. Wysocki]

On Friday, November 15, 2013 12:56:31 PM Amit Pundir wrote:
> Drop EPOLLWAKEUP from epoll events mask if CONFIG_PM_SLEEP is disabled.
> 
> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Or am I supposed to take care of this?

> ---
> Changes in v3:
>  Renamed ep_epollwakeup_check() to ep_take_care_of_epollwakeup().
>  Didn't update ep_create_wakeup_source() to return -ENOSYS if PM_SLEEP is unset.
> ---
>  fs/eventpoll.c                 |    3 +--
>  include/uapi/linux/eventpoll.h |   13 ++++++++++++-
>  2 files changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/eventpoll.c b/fs/eventpoll.c
> index 473e09d..dbf382b 100644
> --- a/fs/eventpoll.c
> +++ b/fs/eventpoll.c
> @@ -1820,8 +1820,7 @@ 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))
> -		epds.events &= ~EPOLLWAKEUP;
> +	ep_take_care_of_epollwakeup(&epds);
>  
>  	/*
>  	 * We have to check that the file structure underneath the file descriptor
> diff --git a/include/uapi/linux/eventpoll.h b/include/uapi/linux/eventpoll.h
> index 2c267bc..bc81fb2 100644
> --- a/include/uapi/linux/eventpoll.h
> +++ b/include/uapi/linux/eventpoll.h
> @@ -61,5 +61,16 @@ struct epoll_event {
>  	__u64 data;
>  } EPOLL_PACKED;
>  
> -
> +#ifdef CONFIG_PM_SLEEP
> +static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev)
> +{
> +	if ((epev->events & EPOLLWAKEUP) && !capable(CAP_BLOCK_SUSPEND))
> +		epev->events &= ~EPOLLWAKEUP;
> +}
> +#else
> +static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev)
> +{
> +	epev->events &= ~EPOLLWAKEUP;
> +}
> +#endif
>  #endif /* _UAPI_LINUX_EVENTPOLL_H */
> 
-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

Re: [PATCH v3] epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled

[John Stultz]

On 11/15/2013 07:10 AM, Rafael J. Wysocki wrote:
> On Friday, November 15, 2013 12:56:31 PM Amit Pundir wrote:
>> Drop EPOLLWAKEUP from epoll events mask if CONFIG_PM_SLEEP is disabled.
>>
>> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> Or am I supposed to take care of this?

I would assume it would be you, but maybe Al would prefer to take it?

Also, should this be also marked for stable?

thanks
-john

Re: [PATCH v3] epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled

[Rafael J. Wysocki]

On Friday, November 15, 2013 10:53:01 AM John Stultz wrote:
> On 11/15/2013 07:10 AM, Rafael J. Wysocki wrote:
> > On Friday, November 15, 2013 12:56:31 PM Amit Pundir wrote:
> >> Drop EPOLLWAKEUP from epoll events mask if CONFIG_PM_SLEEP is disabled.
> >>
> >> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
> > Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> >
> > Or am I supposed to take care of this?
> 
> I would assume it would be you, but maybe Al would prefer to take it?
> 
> Also, should this be also marked for stable?

Well, do people see it in production?

Rafael

Re: [PATCH v3] epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled

[John Stultz]

On 11/15/2013 02:40 PM, Rafael J. Wysocki wrote:
> On Friday, November 15, 2013 10:53:01 AM John Stultz wrote:
>> On 11/15/2013 07:10 AM, Rafael J. Wysocki wrote:
>>> On Friday, November 15, 2013 12:56:31 PM Amit Pundir wrote:
>>>> Drop EPOLLWAKEUP from epoll events mask if CONFIG_PM_SLEEP is disabled.
>>>>
>>>> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
>>> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>>>
>>> Or am I supposed to take care of this?
>> I would assume it would be you, but maybe Al would prefer to take it?
>>
>> Also, should this be also marked for stable?
> Well, do people see it in production?

I guess its unlikely, but it seems like its possible. I guess I've got
no objection to holding off unless someone else hits this.

thanks
-john

Re: [PATCH v3] epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled

[Rafael J. Wysocki]

On Friday, November 15, 2013 02:35:16 PM John Stultz wrote:
> On 11/15/2013 02:40 PM, Rafael J. Wysocki wrote:
> > On Friday, November 15, 2013 10:53:01 AM John Stultz wrote:
> >> On 11/15/2013 07:10 AM, Rafael J. Wysocki wrote:
> >>> On Friday, November 15, 2013 12:56:31 PM Amit Pundir wrote:
> >>>> Drop EPOLLWAKEUP from epoll events mask if CONFIG_PM_SLEEP is disabled.
> >>>>
> >>>> Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
> >>> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> >>>
> >>> Or am I supposed to take care of this?
> >> I would assume it would be you, but maybe Al would prefer to take it?
> >>
> >> Also, should this be also marked for stable?
> > Well, do people see it in production?
> 
> I guess its unlikely, but it seems like its possible. I guess I've got
> no objection to holding off unless someone else hits this.

OK, I'll pick this up over the weekend if Al doesn't do that first.

Thanks!

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

Re: [PATCH v3] epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled

[John Stultz]

On 11/15/2013 03:53 PM, Rafael J. Wysocki wrote:
>
> OK, I'll pick this up over the weekend if Al doesn't do that first.

Just wanted to follow up on this, since I couldn't find this in your git
tree or Al's yet.  Forgive me if I missed it, I just wanted to make sure
it didn't get lost in the shuffle.

thanks
-john

Re: [PATCH v3] epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled

[Rafael J. Wysocki]

On Monday, November 25, 2013 11:38:55 AM John Stultz wrote:
> On 11/15/2013 03:53 PM, Rafael J. Wysocki wrote:
> >
> > OK, I'll pick this up over the weekend if Al doesn't do that first.
> 
> Just wanted to follow up on this, since I couldn't find this in your git
> tree or Al's yet.  Forgive me if I missed it, I just wanted to make sure
> it didn't get lost in the shuffle.

It did in fact. :-/

I'm going to queue it up for the next PM pull request (later this week).

Thanks!

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.