forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'mm-stable-2023-02-20-13-37' of git://git.kernel.org/pub/sc…
…m/linux/kernel/git/akpm/mm Pull MM updates from Andrew Morton: - Daniel Verkamp has contributed a memfd series ("mm/memfd: add F_SEAL_EXEC") which permits the setting of the memfd execute bit at memfd creation time, with the option of sealing the state of the X bit. - Peter Xu adds a patch series ("mm/hugetlb: Make huge_pte_offset() thread-safe for pmd unshare") which addresses a rare race condition related to PMD unsharing. - Several folioification patch serieses from Matthew Wilcox, Vishal Moola, Sidhartha Kumar and Lorenzo Stoakes - Johannes Weiner has a series ("mm: push down lock_page_memcg()") which does perform some memcg maintenance and cleanup work. - SeongJae Park has added DAMOS filtering to DAMON, with the series "mm/damon/core: implement damos filter". These filters provide users with finer-grained control over DAMOS's actions. SeongJae has also done some DAMON cleanup work. - Kairui Song adds a series ("Clean up and fixes for swap"). - Vernon Yang contributed the series "Clean up and refinement for maple tree". - Yu Zhao has contributed the "mm: multi-gen LRU: memcg LRU" series. It adds to MGLRU an LRU of memcgs, to improve the scalability of global reclaim. - David Hildenbrand has added some userfaultfd cleanup work in the series "mm: uffd-wp + change_protection() cleanups". - Christoph Hellwig has removed the generic_writepages() library function in the series "remove generic_writepages". - Baolin Wang has performed some maintenance on the compaction code in his series "Some small improvements for compaction". - Sidhartha Kumar is doing some maintenance work on struct page in his series "Get rid of tail page fields". - David Hildenbrand contributed some cleanup, bugfixing and generalization of pte management and of pte debugging in his series "mm: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE on all architectures with swap PTEs". - Mel Gorman and Neil Brown have removed the __GFP_ATOMIC allocation flag in the series "Discard __GFP_ATOMIC". - Sergey Senozhatsky has improved zsmalloc's memory utilization with his series "zsmalloc: make zspage chain size configurable". - Joey Gouly has added prctl() support for prohibiting the creation of writeable+executable mappings. The previous BPF-based approach had shortcomings. See "mm: In-kernel support for memory-deny-write-execute (MDWE)". - Waiman Long did some kmemleak cleanup and bugfixing in the series "mm/kmemleak: Simplify kmemleak_cond_resched() & fix UAF". - T.J. Alumbaugh has contributed some MGLRU cleanup work in his series "mm: multi-gen LRU: improve". - Jiaqi Yan has provided some enhancements to our memory error statistics reporting, mainly by presenting the statistics on a per-node basis. See the series "Introduce per NUMA node memory error statistics". - Mel Gorman has a second and hopefully final shot at fixing a CPU-hog regression in compaction via his series "Fix excessive CPU usage during compaction". - Christoph Hellwig does some vmalloc maintenance work in the series "cleanup vfree and vunmap". - Christoph Hellwig has removed block_device_operations.rw_page() in ths series "remove ->rw_page". - We get some maple_tree improvements and cleanups in Liam Howlett's series "VMA tree type safety and remove __vma_adjust()". - Suren Baghdasaryan has done some work on the maintainability of our vm_flags handling in the series "introduce vm_flags modifier functions". - Some pagemap cleanup and generalization work in Mike Rapoport's series "mm, arch: add generic implementation of pfn_valid() for FLATMEM" and "fixups for generic implementation of pfn_valid()" - Baoquan He has done some work to make /proc/vmallocinfo and /proc/kcore better represent the real state of things in his series "mm/vmalloc.c: allow vread() to read out vm_map_ram areas". - Jason Gunthorpe rationalized the GUP system's interface to the rest of the kernel in the series "Simplify the external interface for GUP". - SeongJae Park wishes to migrate people from DAMON's debugfs interface over to its sysfs interface. To support this, we'll temporarily be printing warnings when people use the debugfs interface. See the series "mm/damon: deprecate DAMON debugfs interface". - Andrey Konovalov provided the accurately named "lib/stackdepot: fixes and clean-ups" series. - Huang Ying has provided a dramatic reduction in migration's TLB flush IPI rates with the series "migrate_pages(): batch TLB flushing". - Arnd Bergmann has some objtool fixups in "objtool warning fixes". * tag 'mm-stable-2023-02-20-13-37' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (505 commits) include/linux/migrate.h: remove unneeded externs mm/memory_hotplug: cleanup return value handing in do_migrate_range() mm/uffd: fix comment in handling pte markers mm: change to return bool for isolate_movable_page() mm: hugetlb: change to return bool for isolate_hugetlb() mm: change to return bool for isolate_lru_page() mm: change to return bool for folio_isolate_lru() objtool: add UACCESS exceptions for __tsan_volatile_read/write kmsan: disable ftrace in kmsan core code kasan: mark addr_has_metadata __always_inline mm: memcontrol: rename memcg_kmem_enabled() sh: initialize max_mapnr m68k/nommu: add missing definition of ARCH_PFN_OFFSET mm: percpu: fix incorrect size in pcpu_obj_full_size() maple_tree: reduce stack usage with gcc-9 and earlier mm: page_alloc: call panic() when memoryless node allocation fails mm: multi-gen LRU: avoid futile retries migrate_pages: move THP/hugetlb migration support check to simplify code migrate_pages: batch flushing TLB migrate_pages: share more code between _unmap and _move ...
- Loading branch information
Showing
496 changed files
with
11,496 additions
and
6,870 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -182,3 +182,42 @@ Date: November 2021 | |
Contact: Jarkko Sakkinen <[email protected]> | ||
Description: | ||
The total amount of SGX physical memory in bytes. | ||
|
||
What: /sys/devices/system/node/nodeX/memory_failure/total | ||
Date: January 2023 | ||
Contact: Jiaqi Yan <[email protected]> | ||
Description: | ||
The total number of raw poisoned pages (pages containing | ||
corrupted data due to memory errors) on a NUMA node. | ||
|
||
What: /sys/devices/system/node/nodeX/memory_failure/ignored | ||
Date: January 2023 | ||
Contact: Jiaqi Yan <[email protected]> | ||
Description: | ||
Of the raw poisoned pages on a NUMA node, how many pages are | ||
ignored by memory error recovery attempt, usually because | ||
support for this type of pages is unavailable, and kernel | ||
gives up the recovery. | ||
|
||
What: /sys/devices/system/node/nodeX/memory_failure/failed | ||
Date: January 2023 | ||
Contact: Jiaqi Yan <[email protected]> | ||
Description: | ||
Of the raw poisoned pages on a NUMA node, how many pages are | ||
failed by memory error recovery attempt. This usually means | ||
a key recovery operation failed. | ||
|
||
What: /sys/devices/system/node/nodeX/memory_failure/delayed | ||
Date: January 2023 | ||
Contact: Jiaqi Yan <[email protected]> | ||
Description: | ||
Of the raw poisoned pages on a NUMA node, how many pages are | ||
delayed by memory error recovery attempt. Delayed poisoned | ||
pages usually will be retried by kernel. | ||
|
||
What: /sys/devices/system/node/nodeX/memory_failure/recovered | ||
Date: January 2023 | ||
Contact: Jiaqi Yan <[email protected]> | ||
Description: | ||
Of the raw poisoned pages on a NUMA node, how many pages are | ||
recovered by memory error recovery attempt. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -258,6 +258,35 @@ Contact: SeongJae Park <[email protected]> | |
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>/filters/nr_filters | ||
Date: Dec 2022 | ||
Contact: SeongJae Park <[email protected]> | ||
Description: Writing a number 'N' to this file creates the number of | ||
directories for setting filters of the scheme named '0' to | ||
'N-1' under the filters/ directory. | ||
|
||
What: /sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/filters/<F>/type | ||
Date: Dec 2022 | ||
Contact: SeongJae Park <[email protected]> | ||
Description: Writing to and reading from this file sets and gets the type of | ||
the memory of the interest. 'anon' for anonymous pages, or | ||
'memcg' for specific memory cgroup can be written and read. | ||
|
||
What: /sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/filters/<F>/memcg_path | ||
Date: Dec 2022 | ||
Contact: SeongJae Park <[email protected]> | ||
Description: If 'memcg' is written to the 'type' file, writing to and | ||
reading from this file sets and gets the path to the memory | ||
cgroup of the interest. | ||
|
||
What: /sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/filters/<F>/matching | ||
Date: Dec 2022 | ||
Contact: SeongJae Park <[email protected]> | ||
Description: Writing 'Y' or 'N' to this file sets whether to filter out | ||
pages that do or do not match to the 'type' and 'memcg_path', | ||
respectively. Filter out means the action of the scheme will | ||
not be applied to. | ||
|
||
What: /sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/stats/nr_tried | ||
Date: Mar 2022 | ||
Contact: SeongJae Park <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,10 +25,12 @@ DAMON provides below interfaces for different users. | |
interface provides only simple :ref:`statistics <damos_stats>` for the | ||
monitoring results. For detailed monitoring results, DAMON provides a | ||
:ref:`tracepoint <tracepoint>`. | ||
- *debugfs interface.* | ||
- *debugfs interface. (DEPRECATED!)* | ||
:ref:`This <debugfs_interface>` is almost identical to :ref:`sysfs interface | ||
<sysfs_interface>`. This will be removed after next LTS kernel is released, | ||
so users should move to the :ref:`sysfs interface <sysfs_interface>`. | ||
<sysfs_interface>`. This is deprecated, so users should move to the | ||
:ref:`sysfs interface <sysfs_interface>`. If you depend on this and cannot | ||
move, please report your usecase to [email protected] and | ||
[email protected]. | ||
- *Kernel Space Programming Interface.* | ||
:doc:`This </mm/damon/api>` is for kernel space programmers. Using this, | ||
users can utilize every feature of DAMON most flexibly and efficiently by | ||
|
@@ -87,6 +89,8 @@ comma (","). :: | |
│ │ │ │ │ │ │ quotas/ms,bytes,reset_interval_ms | ||
│ │ │ │ │ │ │ │ weights/sz_permil,nr_accesses_permil,age_permil | ||
│ │ │ │ │ │ │ watermarks/metric,interval_us,high,mid,low | ||
│ │ │ │ │ │ │ filters/nr_filters | ||
│ │ │ │ │ │ │ │ 0/type,matching,memcg_id | ||
│ │ │ │ │ │ │ stats/nr_tried,sz_tried,nr_applied,sz_applied,qt_exceeds | ||
│ │ │ │ │ │ │ tried_regions/ | ||
│ │ │ │ │ │ │ │ 0/start,end,nr_accesses,age | ||
|
@@ -151,6 +155,8 @@ number (``N``) to the file creates the number of child directories named as | |
moment, only one context per kdamond is supported, so only ``0`` or ``1`` can | ||
be written to the file. | ||
|
||
.. _sysfs_contexts: | ||
|
||
contexts/<N>/ | ||
------------- | ||
|
||
|
@@ -268,21 +274,32 @@ schemes/<N>/ | |
------------ | ||
|
||
In each scheme directory, five directories (``access_pattern``, ``quotas``, | ||
``watermarks``, ``stats``, and ``tried_regions``) and one file (``action``) | ||
exist. | ||
``watermarks``, ``filters``, ``stats``, and ``tried_regions``) and one file | ||
(``action``) exist. | ||
|
||
The ``action`` file is for setting and getting what action you want to apply to | ||
memory regions having specific access pattern of the interest. The keywords | ||
that can be written to and read from the file and their meaning are as below. | ||
|
||
- ``willneed``: Call ``madvise()`` for the region with ``MADV_WILLNEED`` | ||
- ``cold``: Call ``madvise()`` for the region with ``MADV_COLD`` | ||
- ``pageout``: Call ``madvise()`` for the region with ``MADV_PAGEOUT`` | ||
- ``hugepage``: Call ``madvise()`` for the region with ``MADV_HUGEPAGE`` | ||
- ``nohugepage``: Call ``madvise()`` for the region with ``MADV_NOHUGEPAGE`` | ||
Note that support of each action depends on the running DAMON operations set | ||
`implementation <sysfs_contexts>`. | ||
|
||
- ``willneed``: Call ``madvise()`` for the region with ``MADV_WILLNEED``. | ||
Supported by ``vaddr`` and ``fvaddr`` operations set. | ||
- ``cold``: Call ``madvise()`` for the region with ``MADV_COLD``. | ||
Supported by ``vaddr`` and ``fvaddr`` operations set. | ||
- ``pageout``: Call ``madvise()`` for the region with ``MADV_PAGEOUT``. | ||
Supported by ``vaddr``, ``fvaddr`` and ``paddr`` operations set. | ||
- ``hugepage``: Call ``madvise()`` for the region with ``MADV_HUGEPAGE``. | ||
Supported by ``vaddr`` and ``fvaddr`` operations set. | ||
- ``nohugepage``: Call ``madvise()`` for the region with ``MADV_NOHUGEPAGE``. | ||
Supported by ``vaddr`` and ``fvaddr`` operations set. | ||
- ``lru_prio``: Prioritize the region on its LRU lists. | ||
Supported by ``paddr`` operations set. | ||
- ``lru_deprio``: Deprioritize the region on its LRU lists. | ||
- ``stat``: Do nothing but count the statistics | ||
Supported by ``paddr`` operations set. | ||
- ``stat``: Do nothing but count the statistics. | ||
Supported by all operations sets. | ||
|
||
schemes/<N>/access_pattern/ | ||
--------------------------- | ||
|
@@ -347,6 +364,46 @@ as below. | |
|
||
The ``interval`` should written in microseconds unit. | ||
|
||
schemes/<N>/filters/ | ||
-------------------- | ||
|
||
Users could know something more than the kernel for specific types of memory. | ||
In the case, users could do their own management for the memory and hence | ||
doesn't want DAMOS bothers that. Users could limit DAMOS by setting the access | ||
pattern of the scheme and/or the monitoring regions for the purpose, but that | ||
can be inefficient in some cases. In such cases, users could set non-access | ||
pattern driven filters using files in this directory. | ||
|
||
In the beginning, this directory has only one file, ``nr_filters``. Writing a | ||
number (``N``) to the file creates the number of child directories named ``0`` | ||
to ``N-1``. Each directory represents each filter. The filters are evaluated | ||
in the numeric order. | ||
|
||
Each filter directory contains three files, namely ``type``, ``matcing``, and | ||
``memcg_path``. You can write one of two special keywords, ``anon`` for | ||
anonymous pages, or ``memcg`` for specific memory cgroup filtering. In case of | ||
the memory cgroup filtering, you can specify the memory cgroup of the interest | ||
by writing the path of the memory cgroup from the cgroups mount point to | ||
``memcg_path`` file. You can write ``Y`` or ``N`` to ``matching`` file to | ||
filter out pages that does or does not match to the type, respectively. Then, | ||
the scheme's action will not be applied to the pages that specified to be | ||
filtered out. | ||
|
||
For example, below restricts a DAMOS action to be applied to only non-anonymous | ||
pages of all memory cgroups except ``/having_care_already``.:: | ||
|
||
# echo 2 > nr_filters | ||
# # filter out anonymous pages | ||
echo anon > 0/type | ||
echo Y > 0/matching | ||
# # further filter out all cgroups except one at '/having_care_already' | ||
echo memcg > 1/type | ||
echo /having_care_already > 1/memcg_path | ||
echo N > 1/matching | ||
|
||
Note that filters are currently supported only when ``paddr`` | ||
`implementation <sysfs_contexts>` is being used. | ||
|
||
.. _sysfs_schemes_stats: | ||
|
||
schemes/<N>/stats/ | ||
|
@@ -432,13 +489,17 @@ the files as above. Above is only for an example. | |
|
||
.. _debugfs_interface: | ||
|
||
debugfs Interface | ||
================= | ||
debugfs Interface (DEPRECATED!) | ||
=============================== | ||
|
||
.. note:: | ||
|
||
DAMON debugfs interface will be removed after next LTS kernel is released, so | ||
users should move to the :ref:`sysfs interface <sysfs_interface>`. | ||
THIS IS DEPRECATED! | ||
|
||
DAMON debugfs interface is deprecated, so users should move to the | ||
:ref:`sysfs interface <sysfs_interface>`. If you depend on this and cannot | ||
move, please report your usecase to [email protected] and | ||
[email protected]. | ||
|
||
DAMON exports eight files, ``attrs``, ``target_ids``, ``init_regions``, | ||
``schemes``, ``monitor_on``, ``kdamond_pid``, ``mk_contexts`` and | ||
|
@@ -574,11 +635,15 @@ The ``<action>`` is a predefined integer for memory management actions, which | |
DAMON will apply to the regions having the target access pattern. The | ||
supported numbers and their meanings are as below. | ||
|
||
- 0: Call ``madvise()`` for the region with ``MADV_WILLNEED`` | ||
- 1: Call ``madvise()`` for the region with ``MADV_COLD`` | ||
- 2: Call ``madvise()`` for the region with ``MADV_PAGEOUT`` | ||
- 3: Call ``madvise()`` for the region with ``MADV_HUGEPAGE`` | ||
- 4: Call ``madvise()`` for the region with ``MADV_NOHUGEPAGE`` | ||
- 0: Call ``madvise()`` for the region with ``MADV_WILLNEED``. Ignored if | ||
``target`` is ``paddr``. | ||
- 1: Call ``madvise()`` for the region with ``MADV_COLD``. Ignored if | ||
``target`` is ``paddr``. | ||
- 2: Call ``madvise()`` for the region with ``MADV_PAGEOUT``. | ||
- 3: Call ``madvise()`` for the region with ``MADV_HUGEPAGE``. Ignored if | ||
``target`` is ``paddr``. | ||
- 4: Call ``madvise()`` for the region with ``MADV_NOHUGEPAGE``. Ignored if | ||
``target`` is ``paddr``. | ||
- 5: Do nothing but count the statistics | ||
|
||
Quota | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.