Merge tag 'mmc-v6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[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 e592a93..4ef8901 100644 (file)
--- a/Documentation/admin-guide/cgroup-v2.rst
+++ b/Documentation/admin-guide/cgroup-v2.rst
@@ -1580,6 +1580,13 @@ PAGE_SIZE multiple when read back.
 
        Healthy workloads are not expected to reach this limit.
 
+  memory.swap.peak
+       A read-only 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.
+
   memory.swap.max
        A read-write single value file which exists on non-root
        cgroups.  The default is "max".
@@ -2022,31 +2029,33 @@ that attribute:
   no-change
        Do not modify the I/O priority class.
 
-  none-to-rt
-       For requests that do not have an I/O priority class (NONE),
-       change the I/O priority class into RT. Do not modify
-       the I/O priority class of other requests.
+  promote-to-rt
+       For requests that have a non-RT I/O priority class, change it into RT.
+       Also change the priority level of these requests to 4. Do not modify
+       the I/O priority of requests that have priority class RT.
 
   restrict-to-be
        For requests that do not have an I/O priority class or that have I/O
-       priority class RT, change it into BE. Do not modify the I/O priority
-       class of requests that have priority class IDLE.
+       priority class RT, change it into BE. Also change the priority level
+       of these requests to 0. Do not modify the I/O priority class of
+       requests that have priority class IDLE.
 
   idle
        Change the I/O priority class of all requests into IDLE, the lowest
        I/O priority class.
 
+  none-to-rt
+       Deprecated. Just an alias for promote-to-rt.
+
 The following numerical values are associated with the I/O priority policies:
 
-+-------------+---+
-| no-change   | 0 |
-+-------------+---+
-| none-to-rt  | 1 |
-+-------------+---+
-| rt-to-be    | 2 |
-+-------------+---+
-| all-to-idle | 3 |
-+-------------+---+
++----------------+---+
+| no-change      | 0 |
++----------------+---+
+| rt-to-be       | 2 |
++----------------+---+
+| all-to-idle    | 3 |
++----------------+---+
 
 The numerical value that corresponds to each I/O priority class is as follows:
 
@@ -2062,9 +2071,13 @@ The numerical value that corresponds to each I/O priority class is as follows:
 
 The algorithm to set the I/O priority class for a request is as follows:
 
-- Translate the I/O priority class policy into a number.
-- Change the request I/O priority class into the maximum of the I/O priority
-  class policy number and the numerical I/O priority class.
+- If I/O priority class policy is promote-to-rt, change the request I/O
+  priority class to IOPRIO_CLASS_RT and change the request I/O priority
+  level to 4.
+- If I/O priorityt class is not promote-to-rt, translate the I/O priority
+  class policy into a number, then change the request I/O priority class
+  into the maximum of the I/O priority class policy number and the numerical
+  I/O priority class.
 
 PID
 ---
@@ -2437,7 +2450,7 @@ Miscellaneous controller provides 3 interface files. If two misc resources (res_
          res_b 10
 
   misc.current
-        A read-only flat-keyed file shown in the non-root cgroups.  It shows
+        A read-only flat-keyed file shown in the all cgroups.  It shows
         the current usage of the resources in the cgroup and its children.::
 
          $ cat misc.current