Skip to content

Commit 1b53734

Browse files
Roman Penyaevtorvalds
authored andcommitted
epoll: fix possible lost wakeup on epoll_ctl() path
This fixes possible lost wakeup introduced by commit a218cc4. Originally modifications to ep->wq were serialized by ep->wq.lock, but in commit a218cc4 ("epoll: use rwlock in order to reduce ep_poll_callback() contention") a new rw lock was introduced in order to relax fd event path, i.e. callers of ep_poll_callback() function. After the change ep_modify and ep_insert (both are called on epoll_ctl() path) were switched to ep->lock, but ep_poll (epoll_wait) was using ep->wq.lock on wqueue list modification. The bug doesn't lead to any wqueue list corruptions, because wake up path and list modifications were serialized by ep->wq.lock internally, but actual waitqueue_active() check prior wake_up() call can be reordered with modifications of ep ready list, thus wake up can be lost. And yes, can be healed by explicit smp_mb(): list_add_tail(&epi->rdlink, &ep->rdllist); smp_mb(); if (waitqueue_active(&ep->wq)) wake_up(&ep->wp); But let's make it simple, thus current patch replaces ep->wq.lock with the ep->lock for wqueue modifications, thus wake up path always observes activeness of the wqueue correcty. Fixes: a218cc4 ("epoll: use rwlock in order to reduce ep_poll_callback() contention") Reported-by: Max Neunhoeffer <max@arangodb.com> Signed-off-by: Roman Penyaev <rpenyaev@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Tested-by: Max Neunhoeffer <max@arangodb.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Christopher Kohlhoff <chris.kohlhoff@clearpool.io> Cc: Davidlohr Bueso <dbueso@suse.de> Cc: Jason Baron <jbaron@akamai.com> Cc: Jes Sorensen <jes.sorensen@gmail.com> Cc: <stable@vger.kernel.org> [5.1+] Link: http://lkml.kernel.org/r/20200214170211.561524-1-rpenyaev@suse.de References: https://bugzilla.kernel.org/show_bug.cgi?id=205933 Bisected-by: Max Neunhoeffer <max@arangodb.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 12e967f commit 1b53734

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

fs/eventpoll.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1854,9 +1854,9 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,
18541854
waiter = true;
18551855
init_waitqueue_entry(&wait, current);
18561856

1857-
spin_lock_irq(&ep->wq.lock);
1857+
write_lock_irq(&ep->lock);
18581858
__add_wait_queue_exclusive(&ep->wq, &wait);
1859-
spin_unlock_irq(&ep->wq.lock);
1859+
write_unlock_irq(&ep->lock);
18601860
}
18611861

18621862
for (;;) {
@@ -1904,9 +1904,9 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,
19041904
goto fetch_events;
19051905

19061906
if (waiter) {
1907-
spin_lock_irq(&ep->wq.lock);
1907+
write_lock_irq(&ep->lock);
19081908
__remove_wait_queue(&ep->wq, &wait);
1909-
spin_unlock_irq(&ep->wq.lock);
1909+
write_unlock_irq(&ep->lock);
19101910
}
19111911

19121912
return res;

0 commit comments

Comments
 (0)