aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds2015-09-02 10:04:23 -0500
committerLinus Torvalds2015-09-02 10:04:23 -0500
commit8bdc69b764013a9b5ebeef7df8f314f1066c5d79 (patch)
tree335dcb29c9ba06142917121d551575d360eca63e /init
parent76ec51ef5edfe540bbc3c61b860f88deb8e6a37b (diff)
parent20f1f4b5ffb870631bf4a4e7c7ba10e3528ae6a6 (diff)
downloadkernel-omap-8bdc69b764013a9b5ebeef7df8f314f1066c5d79.tar.gz
kernel-omap-8bdc69b764013a9b5ebeef7df8f314f1066c5d79.tar.xz
kernel-omap-8bdc69b764013a9b5ebeef7df8f314f1066c5d79.zip
Merge branch 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo: - a new PIDs controller is added. It turns out that PIDs are actually an independent resource from kmem due to the limited PID space. - more core preparations for the v2 interface. Once cpu side interface is settled, it should be ready for lifting the devel mask. for-4.3-unified-base was temporarily branched so that other trees (block) can pull cgroup core changes that blkcg changes depend on. - a non-critical idr_preload usage bug fix. * 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup: pids: fix invalid get/put usage cgroup: introduce cgroup_subsys->legacy_name cgroup: don't print subsystems for the default hierarchy cgroup: make cftype->private a unsigned long cgroup: export cgrp_dfl_root cgroup: define controller file conventions cgroup: fix idr_preload usage cgroup: add documentation for the PIDs controller cgroup: implement the PIDs subsystem cgroup: allow a cgroup subsystem to reject a fork
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig16
1 files changed, 16 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index ba1e6eaf4c36..bb9b4dd55889 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -947,6 +947,22 @@ config CGROUP_FREEZER
947 Provides a way to freeze and unfreeze all tasks in a 947 Provides a way to freeze and unfreeze all tasks in a
948 cgroup. 948 cgroup.
949 949
950config CGROUP_PIDS
951 bool "PIDs cgroup subsystem"
952 help
953 Provides enforcement of process number limits in the scope of a
954 cgroup. Any attempt to fork more processes than is allowed in the
955 cgroup will fail. PIDs are fundamentally a global resource because it
956 is fairly trivial to reach PID exhaustion before you reach even a
957 conservative kmemcg limit. As a result, it is possible to grind a
958 system to halt without being limited by other cgroup policies. The
959 PIDs cgroup subsystem is designed to stop this from happening.
960
961 It should be noted that organisational operations (such as attaching
962 to a cgroup hierarchy will *not* be blocked by the PIDs subsystem),
963 since the PIDs limit only affects a process's ability to fork, not to
964 attach to a cgroup.
965
950config CGROUP_DEVICE 966config CGROUP_DEVICE
951 bool "Device controller for cgroups" 967 bool "Device controller for cgroups"
952 help 968 help