diff options
author | Glauber Costa <glommer@parallels.com> | 2011-12-11 16:47:01 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-12 19:03:55 -0500 |
commit | e5671dfae59b165e2adfd4dfbdeab11ac8db5bda (patch) | |
tree | daf5570e8da71934970daa4b2044c6f13ee98f9d /init | |
parent | 08e34eb14fe4cfd934b5c169a7682a969457c4ea (diff) |
Basic kernel memory functionality for the Memory Controller
This patch lays down the foundation for the kernel memory component
of the Memory Controller.
As of today, I am only laying down the following files:
* memory.independent_kmem_limit
* memory.kmem.limit_in_bytes (currently ignored)
* memory.kmem.usage_in_bytes (always zero)
Signed-off-by: Glauber Costa <glommer@parallels.com>
CC: Kirill A. Shutemov <kirill@shutemov.name>
CC: Paul Menage <paul@paulmenage.org>
CC: Greg Thelen <gthelen@google.com>
CC: Johannes Weiner <jweiner@redhat.com>
CC: Michal Hocko <mhocko@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 43298f9810fb..b8930d5a8325 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -689,6 +689,17 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED | |||
689 | For those who want to have the feature enabled by default should | 689 | For those who want to have the feature enabled by default should |
690 | select this option (if, for some reason, they need to disable it | 690 | select this option (if, for some reason, they need to disable it |
691 | then swapaccount=0 does the trick). | 691 | then swapaccount=0 does the trick). |
692 | config CGROUP_MEM_RES_CTLR_KMEM | ||
693 | bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)" | ||
694 | depends on CGROUP_MEM_RES_CTLR && EXPERIMENTAL | ||
695 | default n | ||
696 | help | ||
697 | The Kernel Memory extension for Memory Resource Controller can limit | ||
698 | the amount of memory used by kernel objects in the system. Those are | ||
699 | fundamentally different from the entities handled by the standard | ||
700 | Memory Controller, which are page-based, and can be swapped. Users of | ||
701 | the kmem extension can use it to guarantee that no group of processes | ||
702 | will ever exhaust kernel resources alone. | ||
692 | 703 | ||
693 | config CGROUP_PERF | 704 | config CGROUP_PERF |
694 | bool "Enable perf_event per-cpu per-container group (cgroup) monitoring" | 705 | bool "Enable perf_event per-cpu per-container group (cgroup) monitoring" |