From d9714fe4056731770112d4fbebe9b930d4ed7418 Mon Sep 17 00:00:00 2001 From: Sam Morris Date: Mon, 19 Jun 2023 12:30:43 +0100 Subject: [PATCH] Resource control manpage fixup (#28046) The order of the description of each item should match the order that they are declared. Un-document effect of deprecated non-unified CGroup hierarchy on DefaultCPUAccounting=. Mention that the default value for DefaultCPUAccouting= is affected by the kernel version. --- man/systemd-system.conf.xml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 4860dab841..e106dabaf4 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -438,17 +438,19 @@ DefaultIOAccounting= DefaultIPAccounting= - Configure the default resource accounting settings, as configured per-unit by + + Configure the default resource accounting settings, as configured per-unit by CPUAccounting=, MemoryAccounting=, TasksAccounting=, IOAccounting= and IPAccounting=. See systemd.resource-control5 - for details on the per-unit settings. DefaultTasksAccounting= defaults to yes, - DefaultMemoryAccounting= to &MEMORY_ACCOUNTING_DEFAULT;. - DefaultCPUAccounting= defaults to yes, but really has no effect if enabling CPU - accounting doesn't require the controller to be enabled (Linux 4.15+ using the - unified hierarchy for resource control), otherwise it defaults to no. The other three settings - default to no. + for details on the per-unit settings. + + DefaultCPUAccounting= defaults to yes when running on kernel ≥4.15, and no on older versions. + DefaultMemoryAccounting= defaults to &MEMORY_ACCOUNTING_DEFAULT;. + DefaultTasksAccounting= defaults to yes. + The other settings default to no. +