Commit 3bf03b9a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge updates from Andrew Morton:

 - A few misc subsystems: kthread, scripts, ntfs, ocfs2, block, and vfs

 - Most the MM patches which precede the patches in Willy's tree: kasan,
   pagecache, gup, swap, shmem, memcg, selftests, pagemap, mremap,
   sparsemem, vmalloc, pagealloc, memory-failure, mlock, hugetlb,
   userfaultfd, vmscan, compaction, mempolicy, oom-kill, migration, thp,
   cma, autonuma, psi, ksm, page-poison, madvise, memory-hotplug, rmap,
   zswap, uaccess, ioremap, highmem, cleanups, kfence, hmm, and damon.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (227 commits)
  mm/damon/sysfs: remove repeat container_of() in damon_sysfs_kdamond_release()
  Docs/ABI/testing: add DAMON sysfs interface ABI document
  Docs/admin-guide/mm/damon/usage: document DAMON sysfs interface
  selftests/damon: add a test for DAMON sysfs interface
  mm/damon/sysfs: support DAMOS stats
  mm/damon/sysfs: support DAMOS watermarks
  mm/damon/sysfs: support schemes prioritization
  mm/damon/sysfs: support DAMOS quotas
  mm/damon/sysfs: support DAMON-based Operation Schemes
  mm/damon/sysfs: support the physical address space monitoring
  mm/damon/sysfs: link DAMON for virtual address spaces monitoring
  mm/damon: implement a minimal stub for sysfs-based DAMON interface
  mm/damon/core: add number of each enum type values
  mm/damon/core: allow non-exclusive DAMON start/stop
  Docs/damon: update outdated term 'regions update interval'
  Docs/vm/damon/design: update DAMON-Idle Page Tracking interference handling
  Docs/vm/damon: call low level monitoring primitives the operations
  mm/damon: remove unnecessary CONFIG_DAMON option
  mm/damon/paddr,vaddr: remove damon_{p,v}a_{target_valid,set_operations}()
  mm/damon/dbgfs-test: fix is_target_id() change
  ...
parents 3fe2f744 15423a52

Documentation/ABI/testing/sysfs-kernel-mm-damon

0 → 100644
+274 −0
Original line number Diff line number Diff line 
what:		/sys/kernel/mm/damon/

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Interface for Data Access MONitoring (DAMON).  Contains files

		for controlling DAMON.  For more details on DAMON itself,

		please refer to Documentation/admin-guide/mm/damon/index.rst.



What:		/sys/kernel/mm/damon/admin/

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Interface for privileged users of DAMON.  Contains files for

		controlling DAMON that aimed to be used by privileged users.



What:		/sys/kernel/mm/damon/admin/kdamonds/nr_kdamonds

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing a number 'N' to this file creates the number of

		directories for controlling each DAMON worker thread (kdamond)

		named '0' to 'N-1' under the kdamonds/ directory.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/state

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing 'on' or 'off' to this file makes the kdamond starts or

		stops, respectively.  Reading the file returns the keywords

		based on the current status.  Writing 'update_schemes_stats' to

		the file updates contents of schemes stats files of the

		kdamond.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/pid

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Reading this file returns the pid of the kdamond if it is

		running.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/nr_contexts

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing a number 'N' to this file creates the number of

		directories for controlling each DAMON context named '0' to

		'N-1' under the contexts/ directory.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/operations

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing a keyword for a monitoring operations set ('vaddr' for

		virtual address spaces monitoring, and 'paddr' for the physical

		address space monitoring) to this file makes the context to use

		the operations set.  Reading the file returns the keyword for

		the operations set the context is set to use.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/monitoring_attrs/intervals/sample_us

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing a value to this file sets the sampling interval of the

		DAMON context in microseconds as the value.  Reading this file

		returns the value.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/monitoring_attrs/intervals/aggr_us

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing a value to this file sets the aggregation interval of

		the DAMON context in microseconds as the value.  Reading this

		file returns the value.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/monitoring_attrs/intervals/update_us

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing a value to this file sets the update interval of the

		DAMON context in microseconds as the value.  Reading this file

		returns the value.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/monitoring_attrs/nr_regions/min



WDate:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing a value to this file sets the minimum number of

		monitoring regions of the DAMON context as the value.  Reading

		this file returns the value.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/monitoring_attrs/nr_regions/max

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing a value to this file sets the maximum number of

		monitoring regions of the DAMON context as the value.  Reading

		this file returns the value.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/targets/nr_targets

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing a number 'N' to this file creates the number of

		directories for controlling each DAMON target of the context

		named '0' to 'N-1' under the contexts/ directory.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/targets/<T>/pid_target

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the pid of

		the target process if the context is for virtual address spaces

		monitoring, respectively.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/targets/<T>/regions/nr_regions

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing a number 'N' to this file creates the number of

		directories for setting each DAMON target memory region of the

		context named '0' to 'N-1' under the regions/ directory.  In

		case of the virtual address space monitoring, DAMON

		automatically sets the target memory region based on the target

		processes' mappings.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/targets/<T>/regions/<R>/start

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the start

		address of the monitoring region.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/targets/<T>/regions/<R>/end

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the end

		address of the monitoring region.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/nr_schemes

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing a number 'N' to this file creates the number of

		directories for controlling each DAMON-based operation scheme

		of the context named '0' to 'N-1' under the schemes/ directory.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/action

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the action

		of the scheme.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/access_pattern/sz/min

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the mimimum

		size of the scheme's target regions in bytes.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/access_pattern/sz/max

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the maximum

		size of the scheme's target regions in bytes.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/access_pattern/nr_accesses/min

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the manimum

		'nr_accesses' of the scheme's target regions.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/access_pattern/nr_accesses/max

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the maximum

		'nr_accesses' of the scheme's target regions.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/access_pattern/age/min

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the minimum

		'age' of the scheme's target regions.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/access_pattern/age/max

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the maximum

		'age' of the scheme's target regions.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/quotas/ms

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the time

		quota of the scheme in milliseconds.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/quotas/bytes

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the size

		quota of the scheme in bytes.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/quotas/reset_interval_ms

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the quotas

		charge reset interval of the scheme in milliseconds.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/quotas/weights/sz_permil

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the

		under-quota limit regions prioritization weight for 'size' in

		permil.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/quotas/weights/nr_accesses_permil

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the

		under-quota limit regions prioritization weight for

		'nr_accesses' in permil.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/quotas/weights/age_permil

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the

		under-quota limit regions prioritization weight for 'age' in

		permil.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/watermarks/metric

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the metric

		of the watermarks for the scheme.  The writable/readable

		keywords for this file are 'none' for disabling the watermarks

		feature, or 'free_mem_rate' for the system's global free memory

		rate in permil.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/watermarks/interval_us

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the metric

		check interval of the watermarks for the scheme in

		microseconds.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/watermarks/high

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the high

		watermark of the scheme in permil.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/watermarks/mid

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the mid

		watermark of the scheme in permil.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/watermarks/low

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Writing to and reading from this file sets and gets the low

		watermark of the scheme in permil.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/stats/nr_tried

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Reading this file returns the number of regions that the action

		of the scheme has tried to be applied.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/stats/sz_tried

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Reading this file returns the total size of regions that the

		action of the scheme has tried to be applied in bytes.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/stats/nr_applied

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Reading this file returns the number of regions that the action

		of the scheme has successfully applied.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/stats/sz_applied

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Reading this file returns the total size of regions that the

		action of the scheme has successfully applied in bytes.



What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/stats/qt_exceeds

Date:		Mar 2022

Contact:	SeongJae Park <sj@kernel.org>

Description:	Reading this file returns the number of the exceed events of

		the scheme's quotas.

Documentation/admin-guide/cgroup-v1/memory.rst

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ Brief summary of control files. 
				     threads

 cgroup.procs			     show list of processes

 cgroup.event_control		     an interface for event_fd()

				     This knob is not available on CONFIG_PREEMPT_RT systems.

 memory.usage_in_bytes		     show current usage for memory

				     (See 5.5 for details)

 memory.memsw.usage_in_bytes	     show current usage for memory+Swap
@@ -75,6 +76,7 @@ Brief summary of control files. 
 memory.max_usage_in_bytes	     show max memory usage recorded

 memory.memsw.max_usage_in_bytes     show max memory+Swap usage recorded

 memory.soft_limit_in_bytes	     set/show soft limit of memory usage

				     This knob is not available on CONFIG_PREEMPT_RT systems.

 memory.stat			     show various statistics

 memory.use_hierarchy		     set/show hierarchical account enabled

                                     This knob is deprecated and shouldn't be

Documentation/admin-guide/cgroup-v2.rst

+5 −0
Original line number Diff line number Diff line
@@ -1301,6 +1301,11 @@ PAGE_SIZE multiple when read back. 
		Amount of memory used to cache filesystem data,

		including tmpfs and shared memory.



	  kernel (npn)

		Amount of total kernel memory, including

		(kernel_stack, pagetables, percpu, vmalloc, slab) in

		addition to other kernel memory use cases.



	  kernel_stack

		Amount of memory allocated to kernel stacks.

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -1649,7 +1649,7 @@ 
			[KNL] Reguires CONFIG_HUGETLB_PAGE_FREE_VMEMMAP

			enabled.

			Allows heavy hugetlb users to free up some more

			memory (6 * PAGE_SIZE for each 2MB hugetlb page).

			memory (7 * PAGE_SIZE for each 2MB hugetlb page).

			Format: { on | off (default) }



			on:  enable the feature

Documentation/admin-guide/mm/damon/usage.rst

+361 −19

File changed.

Preview size limit exceeded, changes collapsed.