Merge tag 'x86_misc_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst
index 38aa019..176298f 100644 (file)
--- a/Documentation/admin-guide/cgroup-v2.rst
+++ b/Documentation/admin-guide/cgroup-v2.rst
@@ -1208,6 +1208,34 @@ PAGE_SIZE multiple when read back.
        high limit is used and monitored properly, this limit's
        utility is limited to providing the final safety net.
 
+  memory.reclaim
+       A write-only nested-keyed file which exists for all cgroups.
+
+       This is a simple interface to trigger memory reclaim in the
+       target cgroup.
+
+       This file accepts a single key, the number of bytes to reclaim.
+       No nested keys are currently supported.
+
+       Example::
+
+         echo "1G" > memory.reclaim
+
+       The interface can be later extended with nested keys to
+       configure the reclaim behavior. For example, specify the
+       type of memory to reclaim from (anon, file, ..).
+
+       Please note that the kernel can over or under reclaim from
+       the target cgroup. If less bytes are reclaimed than the
+       specified amount, -EAGAIN is returned.
+
+  memory.peak
+       A read-only single value file which exists on non-root
+       cgroups.
+
+       The max memory usage recorded for the cgroup and its
+       descendants since the creation of the cgroup.
+
   memory.oom.group
        A read-write single value file which exists on non-root
        cgroups.  The default value is "0".
@@ -1326,6 +1354,12 @@ PAGE_SIZE multiple when read back.
                Amount of cached filesystem data that is swap-backed,
                such as tmpfs, shm segments, shared anonymous mmap()s
 
+         zswap
+               Amount of memory consumed by the zswap compression backend.
+
+         zswapped
+               Amount of application memory swapped out to zswap.
+
          file_mapped
                Amount of cached filesystem data mapped with mmap()
 
@@ -1516,6 +1550,21 @@ PAGE_SIZE multiple when read back.
        higher than the limit for an extended period of time.  This
        reduces the impact on the workload and memory management.
 
+  memory.zswap.current
+       A read-only single value file which exists on non-root
+       cgroups.
+
+       The total amount of memory consumed by the zswap compression
+       backend.
+
+  memory.zswap.max
+       A read-write single value file which exists on non-root
+       cgroups.  The default is "max".
+
+       Zswap usage hard limit. If a cgroup's zswap pool reaches this
+       limit, it will refuse to take any more stores before existing
+       entries fault back in or are written out to disk.
+
   memory.pressure
        A read-only nested-keyed file.