From: Eric Dumazet <eric.dumazet@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Al Viro <viro@ZenIV.linux.org.uk>,
edumazet@google.com, "Theodore Ts'o" <tytso@mit.edu>
Subject: [PATCH] epoll: add a reschedule point in ep_free()
Date: Sat, 17 Aug 2013 08:06:37 -0700 [thread overview]
Message-ID: <1376751997.21329.8.camel@edumazet-glaptop> (raw)
From: Eric Dumazet <edumazet@google.com>
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>
---
Google-Bug-Id: 8940884
fs/eventpoll.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 9ad17b15..4ff595d 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -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);
next reply other threads:[~2013-08-17 15:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-17 15:06 Eric Dumazet [this message]
2013-08-27 23:33 ` Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1376751997.21329.8.camel@edumazet-glaptop \
--to=eric.dumazet@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=edumazet@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®