Messages in this thread Patch in this message | | | From | Davide Libenzi <> | Date | Thu, 05 Feb 2009 12:23:39 -0800 | Subject | [patch 4/6] epoll keyed wakeups v3 - teach epoll about hints coming with the wakeup key |
| |
The follwing patch uses the events hint now sent by some devices, to avoid unnecessary wakeups for events that are of no interest for the caller. This code handles both devices that are sending keyed events, and the ones that are not (and event the ones that sometimes send events, and sometimes don't). Since epoll was the only user of wake_up_nested(), I brought that inside fs/eventpoll.c instead of adding it to include/linux/wait.h.
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
- Davide
--- fs/eventpoll.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-)
Index: linux-2.6.mod/fs/eventpoll.c =================================================================== --- linux-2.6.mod.orig/fs/eventpoll.c 2009-02-03 13:43:58.000000000 -0800 +++ linux-2.6.mod/fs/eventpoll.c 2009-02-03 13:44:04.000000000 -0800 @@ -370,9 +370,28 @@ static int ep_call_nested(struct nested_ return error; } +#ifdef CONFIG_DEBUG_LOCK_ALLOC +static inline void ep_wake_up_nested(wait_queue_head_t *wqueue, + unsigned long events, int subclass) +{ + unsigned long flags; + + spin_lock_irqsave_nested(&wqueue->lock, flags, subclass); + wake_up_locked_poll(wqueue, events); + spin_unlock_irqrestore(&wqueue->lock, flags); +} +#else +static inline void ep_wake_up_nested(wait_queue_head_t *wqueue, + unsigned long events, int subclass) +{ + wake_up_poll(wqueue, events); +} +#endif + static int ep_poll_wakeup_proc(void *priv, void *cookie, int call_nests) { - wake_up_nested((wait_queue_head_t *) cookie, 1 + call_nests); + ep_wake_up_nested((wait_queue_head_t *) cookie, POLLIN, + 1 + call_nests); return 0; } @@ -785,6 +804,15 @@ static int ep_poll_callback(wait_queue_t if (!(epi->event.events & ~EP_PRIVATE_BITS)) goto out_unlock; + /* + * Check the events coming with the callback. At this stage, not + * every device reports the events in the "key" parameter of the + * callback. We need to be able to handle both cases here, hence the + * test for "key" != NULL before the event match test. + */ + if (key && !((unsigned long) key & epi->event.events)) + goto out_unlock; + /* * If we are trasfering events to userspace, we can hold no locks * (because we're accessing user memory, and because of linux f_op->poll() @@ -1260,7 +1288,6 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, in case EPOLL_CTL_ADD: if (!epi) { epds.events |= POLLERR | POLLHUP; - error = ep_insert(ep, &epds, tfile, fd); } else error = -EEXIST;
| |