The patch titled
Subject: kernel/sysctl.c: threads-max observe limits
has been added to the -mm tree. Its filename is
kernel-sysctlc-threads-max-observe-limits.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/kernel-sysctlc-threads-max-observe-limits.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/kernel-sysctlc-threads-max-observe-limits.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Heinrich Schuchardt <xypron.glpk@xxxxxx>
Subject: kernel/sysctl.c: threads-max observe limits
Users can change the maximum number of threads by writing to
/proc/sys/kernel/threads-max.
With the patch the value entered is checked against the same limits that
apply when fork_init is called.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@xxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/sysctl.h | 3 +++
kernel/fork.c | 31 +++++++++++++++++++++++++++++--
kernel/sysctl.c | 6 ++----
3 files changed, 34 insertions(+), 6 deletions(-)
diff -puN include/linux/sysctl.h~kernel-sysctlc-threads-max-observe-limits include/linux/sysctl.h
--- a/include/linux/sysctl.h~kernel-sysctlc-threads-max-observe-limits
+++ a/include/linux/sysctl.h
@@ -212,4 +212,7 @@ static inline void setup_sysctl_set(stru
#endif /* CONFIG_SYSCTL */
+int sysctl_max_threads(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos);
+
#endif /* _LINUX_SYSCTL_H */
diff -puN kernel/fork.c~kernel-sysctlc-threads-max-observe-limits kernel/fork.c
--- a/kernel/fork.c~kernel-sysctlc-threads-max-observe-limits
+++ a/kernel/fork.c
@@ -74,6 +74,7 @@
#include <linux/uprobes.h>
#include <linux/aio.h>
#include <linux/compiler.h>
+#include <linux/sysctl.h>
#include <asm/pgtable.h>
#include <asm/pgalloc.h>
@@ -266,7 +267,7 @@ void __init __weak arch_task_cache_init(
/*
* set_max_threads
*/
-static void set_max_threads(void)
+static void set_max_threads(unsigned int max_threads_suggested)
{
u64 threads;
@@ -280,6 +281,9 @@ static void set_max_threads(void)
threads = div64_u64((u64) totalram_pages * (u64) PAGE_SIZE,
(u64) THREAD_SIZE * 8UL);
+ if (threads > max_threads_suggested)
+ threads = max_threads_suggested;
+
max_threads = clamp(threads, MIN_THREADS, MAX_THREADS);
}
@@ -298,7 +302,7 @@ void __init fork_init(void)
/* do the arch specific task caches init */
arch_task_cache_init();
- set_max_threads();
+ set_max_threads(MAX_THREADS);
init_task.signal->rlim[RLIMIT_NPROC].rlim_cur = max_threads/2;
init_task.signal->rlim[RLIMIT_NPROC].rlim_max = max_threads/2;
@@ -2024,3 +2028,26 @@ int unshare_files(struct files_struct **
task_unlock(task);
return 0;
}
+
+int sysctl_max_threads(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+ struct ctl_table t;
+ int ret;
+ int threads = max_threads;
+ int min = MIN_THREADS;
+ int max = MAX_THREADS;
+
+ t = *table;
+ t.data = &threads;
+ t.extra1 = &min;
+ t.extra2 = &max;
+
+ ret = proc_dointvec_minmax(&t, write, buffer, lenp, ppos);
+ if (ret || !write)
+ return ret;
+
+ set_max_threads(threads);
+
+ return 0;
+}
diff -puN kernel/sysctl.c~kernel-sysctlc-threads-max-observe-limits kernel/sysctl.c
--- a/kernel/sysctl.c~kernel-sysctlc-threads-max-observe-limits
+++ a/kernel/sysctl.c
@@ -92,11 +92,9 @@
#include <linux/nmi.h>
#endif
-
#if defined(CONFIG_SYSCTL)
/* External variables not in a header file. */
-extern int max_threads;
extern int suid_dumpable;
#ifdef CONFIG_COREDUMP
extern int core_uses_pid;
@@ -709,10 +707,10 @@ static struct ctl_table kern_table[] = {
#endif
{
.procname = "threads-max",
- .data = &max_threads,
+ .data = NULL,
.maxlen = sizeof(int),
.mode = 0644,
- .proc_handler = proc_dointvec,
+ .proc_handler = sysctl_max_threads,
},
{
.procname = "random",
_
Patches currently in -mm which might be from xypron.glpk@xxxxxx are
kernel-forkc-new-function-for-max_threads.patch
kernel-forkc-avoid-division-by-zero.patch
kernel-forkc-avoid-division-by-zero-fix.patch
kernel-sysctlc-threads-max-observe-limits.patch
doc-sysctl-kerneltxt-document-threads-max.patch
doc-sysctl-kerneltxt-document-threads-max-fix.patch
linux-next.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
