The patch titled Subject: Documentation/memcg: update memcg/kmem status has been removed from the -mm tree. Its filename was documentation-memcg-update-memcg-kmem-status.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx> Subject: Documentation/memcg: update memcg/kmem status Memcg/kmem reclaim support has been finally merged. Reflect this in the documentation. Signed-off-by: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx> Cc: Jonathan Corbet <corbet@xxxxxxx> Acked-by: Michal Hocko <mhocko@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/cgroups/memory.txt | 8 +++----- init/Kconfig | 6 ------ 2 files changed, 3 insertions(+), 11 deletions(-) diff -puN Documentation/cgroups/memory.txt~documentation-memcg-update-memcg-kmem-status Documentation/cgroups/memory.txt --- a/Documentation/cgroups/memory.txt~documentation-memcg-update-memcg-kmem-status +++ a/Documentation/cgroups/memory.txt @@ -275,11 +275,6 @@ When oom event notifier is registered, e 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 @@ -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 diff -puN init/Kconfig~documentation-memcg-update-memcg-kmem-status init/Kconfig --- a/init/Kconfig~documentation-memcg-update-memcg-kmem-status +++ a/init/Kconfig @@ -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 _ Patches currently in -mm which might be from vdavydov@xxxxxxxxxxxxx are mm-hotplug-fix-concurrent-memory-hot-add-deadlock.patch ocfs2-copy-fs-uuid-to-superblock.patch cleancache-zap-uuid-arg-of-cleancache_init_shared_fs.patch cleancache-forbid-overriding-cleancache_ops.patch cleancache-remove-limit-on-the-number-of-cleancache-enabled-filesystems.patch cleancache-remove-limit-on-the-number-of-cleancache-enabled-filesystems-fix.patch memcg-zap-mem_cgroup_lookup.patch memcg-remove-obsolete-comment.patch mm-vmscan-fix-the-page-state-calculation-in-too_many_isolated.patch signal-remove-warning-about-using-si_tkill-in-rt_sigqueueinfo.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