Merge branch 'for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[sfrench/cifs-2.6.git] / Documentation / admin-guide / cgroup-v2.rst

diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst
index 7bf3f129c68bdc75943c58764b78aba097671e25..20f92c16ffbf2c6e89ae090719d2e7225383985f 100644 (file)
--- a/Documentation/admin-guide/cgroup-v2.rst
+++ b/Documentation/admin-guide/cgroup-v2.rst
@@ -1189,6 +1189,10 @@ PAGE_SIZE multiple when read back.
                Amount of cached filesystem data that was modified and
                is currently being written back to disk
 
+         anon_thp
+               Amount of memory used in anonymous mappings backed by
+               transparent hugepages
+
          inactive_anon, active_anon, inactive_file, active_file, unevictable
                Amount of memory, swap-backed and filesystem-backed,
                on the internal memory management lists used by the
@@ -1248,6 +1252,18 @@ PAGE_SIZE multiple when read back.
 
                Amount of reclaimed lazyfree pages
 
+         thp_fault_alloc
+
+               Number of transparent hugepages which were allocated to satisfy
+               a page fault, including COW faults. This counter is not present
+               when CONFIG_TRANSPARENT_HUGEPAGE is not set.
+
+         thp_collapse_alloc
+
+               Number of transparent hugepages which were allocated to allow
+               collapsing an existing range of pages. This counter is not
+               present when CONFIG_TRANSPARENT_HUGEPAGE is not set.
+
   memory.swap.current
        A read-only single value file which exists on non-root
        cgroups.
@@ -1503,7 +1519,7 @@ protected workload.
 
 The limits are only applied at the peer level in the hierarchy.  This means that
 in the diagram below, only groups A, B, and C will influence each other, and
-groups D and F will influence each other.  Group G will influence nobody.
+groups D and F will influence each other.  Group G will influence nobody::
 
                        [root]
                /          |            \