From: Andi Kleen <andi@firstfloor.org>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, eric.dumazet@gmail.com,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 2/4] posix-timers: limit the number of posix timers per process
Date: Mon, 29 Aug 2011 16:39:15 -0700 [thread overview]
Message-ID: <1314661157-22173-2-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1314661157-22173-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Now this is the main reason I wrote the whole patchkit: previously
there was no limit on the maximum number of POSIX timers a process
could allocate. This limits the amount of unswappable kernel memory
a process can pin down this way.
With the POSIX timer ids being per process we can do this limit
per process now without allowing one process DoSing another.
I implemented it as a sysctl, not a rlimit for now, because
there was no clear use case for rlimit.
The 1024 default is completely arbitrary, but seems reasonable
for now.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
Documentation/sysctl/kernel.txt | 7 +++++++
kernel/posix-timers.c | 8 ++++++++
kernel/sysctl.c | 9 +++++++++
3 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 704e474..1f69cae 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -35,6 +35,7 @@ show up in /proc/sys/kernel:
- kptr_restrict
- kstack_depth_to_print [ X86 only ]
- l2cr [ PPC only ]
+- max_posix_timer
- modprobe ==> Documentation/debugging-modules.txt
- modules_disabled
- msgmax
@@ -299,6 +300,12 @@ This flag controls the L2 cache of G3 processor boards. If
==============================================================
+max_posix_timers
+
+The maximum number of POSIX timer ids per process.
+
+==============================================================
+
modules_disabled:
A toggle value indicating if modules are allowed to be loaded
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 4193cf7..ef6721c 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -71,6 +71,8 @@
*/
static struct kmem_cache *posix_timers_cache;
+int sysctl_max_posix_timers __read_mostly = 1024;
+
/*
* we assume that the new SIGEV_THREAD_ID shares no bits with the other
* SIGEV values. Here we put out an error if this assumption fails.
@@ -572,6 +574,12 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
it_id_set = IT_ID_SET;
new_timer->it_id = (timer_t) new_timer_id;
+
+ if (new_timer_id >= sysctl_max_posix_timers) {
+ error = -EMFILE; /* better error? */
+ goto out;
+ }
+
new_timer->it_clock = which_clock;
new_timer->it_overrun = -1;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 11d65b5..8fcf8b5 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -108,6 +108,7 @@ extern int sysctl_nr_trim_pages;
#ifdef CONFIG_BLOCK
extern int blk_iopoll_enabled;
#endif
+extern int sysctl_max_posix_timers;
/* Constants used for minimum and maximum */
#ifdef CONFIG_LOCKUP_DETECTOR
@@ -984,6 +985,14 @@ static struct ctl_table kern_table[] = {
.proc_handler = proc_dointvec,
},
#endif
+ {
+ .procname = "max_posix_timers",
+ .data = &sysctl_max_posix_timers,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec,
+ },
+
{ }
};
--
1.7.4.4
next prev parent reply other threads:[~2011-08-29 23:39 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-29 23:39 [PATCH 1/4] posix-timers: move global timer id management to signal_struct v2 Andi Kleen
2011-08-29 23:39 ` Andi Kleen [this message]
2011-08-30 21:44 ` [PATCH 2/4] posix-timers: limit the number of posix timers per process Andrew Morton
2011-08-30 22:06 ` Andi Kleen
2011-08-30 22:22 ` Andrew Morton
2011-08-30 22:47 ` Andi Kleen
2011-08-30 23:02 ` Andrew Morton
2011-08-31 6:45 ` Jiri Slaby
2011-09-02 9:30 ` Thomas Gleixner
2011-08-29 23:39 ` [PATCH 3/4] posix-timers: Don't disable interrupts in idr_lock Andi Kleen
2011-08-29 23:39 ` [PATCH 4/4] posix-timers: turn it_signal into it_valid flag Andi Kleen
2011-09-02 10:06 ` Thomas Gleixner
2011-09-02 11:49 ` Eric Dumazet
2011-09-02 14:19 ` Thomas Gleixner
2011-09-04 16:56 ` Oleg Nesterov
2011-09-04 19:07 ` Andi Kleen
2011-09-04 20:29 ` Oleg Nesterov
2011-09-06 3:14 ` Andi Kleen
2011-09-06 14:51 ` Oleg Nesterov
2011-09-06 15:39 ` Eric Dumazet
2011-09-06 16:27 ` Oleg Nesterov
2011-09-06 18:47 ` Thomas Gleixner
2011-09-06 18:49 ` Oleg Nesterov
2011-09-06 19:16 ` Thomas Gleixner
2011-09-06 19:26 ` Oleg Nesterov
2011-09-06 19:45 ` Thomas Gleixner
2011-09-06 22:08 ` Oleg Nesterov
2011-09-06 22:34 ` Thomas Gleixner
2011-09-21 16:46 ` Thomas Gleixner
2011-09-21 17:56 ` Thomas Gleixner
2011-09-22 11:19 ` Thomas Gleixner
2011-09-06 19:30 ` Eric Dumazet
2011-09-06 20:10 ` Thomas Gleixner
2011-09-06 20:27 ` Eric Dumazet
2011-09-06 19:04 ` Eric Dumazet
2011-08-31 8:53 ` [PATCH 1/4] posix-timers: move global timer id management to signal_struct v2 Eric Dumazet
2011-08-31 16:57 ` Andi Kleen
2011-09-02 9:19 ` Thomas Gleixner
2011-09-02 10:05 ` Eric Dumazet
2011-09-19 21:46 ` Andi Kleen
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=1314661157-22173-2-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=eric.dumazet@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).