Commit 91cf5ab6 authored by Eric Dumazet's avatar Eric Dumazet Committed by Linus Torvalds

epoll: add a reschedule point in ep_free()

ep_free() might iterate on a huge set of epitems and hold cpu too long.
Add two cond_resched() in order to yield cpu to other tasks.  This is safe
as we only hold mutexes in this function.
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Theodore Ts'o <tytso@mit.edu>
Acked-by: default avatarEric Wong <normalperson@yhbt.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8716de38
...@@ -740,6 +740,7 @@ static void ep_free(struct eventpoll *ep) ...@@ -740,6 +740,7 @@ static void ep_free(struct eventpoll *ep)
epi = rb_entry(rbp, struct epitem, rbn); epi = rb_entry(rbp, struct epitem, rbn);
ep_unregister_pollwait(ep, epi); ep_unregister_pollwait(ep, epi);
cond_resched();
} }
/* /*
...@@ -754,6 +755,7 @@ static void ep_free(struct eventpoll *ep) ...@@ -754,6 +755,7 @@ static void ep_free(struct eventpoll *ep)
while ((rbp = rb_first(&ep->rbr)) != NULL) { while ((rbp = rb_first(&ep->rbr)) != NULL) {
epi = rb_entry(rbp, struct epitem, rbn); epi = rb_entry(rbp, struct epitem, rbn);
ep_remove(ep, epi); ep_remove(ep, epi);
cond_resched();
} }
mutex_unlock(&ep->mtx); mutex_unlock(&ep->mtx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment