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

Commit 68abbe72 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge updates from Andrew Morton:

 - a few misc things

 - ocfs2 updates

 - v9fs updates

 - MM

 - procfs updates

 - lib/ updates

 - autofs updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits)
  autofs: small cleanup in autofs_getpath()
  autofs: clean up includes
  autofs: comment on selinux changes needed for module autoload
  autofs: update MAINTAINERS entry for autofs
  autofs: use autofs instead of autofs4 in documentation
  autofs: rename autofs documentation files
  autofs: create autofs Kconfig and Makefile
  autofs: delete fs/autofs4 source files
  autofs: update fs/autofs4/Makefile
  autofs: update fs/autofs4/Kconfig
  autofs: copy autofs4 to autofs
  autofs4: use autofs instead of autofs4 everywhere
  autofs4: merge auto_fs.h and auto_fs4.h
  fs/binfmt_misc.c: do not allow offset overflow
  checkpatch: improve patch recognition
  lib/ucs2_string.c: add MODULE_LICENSE()
  lib/mpi: headers cleanup
  lib/percpu_ida.c: use _irqsave() instead of local_irq_save() + spin_lock
  lib/idr.c: remove simple_ida_lock
  lib/bitmap.c: micro-optimization for __bitmap_complement()
  ...
parents ba1b7309 016e92da

Documentation/admin-guide/cgroup-v2.rst

+57 −15
Original line number Diff line number Diff line
@@ -1001,14 +1001,44 @@ PAGE_SIZE multiple when read back. 
	The total amount of memory currently being used by the cgroup

	and its descendants.



  memory.min

	A read-write single value file which exists on non-root

	cgroups.  The default is "0".



	Hard memory protection.  If the memory usage of a cgroup

	is within its effective min boundary, the cgroup's memory

	won't be reclaimed under any conditions. If there is no

	unprotected reclaimable memory available, OOM killer

	is invoked.



       Effective min boundary is limited by memory.min values of

	all ancestor cgroups. If there is memory.min overcommitment

	(child cgroup or cgroups are requiring more protected memory

	than parent will allow), then each child cgroup will get

	the part of parent's protection proportional to its

	actual memory usage below memory.min.



	Putting more memory than generally available under this

	protection is discouraged and may lead to constant OOMs.



	If a memory cgroup is not populated with processes,

	its memory.min is ignored.



  memory.low

	A read-write single value file which exists on non-root

	cgroups.  The default is "0".



	Best-effort memory protection.  If the memory usages of a

	cgroup and all its ancestors are below their low boundaries,

	the cgroup's memory won't be reclaimed unless memory can be

	reclaimed from unprotected cgroups.

	Best-effort memory protection.  If the memory usage of a

	cgroup is within its effective low boundary, the cgroup's

	memory won't be reclaimed unless memory can be reclaimed

	from unprotected cgroups.



	Effective low boundary is limited by memory.low values of

	all ancestor cgroups. If there is memory.low overcommitment

	(child cgroup or cgroups are requiring more protected memory

	than parent will allow), then each child cgroup will get

	the part of parent's protection proportional to its

	actual memory usage below memory.low.



	Putting more memory than generally available under this

	protection is discouraged.
@@ -1199,6 +1229,27 @@ PAGE_SIZE multiple when read back. 
	Swap usage hard limit.  If a cgroup's swap usage reaches this

	limit, anonymous memory of the cgroup will not be swapped out.



  memory.swap.events

	A read-only flat-keyed file which exists on non-root cgroups.

	The following entries are defined.  Unless specified

	otherwise, a value change in this file generates a file

	modified event.



	  max

		The number of times the cgroup's swap usage was about

		to go over the max boundary and swap allocation

		failed.



	  fail

		The number of times swap allocation failed either

		because of running out of swap system-wide or max

		limit.



	When reduced under the current usage, the existing swap

	entries are reclaimed gradually and the swap usage may stay

	higher than the limit for an extended period of time.  This

	reduces the impact on the workload and memory management.





Usage Guidelines

~~~~~~~~~~~~~~~~
@@ -1934,17 +1985,8 @@ system performance due to overreclaim, to the point where the feature 
becomes self-defeating.



The memory.low boundary on the other hand is a top-down allocated

reserve.  A cgroup enjoys reclaim protection when it and all its

ancestors are below their low boundaries, which makes delegation of

subtrees possible.  Secondly, new cgroups have no reserve per default

and in the common case most cgroups are eligible for the preferred

reclaim pass.  This allows the new low boundary to be efficiently

implemented with just a minor addition to the generic reclaim code,

without the need for out-of-band data structures and reclaim passes.

Because the generic reclaim code considers all cgroups except for the

ones running low in the preferred first reclaim pass, overreclaim of

individual groups is eliminated as well, resulting in much better

overall workload performance.

reserve.  A cgroup enjoys reclaim protection when it's within its low,

which makes delegation of subtrees possible.



The original high boundary, the hard limit, is defined as a strict

limit that can not budge, even if the OOM killer has to be called.

Documentation/blockdev/zram.txt

+25 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ line of text and contains the following stats separated by whitespace: 
 same_pages       the number of same element filled pages written to this disk.

                  No memory is allocated for such pages.

 pages_compacted  the number of pages freed during compaction

 huge_pages	  the number of incompressible pages



9) Deactivate:

	swapoff /dev/zram0
@@ -242,5 +243,29 @@ to backing storage rather than keeping it in memory. 
User should set up backing device via /sys/block/zramX/backing_dev

before disksize setting.



= memory tracking



With CONFIG_ZRAM_MEMORY_TRACKING, user can know information of the

zram block. It could be useful to catch cold or incompressible

pages of the process with*pagemap.

If you enable the feature, you could see block state via

/sys/kernel/debug/zram/zram0/block_state". The output is as follows,



	  300    75.033841 .wh

	  301    63.806904 s..

	  302    63.806919 ..h



First column is zram's block index.

Second column is access time since the system was booted

Third column is state of the block.

(s: same page

w: written page to backing store

h: huge page)



First line of above example says 300th block is accessed at 75.033841sec

and the block's state is huge so it is written back to the backing

storage. It's a debugging feature so anyone shouldn't rely on it to work

properly.



Nitin Gupta

ngupta@vflare.org

Documentation/features/vm/pte_special/arch-support.txt

+1 −1
Original line number Diff line number Diff line 
#

# Feature name:          pte_special

#         Kconfig:       __HAVE_ARCH_PTE_SPECIAL

#         Kconfig:       ARCH_HAS_PTE_SPECIAL

#         description:   arch supports the pte_special()/pte_mkspecial() VM APIs

#

    -----------------------

Documentation/filesystems/00-INDEX

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ afs.txt 
	- info and examples for the distributed AFS (Andrew File System) fs.

affs.txt

	- info and mount options for the Amiga Fast File System.

autofs4-mount-control.txt

	- info on device control operations for autofs4 module.

autofs-mount-control.txt

	- info on device control operations for autofs module.

automount-support.txt

	- information about filesystem automount support.

befs.txt

Documentation/filesystems/autofs4-mount-control.txt→Documentation/filesystems/autofs-mount-control.txt

+4 −5
Original line number Diff line number Diff line 


Miscellaneous Device control operations for the autofs4 kernel module

Miscellaneous Device control operations for the autofs kernel module

====================================================================



The problem
@@ -164,7 +164,7 @@ possibility for future development due to the requirements of the 
message bus architecture.





autofs4 Miscellaneous Device mount control interface

autofs Miscellaneous Device mount control interface

====================================================



The control interface is opening a device node, typically /dev/autofs.
@@ -244,7 +244,7 @@ The device node ioctl operations implemented by this interface are: 
AUTOFS_DEV_IOCTL_VERSION

------------------------



Get the major and minor version of the autofs4 device ioctl kernel module

Get the major and minor version of the autofs device ioctl kernel module

implementation. It requires an initialized struct autofs_dev_ioctl as an

input parameter and sets the version information in the passed in structure.

It returns 0 on success or the error -EINVAL if a version mismatch is
@@ -254,7 +254,7 @@ detected. 
AUTOFS_DEV_IOCTL_PROTOVER_CMD and AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD

------------------------------------------------------------------



Get the major and minor version of the autofs4 protocol version understood

Get the major and minor version of the autofs protocol version understood

by loaded module. This call requires an initialized struct autofs_dev_ioctl

with the ioctlfd field set to a valid autofs mount point descriptor

and sets the requested version number in version field of struct args_protover
@@ -404,4 +404,3 @@ type is also given we are looking for a particular autofs mount and if 
a match isn't found a fail is returned. If the the located path is the

root of a mount 1 is returned along with the super magic of the mount

or 0 otherwise.