Merge tag 'mm-stable-2024-09-20-02-31' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / Documentation / admin-guide / cgroup-v2.rst

diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst
index c65756afd372f7acdd4e4d061415ed1413f5110e..69af2173555fb6b7d8d536e70ed327ff30330ea3 100644 (file)
--- a/Documentation/admin-guide/cgroup-v2.rst
+++ b/Documentation/admin-guide/cgroup-v2.rst
@@ -1343,11 +1343,14 @@ The following nested keys are defined.
        all the existing limitations and potential future extensions.
 
   memory.peak
-       A read-only single value file which exists on non-root
-       cgroups.
+       A read-write single value file which exists on non-root cgroups.
+
+       The max memory usage recorded for the cgroup and its descendants since
+       either the creation of the cgroup or the most recent reset for that FD.
 
-       The max memory usage recorded for the cgroup and its
-       descendants since the creation of the cgroup.
+       A write of any non-empty string to this file resets it to the
+       current memory usage for subsequent reads through the same
+       file descriptor.
 
   memory.oom.group
        A read-write single value file which exists on non-root
@@ -1624,6 +1627,25 @@ The following nested keys are defined.
                Usually because failed to allocate some continuous swap space
                for the huge page.
 
+         numa_pages_migrated (npn)
+               Number of pages migrated by NUMA balancing.
+
+         numa_pte_updates (npn)
+               Number of pages whose page table entries are modified by
+               NUMA balancing to produce NUMA hinting faults on access.
+
+         numa_hint_faults (npn)
+               Number of NUMA hinting faults.
+
+         pgdemote_kswapd
+               Number of pages demoted by kswapd.
+
+         pgdemote_direct
+               Number of pages demoted directly.
+
+         pgdemote_khugepaged
+               Number of pages demoted by khugepaged.
+
   memory.numa_stat
        A read-only nested-keyed file which exists on non-root cgroups.
 
@@ -1673,11 +1695,14 @@ The following nested keys are defined.
        Healthy workloads are not expected to reach this limit.
 
   memory.swap.peak
-       A read-only single value file which exists on non-root
-       cgroups.
+       A read-write single value file which exists on non-root cgroups.
+
+       The max swap usage recorded for the cgroup and its descendants since
+       the creation of the cgroup or the most recent reset for that FD.
 
-       The max swap usage recorded for the cgroup and its
-       descendants since the creation of the cgroup.
+       A write of any non-empty string to this file resets it to the
+       current memory usage for subsequent reads through the same
+       file descriptor.
 
   memory.swap.max
        A read-write single value file which exists on non-root
@@ -1741,6 +1766,8 @@ The following nested keys are defined.
 
        Note that this is subtly different from setting memory.swap.max to
        0, as it still allows for pages to be written to the zswap pool.
+       This setting has no effect if zswap is disabled, and swapping
+       is allowed unless memory.swap.max is set to 0.
 
   memory.pressure
        A read-only nested-keyed file.