Merge tag 'ecryptfs-4.15-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / Documentation / cgroup-v2.txt

diff --git a/Documentation/cgroup-v2.txt b/Documentation/cgroup-v2.txt
index dc44785dc0fa146a2de30aa11ef2c410f1b00622..779211fbb69ffac450f22b0ad6864c7c6c2bd98f 100644 (file)
--- a/Documentation/cgroup-v2.txt
+++ b/Documentation/cgroup-v2.txt
@@ -893,10 +893,6 @@ Controllers
 CPU
 ---
 
-.. note::
-
-       The interface for the cpu controller hasn't been merged yet
-
 The "cpu" controllers regulates distribution of CPU cycles.  This
 controller implements weight and absolute bandwidth limit models for
 normal scheduling policy and absolute bandwidth allocation model for
@@ -910,12 +906,16 @@ All time durations are in microseconds.
 
   cpu.stat
        A read-only flat-keyed file which exists on non-root cgroups.
+       This file exists whether the controller is enabled or not.
 
-       It reports the following six stats:
+       It always reports the following three stats:
 
        - usage_usec
        - user_usec
        - system_usec
+
+       and the following three when the controller is enabled:
+
        - nr_periods
        - nr_throttled
        - throttled_usec
@@ -926,6 +926,18 @@ All time durations are in microseconds.
 
        The weight in the range [1, 10000].
 
+  cpu.weight.nice
+       A read-write single value file which exists on non-root
+       cgroups.  The default is "0".
+
+       The nice value is in the range [-20, 19].
+
+       This interface file is an alternative interface for
+       "cpu.weight" and allows reading and setting weight using the
+       same values used by nice(2).  Because the range is smaller and
+       granularity is coarser for the nice values, the read value is
+       the closest approximation of the current weight.
+
   cpu.max
        A read-write two value file which exists on non-root cgroups.
        The default is "max 100000".
@@ -938,26 +950,6 @@ All time durations are in microseconds.
        $PERIOD duration.  "max" for $MAX indicates no limit.  If only
        one number is written, $MAX is updated.
 
-  cpu.rt.max
-       .. note::
-
-          The semantics of this file is still under discussion and the
-          interface hasn't been merged yet
-
-       A read-write two value file which exists on all cgroups.
-       The default is "0 100000".
-
-       The maximum realtime runtime allocation.  Over-committing
-       configurations are disallowed and process migrations are
-       rejected if not enough bandwidth is available.  It's in the
-       following format::
-
-         $MAX $PERIOD
-
-       which indicates that the group may consume upto $MAX in each
-       $PERIOD duration.  If only one number is written, $MAX is
-       updated.
-
 
 Memory
 ------