Davide Libenzi 7ef9964e6d
epoll: introduce resource usage limits ...
It has been thought that the per-user file descriptors limit would also
limit the resources that a normal user can request via the epoll
interface. Vegard Nossum reported a very simple program (a modified
version attached) that can make a normal user to request a pretty large
amount of kernel memory, well within the its maximum number of fds. To
solve such problem, default limits are now imposed, and /proc based
configuration has been introduced. A new directory has been created,
named /proc/sys/fs/epoll/ and inside there, there are two configuration
points:
max_user_instances = Maximum number of devices - per user
max_user_watches = Maximum number of "watched" fds - per user
The current default for "max_user_watches" limits the memory used by epoll
to store "watches", to 1/32 of the amount of the low RAM. As example, a
256MB 32bit machine, will have "max_user_watches" set to roughly 90000.
That should be enough to not break existing heavy epoll users. The
default value for "max_user_instances" is set to 128, that should be
enough too.
This also changes the userspace, because a new error code can now come out
from EPOLL_CTL_ADD (-ENOSPC). The EMFILE from epoll_create() was already
listed, so that should be ok.
[akpm@linux-foundation.org: use get_current_user()]
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Cc: <stable@kernel.org>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Reported-by: Vegard Nossum <vegardno@ifi.uio.no>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-12-01 19:55:24 -08:00
2008-10-20 08:52:40 -07:00
2008-10-17 17:15:43 -03:00
2008-10-22 01:19:37 +02:00
2008-10-04 17:12:27 -04:00
2008-11-12 17:17:18 -08:00
2008-11-28 21:29:46 -08:00
2008-11-08 21:37:46 +01:00
2008-11-05 14:40:25 +01:00
2008-10-14 11:58:31 -07:00
2008-10-08 11:35:19 +02:00
2008-10-08 11:35:00 +02:00
2008-09-29 17:56:56 -04:00
2008-10-21 13:25:28 +11:00
2008-10-13 21:51:51 +01:00
2008-09-03 15:41:57 -07:00
2008-10-30 11:38:47 -07:00
2008-11-10 13:50:19 -08:00
2008-10-15 15:54:56 -04:00
2008-09-12 16:30:20 -07:00
2008-10-20 16:07:19 +01:00
2008-09-17 16:54:26 +01:00
2008-07-25 10:53:47 -07:00
2008-11-11 21:15:50 -05:00
2008-10-20 11:01:52 -07:00
2008-08-12 10:13:38 +10:00
2008-10-16 11:21:51 -07:00
2008-07-24 10:47:27 -07:00
2008-10-10 22:39:31 +02:00
2008-07-24 10:47:41 -07:00
2008-07-24 10:47:24 -07:00
2008-10-16 11:21:39 -07:00
2008-10-16 11:21:39 -07:00
2008-07-25 15:44:39 +10:00
2008-10-20 08:50:25 -07:00
2008-10-20 08:52:42 -07:00
2008-10-16 11:21:38 -07:00
2008-11-06 08:41:55 +01:00
2008-10-23 08:20:34 -07:00
2008-10-21 07:48:52 -04:00
2008-10-17 08:46:57 +02:00
2008-08-12 16:07:27 -07:00
2008-10-20 08:52:32 -07:00
2008-08-12 16:07:30 -07:00
2008-11-12 17:17:18 -08:00
2008-08-14 22:59:43 +10:00
2008-10-21 07:47:22 -04:00
2008-10-20 08:52:34 -07:00
2008-10-30 11:38:45 -07:00
2008-10-16 11:21:32 -07:00
2008-09-05 11:11:51 +02:00
2008-08-21 09:50:24 +02:00
2008-11-09 11:17:33 -08:00
2008-07-26 20:53:14 -04:00
2008-07-25 10:53:33 -07:00
2008-11-30 11:00:15 -08:00
2008-10-14 10:35:08 +02:00
2008-08-26 10:26:54 +02:00
2008-07-31 16:21:13 -07:00
2008-07-30 09:41:45 -07:00
2008-10-14 12:12:02 -07:00
2008-09-08 19:25:24 +02:00
2008-10-09 13:52:43 -04:00
2008-11-09 21:09:54 +01:00
2008-11-19 18:49:58 -08:00
2008-10-23 18:51:22 +04:00
2008-08-14 09:35:23 +10:00
2008-08-29 15:50:04 +10:00
2008-07-22 17:30:57 -07:00
2008-10-23 05:13:16 -04:00
2008-09-09 13:27:22 +02:00
2008-07-25 10:53:47 -07:00
2008-10-23 10:23:07 -07:00
2008-10-22 20:21:31 +02:00
2008-10-13 09:51:43 -07:00
2008-07-25 10:53:34 -07:00
2008-08-28 11:49:15 -05:00
2008-08-28 11:49:15 -05:00
2008-08-07 02:22:54 -04:00
2008-10-21 17:45:06 +01:00
2008-10-18 14:29:15 +01:00
2008-09-19 10:20:41 +02:00
2008-10-16 16:53:04 +02:00
2008-10-13 16:05:06 +01:00
2008-10-15 12:46:51 +01:00
2008-10-16 09:24:47 -07:00
2008-10-16 16:53:13 +02:00
2008-10-09 08:56:13 +02:00
2008-10-12 12:05:55 +02:00
2008-08-07 02:22:08 -04:00
2008-07-24 10:47:29 -07:00
2008-07-24 10:47:29 -07:00
2008-08-20 13:19:51 -07:00
2008-10-16 11:21:30 -07:00
2008-10-20 08:52:37 -07:00
2008-10-16 11:21:30 -07:00
2008-10-20 08:52:36 -07:00
2008-10-09 08:56:19 +02:00
2008-10-08 19:44:18 -04:00
2008-10-21 07:47:06 -04:00
2008-10-15 22:21:11 +02:00
2008-08-12 16:07:31 -07:00
2008-10-30 11:38:45 -07:00
2008-07-22 19:09:51 -07:00
2008-07-26 20:53:20 -04:00
2008-08-23 12:14:12 -07:00
2008-10-30 11:38:45 -07:00
2008-10-31 00:59:46 -04:00
2008-10-21 07:47:06 -04:00
2008-10-23 16:00:24 +02:00
2008-10-16 16:08:57 +02:00
2008-07-30 00:41:37 -04:00
2008-11-18 15:08:56 +01:00
2008-07-24 10:47:20 -07:00
2008-09-22 07:29:31 +01:00
2008-10-16 11:21:40 -07:00
2008-10-27 15:06:01 +01:00
2008-10-14 23:51:02 +02:00
2008-11-27 23:39:48 +00:00
2008-07-31 18:45:41 +02:00
2008-11-12 09:54:40 +01:00
2008-10-23 13:52:40 +04:00
2008-10-22 20:21:30 +02:00
2008-10-17 17:25:11 -03:00
2008-08-08 15:13:27 +01:00
2008-10-22 20:21:33 +02:00
2008-10-16 11:21:38 -07:00
2008-10-24 12:54:18 -04:00
2008-10-15 16:03:01 -07:00
2008-10-21 07:47:30 -04:00
2008-07-25 10:53:42 -07:00
2008-09-24 16:18:02 -04:00
2008-10-13 19:01:08 -07:00
2008-10-13 19:01:08 -07:00
2008-10-13 19:01:08 -07:00
2008-09-22 21:28:11 -07:00
2008-10-01 01:30:19 -07:00
2008-08-15 19:52:19 -07:00
2008-10-09 11:59:55 -07:00
2008-11-04 14:49:57 -08:00
2008-09-22 21:28:11 -07:00
2008-10-13 19:01:08 -07:00
2008-08-02 18:36:10 +01:00
2008-10-01 07:30:02 -07:00
2008-10-07 15:34:37 -07:00
2008-09-05 21:35:30 -07:00
2008-10-29 22:02:09 +01:00
2008-11-15 12:26:44 -08:00
2008-11-13 10:31:36 +01:00
2008-10-18 14:29:15 +01:00
2008-10-20 13:23:01 -07:00
2008-11-03 18:21:45 +01:00
2008-10-16 11:21:33 -07:00
2008-10-16 15:17:40 -07:00
2008-10-15 14:24:08 +02:00
2008-08-15 09:26:14 +10:00
2008-07-25 10:53:42 -07:00
2008-11-23 10:52:45 +01:00
2008-07-25 10:53:26 -07:00
2008-10-21 15:54:40 +02:00
2008-09-22 01:15:02 -07:00
2008-10-12 09:37:01 -02:00
2008-08-16 16:46:57 -07:00
2008-10-16 20:00:24 -04:00
2008-10-23 08:55:01 -07:00
2008-10-16 11:21:32 -07:00
2008-10-16 11:21:31 -07:00
2008-10-20 08:52:40 -07:00
2008-10-20 13:23:01 -07:00
2008-11-15 11:43:37 -08:00
2008-08-15 08:35:42 -07:00
2008-10-12 11:44:37 -07:00
2008-10-09 08:56:04 +02:00
2008-10-16 11:21:29 -07:00
2008-07-24 10:47:17 -07:00
2008-10-14 10:34:22 +02:00
2008-07-24 19:11:15 -07:00
2008-10-28 14:21:34 +02:00
2008-10-28 14:22:15 +02:00
2008-09-23 22:01:33 +01:00
2008-07-23 09:49:56 +01:00
2008-10-20 22:34:12 +01:00
2008-12-01 13:49:27 -05:00
2008-10-14 10:35:08 +02:00
2008-09-01 09:47:16 +02:00
2008-11-13 23:19:10 -08:00
2008-10-13 09:47:43 +11:00
2008-10-09 08:56:06 +02:00
2008-10-10 23:16:16 -04:00
2008-08-04 10:58:24 +09:00
2008-10-14 10:39:28 +02:00
2008-10-20 08:52:39 -07:00
2008-07-24 10:47:21 -07:00
2008-11-30 10:03:38 -08:00
2008-07-24 10:47:21 -07:00
2008-09-13 14:41:52 -07:00
2008-10-20 08:50:25 -07:00
2008-07-27 01:56:38 +02:00
2008-07-27 01:54:58 +02:00
2008-08-02 16:28:50 +02:00
2008-10-20 08:52:31 -07:00
2008-10-20 08:52:39 -07:00
2008-10-20 08:52:30 -07:00
2008-10-14 10:37:17 +02:00
2008-07-28 16:30:21 -07:00
2008-10-20 08:52:39 -07:00
2008-10-29 00:51:25 +01:00
2008-10-22 10:00:23 +11:00
2008-10-22 10:00:23 +11:00
2008-10-16 11:21:30 -07:00
2008-08-29 14:37:23 -07:00
2008-08-29 14:37:23 -07:00
2008-11-06 15:41:21 -08:00
2008-09-05 06:33:59 +02:00
2008-10-23 05:13:20 -04:00
2008-11-19 18:49:57 -08:00
2008-10-30 23:54:35 -07:00
2008-10-08 11:35:01 +02:00
2008-10-01 07:03:24 -07:00
2008-10-06 20:08:26 -04:00
2008-10-17 13:06:45 -04:00
2008-10-07 17:22:20 -04:00
2008-10-14 19:23:17 -04:00
2008-09-15 16:48:19 -04:00
2008-09-08 19:25:24 +02:00
2008-07-25 10:53:37 -07:00
2008-07-25 22:34:40 -04:00
2008-10-13 10:55:47 +11:00
2008-10-21 15:17:48 +11:00
2008-11-30 10:03:35 -08:00
2008-10-20 08:52:30 -07:00
2008-10-20 08:52:32 -07:00
2008-10-20 08:50:26 -07:00
2008-10-16 11:21:49 -07:00
2008-10-13 10:10:37 -07:00
2008-10-22 16:42:43 -07:00
2008-10-23 10:20:36 -07:00
2008-10-22 16:42:35 -07:00
2008-08-18 13:48:04 -07:00
2008-07-28 14:56:09 -07:00
2008-11-03 14:31:18 -08:00
2008-10-09 12:50:59 -04:00
2008-09-05 09:24:30 +02:00
2008-10-05 13:33:42 -07:00
2008-09-14 17:24:26 +02:00
2008-10-26 23:07:25 -07:00
2008-10-08 16:38:41 -07:00
2008-10-16 11:21:48 -07:00
2008-08-20 15:40:32 -07:00
2008-08-29 14:37:23 -07:00
2008-09-12 16:29:34 -07:00
2008-10-16 09:24:51 -07:00
2008-08-05 14:33:50 -07:00
2008-10-16 11:21:30 -07:00
2008-10-23 00:11:07 -04:00
2008-09-05 21:35:03 -07:00
2008-09-24 15:45:48 +02:00
2008-09-01 02:42:54 +04:00
2008-09-05 21:35:30 -07:00
2008-10-23 18:54:05 +04:00
2008-10-23 08:55:01 -07:00
2008-08-15 17:15:23 +02:00
2008-10-20 08:52:39 -07:00
2008-09-02 19:21:38 -07:00
2008-10-16 11:21:46 -07:00
2008-10-16 11:21:46 -07:00
2008-07-26 12:00:06 -07:00
2008-10-02 15:53:13 -07:00
2008-11-12 17:17:17 -08:00
2008-10-03 10:36:08 +02:00
2008-08-15 17:03:06 +02:00
2008-09-30 12:08:41 +02:00
2008-08-15 17:54:39 +02:00
2008-08-15 08:35:42 -07:00
2008-10-21 07:49:04 -04:00
2008-10-16 11:21:30 -07:00
2008-07-26 20:53:14 -04:00
2008-07-26 12:00:04 -07:00
2008-09-05 14:39:37 -07:00
2008-10-30 11:38:45 -07:00
2008-08-22 16:29:57 -04:00
2008-11-11 15:02:04 -05:00
2008-10-20 08:52:40 -07:00
2008-07-26 12:00:12 -07:00
2008-10-16 11:21:30 -07:00
2008-09-22 19:51:15 -07:00
2008-07-23 14:42:09 +02:00
2008-12-01 19:55:24 -08:00
2008-10-30 11:38:47 -07:00
2008-07-25 10:53:42 -07:00
2008-07-24 08:31:21 -04:00
2008-10-20 08:52:39 -07:00
2008-11-12 12:29:56 +09:00
2008-10-13 09:51:40 -07:00
2008-07-23 14:01:49 -04:00
2008-10-01 16:13:54 +09:00
2008-07-26 20:53:14 -04:00
2008-07-24 10:47:29 -07:00
2008-10-07 14:22:33 -07:00
2008-11-13 20:49:02 +02:00
2008-08-05 09:28:47 +03:00
2008-07-25 10:53:30 -07:00
2008-07-25 10:53:26 -07:00
2008-09-23 08:09:13 -07:00
2008-09-09 17:41:42 +02:00
2008-10-22 07:00:38 -04:00
2008-11-06 09:05:33 +01:00
2008-07-30 03:27:25 -07:00
2008-10-05 11:16:16 -07:00
2008-08-11 09:30:24 +02:00
2008-08-11 09:30:24 +02:00
2008-10-03 18:22:18 -07:00
2008-08-26 00:19:27 +10:00
2008-10-03 11:46:14 -05:00
2008-11-02 10:15:07 -08:00
2008-08-15 08:35:42 -07:00
2008-10-20 08:52:40 -07:00
2008-10-20 08:52:31 -07:00
2008-10-16 11:21:28 -07:00
2008-07-22 13:03:29 -07:00
2008-11-19 18:49:57 -08:00
2008-10-16 11:21:47 -07:00
2008-10-20 08:52:42 -07:00
2008-07-27 16:12:28 -07:00
2008-10-16 11:21:32 -07:00
2008-07-25 10:53:47 -07:00
2008-10-07 14:43:06 -07:00
2008-11-11 09:30:23 -08:00
2008-10-13 09:51:40 -07:00
2008-09-05 21:35:01 -07:00
2008-10-17 18:13:38 +02:00
2008-10-22 09:48:06 +02:00
2008-11-06 08:42:48 +01:00
2008-07-24 10:47:29 -07:00
2008-09-24 17:33:13 +02:00
2008-11-07 16:09:23 +01:00
2008-09-05 14:39:38 -07:00
2008-10-14 10:39:31 +02:00
2008-10-13 09:51:43 -07:00
2008-10-13 09:51:44 -07:00
2008-07-25 10:53:26 -07:00
2008-10-21 07:47:06 -04:00
2008-08-20 23:22:22 +01:00
2008-11-13 14:45:00 -08:00
2008-09-17 16:54:35 +01:00
2008-10-21 14:31:15 -02:00
2008-07-27 11:07:12 -03:00
2008-07-26 13:25:25 -03:00
2008-07-25 12:06:04 +10:00
2008-07-25 12:06:04 +10:00
2008-07-25 12:06:05 +10:00
2008-07-25 12:06:12 +10:00
2008-07-25 12:06:04 +10:00
2008-07-25 12:06:04 +10:00
2008-07-25 12:06:04 +10:00
2008-07-25 12:06:14 +10:00
2008-07-25 12:06:04 +10:00
2008-10-23 15:48:28 +04:00
2008-10-23 17:35:04 +04:00
2008-10-13 09:51:42 -07:00
2008-10-16 11:21:31 -07:00
2008-09-17 16:54:23 +01:00
2008-10-02 22:48:34 +01:00
2008-11-06 09:05:33 +01:00
2008-10-16 10:09:17 -04:00
2008-10-05 13:33:42 -07:00
7ef9964e6d