Commit 91cf5ab6 authored Sep 11, 2013 by Eric Dumazet Committed by Linus Torvalds Sep 11, 2013

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: Eric Dumazet <edumazet@google.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Theodore Ts'o <tytso@mit.edu>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 8716de38

fs/eventpoll.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -740,6 +740,7 @@ static void ep_free(struct eventpoll *ep)
		epi = rb_entry(rbp, struct epitem, rbn);

		ep_unregister_pollwait(ep, epi);
		cond_resched();
		}

		/*
		@@ -754,6 +755,7 @@ static void ep_free(struct eventpoll *ep)
		while ((rbp = rb_first(&ep->rbr)) != NULL) {
		epi = rb_entry(rbp, struct epitem, rbn);
		ep_remove(ep, epi);
		cond_resched();
		}
		mutex_unlock(&ep->mtx);

Admin message