Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92c1d652 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup 

Pull cgroup updates from Tejun Heo:
 "Documentation updates and the addition of cgroup_parse_float() which
  will be used by new controllers including blk-iocost"

* 'for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  docs: cgroup-v1: convert docs to ReST and rename to *.rst
  cgroup: Move cgroup_parse_float() implementation out of CONFIG_SYSFS
  cgroup: add cgroup_parse_float()
parents df2a40f5 99c8b231

Documentation/admin-guide/cgroup-v2.rst

+6 −0
Original line number Diff line number Diff line
@@ -705,6 +705,12 @@ Conventions 
  informational files on the root cgroup which end up showing global

  information available elsewhere shouldn't exist.



- The default time unit is microseconds.  If a different unit is ever

  used, an explicit unit suffix must be present.



- A parts-per quantity should use a percentage decimal with at least

  two digit fractional part - e.g. 13.40.



- If a controller implements weight based resource distribution, its

  interface file should be named "weight" and have the range [1,

  10000] with 100 as the default.  The values are chosen to allow

Documentation/admin-guide/hw-vuln/l1tf.rst

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ Guest mitigation mechanisms 
   For further information about confining guests to a single or to a group

   of cores consult the cpusets documentation:



   https://www.kernel.org/doc/Documentation/cgroup-v1/cpusets.txt

   https://www.kernel.org/doc/Documentation/cgroup-v1/cpusets.rst



.. _interrupt_isolation:

Documentation/admin-guide/kernel-parameters.txt

+2 −2
Original line number Diff line number Diff line
@@ -4084,7 +4084,7 @@ 


	relax_domain_level=

			[KNL, SMP] Set scheduler's default relax_domain_level.

			See Documentation/cgroup-v1/cpusets.txt.

			See Documentation/cgroup-v1/cpusets.rst.



	reserve=	[KNL,BUGS] Force kernel to ignore I/O ports or memory

			Format: <base1>,<size1>[,<base2>,<size2>,...]
@@ -4594,7 +4594,7 @@ 
	swapaccount=[0|1]

			[KNL] Enable accounting of swap in memory resource

			controller if no parameter or 1 is given or disable

			it if 0 is given (See Documentation/cgroup-v1/memory.txt)

			it if 0 is given (See Documentation/cgroup-v1/memory.rst)



	swiotlb=	[ARM,IA-64,PPC,MIPS,X86]

			Format: { <int> | force | noforce }

Documentation/admin-guide/mm/numa_memory_policy.rst

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ document attempts to describe the concepts and APIs of the 2.6 memory policy 
support.



Memory policies should not be confused with cpusets

(``Documentation/cgroup-v1/cpusets.txt``)

(``Documentation/cgroup-v1/cpusets.rst``)

which is an administrative mechanism for restricting the nodes from which

memory may be allocated by a set of processes. Memory policies are a

programming interface that a NUMA-aware application can take advantage of.  When

Documentation/block/bfq-iosched.txt

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ As for cgroups-v1 (blkio controller), the exact set of stat files 
created, and kept up-to-date by bfq, depends on whether

CONFIG_DEBUG_BLK_CGROUP is set. If it is set, then bfq creates all

the stat files documented in

Documentation/cgroup-v1/blkio-controller.txt. If, instead,

Documentation/cgroup-v1/blkio-controller.rst. If, instead,

CONFIG_DEBUG_BLK_CGROUP is not set, then bfq creates only the files

blkio.bfq.io_service_bytes

blkio.bfq.io_service_bytes_recursive