diff options
author | Johannes Weiner <hannes@cmpxchg.org> | 2016-02-16 13:21:14 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2016-02-16 13:26:02 -0500 |
commit | 1619b6d4fdd776b1b91bd288ad6f7e37fe183485 (patch) | |
tree | c69e1ffab2741d942bedd3e86a42d13a5bf6f168 | |
parent | 223ffb29f9723a4b485cacf6dc7e6d639fffc322 (diff) | |
download | linux-stable-1619b6d4fdd776b1b91bd288ad6f7e37fe183485.tar.gz linux-stable-1619b6d4fdd776b1b91bd288ad6f7e37fe183485.tar.bz2 linux-stable-1619b6d4fdd776b1b91bd288ad6f7e37fe183485.zip |
cgroup: document cgroup_no_v1=
Add cgroup_no_v1= to kernel-parameters.txt, and a small blurb to
cgroup-v2.txt section about transitioning from cgroup to cgroup2.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r-- | Documentation/cgroup-v2.txt | 6 | ||||
-rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/cgroup-v2.txt b/Documentation/cgroup-v2.txt index 9ae148ab1255..3922ae1654fd 100644 --- a/Documentation/cgroup-v2.txt +++ b/Documentation/cgroup-v2.txt @@ -132,6 +132,12 @@ strongly discouraged for production use. It is recommended to decide the hierarchies and controller associations before starting using the controllers after system boot. +During transition to v2, system management software might still +automount the v1 cgroup filesystem and so hijack all controllers +during boot, before manual intervention is possible. To make testing +and experimenting easier, the kernel parameter cgroup_no_v1= allows +disabling controllers in v1 and make them always available in v2. + 2-2. Organizing Processes diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index cfb2c0f1a4a8..0d962a1ff11c 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -608,6 +608,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. cut the overhead, others just disable the usage. So only cgroup_disable=memory is actually worthy} + cgroup_no_v1= [KNL] Disable one, multiple, all cgroup controllers in v1 + Format: { controller[,controller...] | "all" } + Like cgroup_disable, but only applies to cgroup v1; + the blacklisted controllers remain available in cgroup2. + cgroup.memory= [KNL] Pass options to the cgroup memory controller. Format: <string> nosocket -- Disable socket memory accounting. |