X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.cgroup.xml;h=b93b52ff6d765d4f64c0c9f712558ee813446892;hb=61ad59b1314060958c6e1b1b480074e230b6ed3e;hp=e31faf522e698c343c295f76bc962dc32969941a;hpb=6a75304e41e4487d840057a0e5f9972e141e4540;p=elogind.git
diff --git a/man/systemd.cgroup.xml b/man/systemd.cgroup.xml
index e31faf522..b93b52ff6 100644
--- a/man/systemd.cgroup.xml
+++ b/man/systemd.cgroup.xml
@@ -90,34 +90,19 @@ along with systemd; If not, see .
for cgroup configuration:
-
- CPUAccounting=
-
-
- Turn on CPU usage accounting for this
- unit.
-
-
- BlockIOAccounting=
-
-
- Turn on Block IO bandwidth accounting
- for this unit.
-
-
-
-
- MemoryAccounting=
+ CPUAccounting=
- Turn on process and kernel memory
- accounting for this unit.
+ Turn on CPU usage accounting for this unit. Takes a
+ boolean argument. Note that turning on CPU accounting for
+ one unit might also implicitly turn it on for all units
+ contained in the same slice and for all its parent slices and
+ the units contained therein.
-
CPUShares=weight
@@ -127,12 +112,24 @@ along with systemd; If not, see .
controls the cpu.shares control group
attribute, which defaults to 1024. For details about this
control group attribute, see sched-design-CFS.txt.
+ url="https://www.kernel.org/doc/Documentation/scheduler/sched-design-CFS.txt">sched-design-CFS.txt.
Implies CPUAccounting=true.
+
+ MemoryAccounting=
+
+
+ Turn on process and kernel memory accounting for this
+ unit. Takes a boolean argument. Note that turning on memory
+ accounting for one unit might also implicitly turn it on for
+ all units contained in the same slice and for all its parent
+ slices and the units contained therein.
+
+
+
MemoryLimit=bytes
MemorySoftLimit=bytes
@@ -152,12 +149,24 @@ along with systemd; If not, see .
memory.soft_limit_in_bytes control group
attributes. For details about these control group attributes,
see memory.txt.
+ url="https://www.kernel.org/doc/Documentation/cgroups/memory.txt">memory.txt.
Implies MemoryAccounting=true.
+
+ BlockIOAccounting=
+
+
+ Turn on Block IO accounting for this unit. Takes a
+ boolean argument. Note that turning on block IO accounting
+ for one unit might also implicitly turn it on for all units
+ contained in the same slice and all for its parent slices and
+ the units contained therein.
+
+
+
BlockIOWeight=weight
@@ -172,7 +181,11 @@ along with systemd; If not, see .
defaults to 1000. For details about
this control group attribute, see
blkio-controller.txt.
+ url="https://www.kernel.org/doc/Documentation/cgroups/blkio-controller.txt">blkio-controller.txt.
+
+ Implies
+ BlockIOAccounting=true.
+
@@ -191,7 +204,10 @@ along with systemd; If not, see .
attribute, which defaults to 1000. Use this option multiple
times to set weights for multiple devices. For details about
this control group attribute, see blkio-controller.txt.
+ url="https://www.kernel.org/doc/Documentation/cgroups/blkio-controller.txt">blkio-controller.txt.
+
+ Implies
+ BlockIOAccounting=true.
@@ -215,8 +231,11 @@ along with systemd; If not, see .
attributes. Use this option multiple times to set bandwidth
limits for multiple devices. For details about these control
group attributes, see
- blkio-controller.txt.
+ blkio-controller.txt.
+
+ Implies
+ BlockIOAccounting=true.
@@ -236,7 +255,7 @@ along with systemd; If not, see .
devices.deny control group
attributes. For details about these control group attributes,
see devices.txt.
+ url="https://www.kernel.org/doc/Documentation/cgroups/devices.txt">devices.txt.
@@ -283,6 +302,24 @@ along with systemd; If not, see .
+
+
+ Slice=
+
+
+ The name of the slice unit to place the unit
+ in. Defaults to system.slice for all
+ unit types, except for slice units themselves. This may be
+ used to arrange systemd units in a hierarchy of slices each
+ of which might have resource settings applied.
+
+ For units of type slice the only accepted value for
+ this setting is the parent slice. Since the name of a slice
+ unit implies the parent slice it is hence redundant to ever
+ set this parameter directly for slice units.
+
+
+
@@ -298,11 +335,12 @@ along with systemd; If not, see .
systemd.mount5,
systemd.swap5,
systemd.directives7,
+ systemd.special7,
The documentation for control groups and specific controllers in the Linux kernel:
- cgroups.txt,
- cpuacct.txt,
- memory.txt,
- blkio-controller.txt.
+ cgroups.txt,
+ cpuacct.txt,
+ memory.txt,
+ blkio-controller.txt.