X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.exec.xml;h=ce6833b8438d6b97710c3ab2ca119f97dc03d31b;hp=89e3369d3c4916b7fdce95adf31a48f906a12ef3;hb=6705c2df468a6afb4f8f834822780add123065e2;hpb=ab1f063390f55e14a8de87f21c4fad199eb908a6

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 89e3369d3..ce6833b84 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -797,11 +797,13 @@
                                 <term><varname>CPUShares=</varname></term>
 
                                 <listitem><para>Assign the specified
-                                overall CPU time shares to the processes executed. Takes
-                                an integer value. This controls the
+                                overall CPU time shares to the
+                                processes executed. Takes an integer
+                                value. This controls the
                                 <literal>cpu.shares</literal> control
-                                group attribute. For details about
-                                this control group attribute see <ulink
+                                group attribute, which defaults to
+                                1024. For details about this control
+                                group attribute see <ulink
                                 url="http://www.kernel.org/doc/Documentation/scheduler/sched-design-CFS.txt">sched-design-CFS.txt</ulink>.</para></listitem>
                         </varlistentry>
 
@@ -814,7 +816,7 @@
                                 size. Takes a memory size in bytes. If
                                 the value is suffixed with K, M, G or
                                 T the specified memory size is parsed
-                                as Kilobytes, Megabytes, Gigabytes
+                                as Kilobytes, Megabytes, Gigabytes,
                                 resp. Terabytes (to the base
                                 1024). This controls the
                                 <literal>memory.limit_in_bytes</literal>
@@ -848,6 +850,67 @@
                                 url="http://www.kernel.org/doc/Documentation/cgroups/devices.txt">devices.txt</ulink>.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><varname>BlockIOWeight=</varname></term>
+
+                                <listitem><para>Set the default or
+                                per-device overall block IO weight
+                                value for the executed
+                                processes. Takes either a single
+                                weight value (between 10 and 1000) to
+                                set the default block IO weight, or a
+                                space separated pair of a file path
+                                and a weight value to specify the
+                                device specific weight value (Example:
+                                "/dev/sda 500"). The file path may be
+                                specified as path to a block device
+                                node or as any other file in which
+                                case the backing block device of the
+                                file system of the file is
+                                determined. This controls the
+                                <literal>blkio.weight</literal> and
+                                <literal>blkio.weight_device</literal>
+                                control group attributes, which
+                                default to 1000. Use this option
+                                multiple times to set weights for
+                                multiple devices. For details about
+                                these control group attributes see
+                                <ulink
+                                url="http://www.kernel.org/doc/Documentation/cgroups/blkio-controller.txt">blkio-controller.txt</ulink>.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><varname>BlockIOReadBandwidth=</varname></term>
+                                <term><varname>BlockIOWriteBandwidth=</varname></term>
+
+                                <listitem><para>Set the per-device
+                                overall block IO bandwith limit for
+                                the executed processes. Takes a space
+                                separated pair of a file path and a
+                                bandwith value (in bytes per second)
+                                to specify the device specific
+                                bandwidth. The file path may be
+                                specified as path to a block device
+                                node or as any other file in which
+                                case the backing block device of the
+                                file system of the file is determined.
+                                If the bandwith is suffixed with K, M,
+                                G, or T the specified bandwith is
+                                parsed as Kilobytes, Megabytes,
+                                Gigabytes, resp. Terabytes (Example:
+                                "/dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0
+                                5M"). This controls the
+                                <literal>blkio.read_bps_device</literal>
+                                and
+                                <literal>blkio.write_bps_device</literal>
+                                control group attributes. Use this
+                                option multiple times to set bandwith
+                                limits for multiple devices. For
+                                details about these control group
+                                attributes see <ulink
+                                url="http://www.kernel.org/doc/Documentation/cgroups/blkio-controller.txt">blkio-controller.txt</ulink>.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><varname>ReadWriteDirectories=</varname></term>
                                 <term><varname>ReadOnlyDirectories=</varname></term>