The patch titled
Subject: epoll: permit unlimited number of depth=1 paths.
has been removed from the -mm tree. Its filename was
epoll-permit-unlimited-number-of-depth=1-paths.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: Jason Baron <jbaron@xxxxxxxxxx>
Subject: epoll: permit unlimited number of depth=1 paths.
The patch I did to limit the number of possible wakeup paths in epoll is
causing a few applications to longer work (dovecot for one). Commit:
28d82dc1c4edbc352129f97f4ca22624d1fe61de.
The original patch is really about limiting the amount of epoll nesting
(since epoll fds can be attached to other fds). Thus, we probably can
allow an unlimited number of paths of depth 1. My current patch limits it
at 1000. And enforce the limits on paths that have a greater depth.
Thus, I *believe* the patch below should fix the issue. But I'm still
waiting for some testing confirmation. I wanted to give you a heads up
before 3.3 comes out, as I believe this is something we don't want broken
in 3.3.
As soon as I have testing confirmation, I will post a patch to lkml.
This is captured in: https://bugzilla.redhat.com/show_bug.cgi?id=681578
Signed-off-by: Jason Baron <jbaron@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/eventpoll.c | 4 ++++
1 file changed, 4 insertions(+)
diff -puN fs/eventpoll.c~epoll-permit-unlimited-number-of-depth=1-paths fs/eventpoll.c
--- a/fs/eventpoll.c~epoll-permit-unlimited-number-of-depth=1-paths
+++ a/fs/eventpoll.c
@@ -988,6 +988,10 @@ static int path_count[PATH_ARR_SIZE];
static int path_count_inc(int nests)
{
+ /* Allow an arbitrary number of depth 1 paths */
+ if (nests == 0)
+ return 0;
+
if (++path_count[nests] > path_limits[nests])
return -1;
return 0;
_
Patches currently in -mm which might be from jbaron@xxxxxxxxxx are
origin.patch
linux-next.patch
epoll-remove-unneeded-variable-in-reverse_path_check.patch
coredump-remove-vm_alwaysdump-flag.patch
coredump-add-vm_nodump-madv_nodump-madv_clear_nodump.patch
coredump-add-vm_nodump-madv_nodump-madv_clear_nodump-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
