Skip to content

Commit

Permalink
Documentation/memcg: update memcg/kmem status
Browse files Browse the repository at this point in the history
Memcg/kmem reclaim support has been finally merged. Reflect this in the
documentation.

Acked-by: Michal Hocko <[email protected]>
Signed-off-by: Vladimir Davydov <[email protected]>
Signed-off-by: Jonathan Corbet <[email protected]>
  • Loading branch information
Vladimir Davydov authored and Jonathan Corbet committed Apr 11, 2015
1 parent 82c91e8 commit 1971754
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
8 changes: 3 additions & 5 deletions Documentation/cgroups/memory.txt
Original file line number Diff line number Diff line change
Expand Up @@ -275,11 +275,6 @@ When oom event notifier is registered, event will be delivered.

2.7 Kernel Memory Extension (CONFIG_MEMCG_KMEM)

WARNING: Current implementation lacks reclaim support. That means allocation
attempts will fail when close to the limit even if there are plenty of
kmem available for reclaim. That makes this option unusable in real
life so DO NOT SELECT IT unless for development purposes.

With the Kernel memory extension, the Memory Controller is able to limit
the amount of kernel memory used by the system. Kernel memory is fundamentally
different than user memory, since it can't be swapped out, which makes it
Expand Down Expand Up @@ -345,6 +340,9 @@ set:
In this case, the admin could set up K so that the sum of all groups is
never greater than the total memory, and freely set U at the cost of his
QoS.
WARNING: In the current implementation, memory reclaim will NOT be
triggered for a cgroup when it hits K while staying below U, which makes
this setup impractical.

U != 0, K >= U:
Since kmem charges will also be fed to the user counter and reclaim will be
Expand Down
6 changes: 0 additions & 6 deletions init/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1032,12 +1032,6 @@ config MEMCG_KMEM
the kmem extension can use it to guarantee that no group of processes
will ever exhaust kernel resources alone.

WARNING: Current implementation lacks reclaim support. That means
allocation attempts will fail when close to the limit even if there
are plenty of kmem available for reclaim. That makes this option
unusable in real life so DO NOT SELECT IT unless for development
purposes.

config CGROUP_HUGETLB
bool "HugeTLB Resource Controller for Control Groups"
depends on HUGETLB_PAGE
Expand Down

0 comments on commit 1971754

Please sign in to comment.