projects/linux·commit 2d338201

Merge branch 'akpm' (patches from Andrew)

2d338201 · Linus Torvalds <[email protected]> · 2021-09-08 12:55:35 -07:00

Merge more updates from Andrew Morton:
 "147 patches, based on 7d2a07b769330c34b4deabeed939325c77a7ec2f.

  Subsystems affected by this patch series: mm (memory-hotplug, rmap,
  ioremap, highmem, cleanups, secretmem, kfence, damon, and vmscan),
  alpha, percpu, procfs, misc, core-kernel, MAINTAINERS, lib,
  checkpatch, epoll, init, nilfs2, coredump, fork, pids, criu, kconfig,
  selftests, ipc, and scripts"

* emailed patches from Andrew Morton <[email protected]>: (94 commits)
  scripts: check_extable: fix typo in user error message
  mm/workingset: correct kernel-doc notations
  ipc: replace costly bailout check in sysvipc_find_ipc()
  selftests/memfd: remove unused variable
  Kconfig.debug: drop selecting non-existing HARDLOCKUP_DETECTOR_ARCH
  configs: remove the obsolete CONFIG_INPUT_POLLDEV
  prctl: allow to setup brk for et_dyn executables
  pid: cleanup the stale comment mentioning pidmap_init().
  kernel/fork.c: unexport get_{mm,task}_exe_file
  coredump: fix memleak in dump_vma_snapshot()
  fs/coredump.c: log if a core dump is aborted due to changed file permissions
  nilfs2: use refcount_dec_and_lock() to fix potential UAF
  nilfs2: fix memory leak in nilfs_sysfs_delete_snapshot_group
  nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group
  nilfs2: fix memory leak in nilfs_sysfs_delete_##name##_group
  nilfs2: fix memory leak in nilfs_sysfs_create_##name##_group
  nilfs2: fix NULL pointer in nilfs_##name##_attr_release
  nilfs2: fix memory leak in nilfs_sysfs_create_device_group
  trap: cleanup trap_init()
  init: move usermodehelper_enable() to populate_rootfs()
  ...
Commit
2d338201d5311bcd79d42f66df4cecbcbc5f4f2c
Parents
cc09ee80 · b285437d

Merge commit. Changes below are compared with the first parent: cc09ee80.

Changes

149 files changed · +5341 −930

FileStatusAddDelContent
Documentation/admin-guide/mm/damon/index.rstadded+15−0View file
Documentation/admin-guide/mm/damon/start.rstadded+114−0View file
Documentation/admin-guide/mm/damon/usage.rstadded+112−0View file
Documentation/admin-guide/mm/index.rstmodified+1−0View file
Documentation/admin-guide/mm/memory-hotplug.rstmodified+455−345View file
Documentation/dev-tools/kfence.rstmodified+53−45View file
Documentation/kbuild/llvm.rstmodified+3−2View file
Documentation/vm/damon/api.rstadded+20−0View file
Documentation/vm/damon/design.rstadded+166−0View file
Documentation/vm/damon/faq.rstadded+51−0View file
Documentation/vm/damon/index.rstadded+30−0View file
Documentation/vm/index.rstmodified+1−0View file
MAINTAINERSmodified+13−2View file
arch/Kconfigmodified+1−1View file
arch/alpha/include/asm/agp.hmodified+2−2View file
arch/alpha/kernel/pci-sysfs.cmodified+8−4View file
arch/arc/kernel/traps.cmodified+0−5View file
arch/arm/configs/dove_defconfigmodified+0−1View file
arch/arm/configs/pxa_defconfigmodified+0−1View file
arch/arm/kernel/traps.cmodified+0−5View file
arch/arm64/mm/mmu.cmodified+1−2View file
arch/h8300/kernel/traps.cmodified+0−4View file
arch/hexagon/kernel/traps.cmodified+0−4View file
arch/ia64/mm/init.cmodified+1−2View file
arch/mips/configs/lemote2f_defconfigmodified+0−1View file
arch/mips/configs/pic32mzda_defconfigmodified+0−1View file
arch/mips/configs/rt305x_defconfigmodified+0−1View file
arch/mips/configs/xway_defconfigmodified+0−1View file
arch/nds32/kernel/traps.cmodified+0−5View file
arch/nios2/kernel/traps.cmodified+0−5View file
arch/openrisc/kernel/traps.cmodified+0−5View file
arch/parisc/configs/generic-32bit_defconfigmodified+0−1View file
arch/parisc/kernel/traps.cmodified+0−4View file
arch/powerpc/kernel/traps.cmodified+0−5View file
arch/powerpc/mm/mem.cmodified+1−2View file
arch/powerpc/platforms/pseries/hotplug-memory.cmodified+4−5View file
arch/riscv/Kconfigmodified+1−1View file
arch/riscv/kernel/traps.cmodified+0−5View file
arch/s390/mm/init.cmodified+1−2View file
arch/sh/mm/init.cmodified+1−2View file
arch/um/kernel/trap.cmodified+0−4View file
arch/x86/configs/i386_defconfigmodified+0−1View file
arch/x86/configs/x86_64_defconfigmodified+0−1View file
arch/x86/mm/init_32.cmodified+1−2View file
arch/x86/mm/init_64.cmodified+1−2View file
drivers/acpi/acpi_memhotplug.cmodified+31−15View file
drivers/base/memory.cmodified+204−21View file
drivers/base/node.cmodified+0−2View file
drivers/dax/kmem.cmodified+33−10View file
drivers/devfreq/devfreq.cmodified+1−1View file
drivers/hwmon/mr75203.cmodified+1−1View file
drivers/iio/common/hid-sensors/hid-sensor-attributes.cmodified+1−2View file
drivers/iio/light/as73211.cmodified+1−2View file
drivers/media/i2c/ov02a10.cmodified+1−1View file
drivers/mtd/nand/raw/intel-nand-controller.cmodified+1−1View file
drivers/phy/st/phy-stm32-usbphyc.cmodified+1−1View file
drivers/thermal/devfreq_cooling.cmodified+1−1View file
drivers/virtio/virtio_mem.cmodified+21−5View file
fs/coredump.cmodified+12−3View file
fs/eventpoll.cmodified+10−8View file
fs/nilfs2/sysfs.cmodified+11−15View file
fs/nilfs2/the_nilfs.cmodified+4−5View file
fs/proc/array.cmodified+4−14View file
fs/proc/base.cmodified+4−1View file
include/asm-generic/early_ioremap.hmodified+0−6View file
include/linux/damon.hadded+268−0View file
include/linux/highmem-internal.hmodified+22−5View file
include/linux/memory.hmodified+54−1View file
include/linux/memory_hotplug.hmodified+22−12View file
include/linux/mmzone.hmodified+7−12View file
include/linux/once.hmodified+1−1View file
include/linux/page-flags.hmodified+5−3View file
include/linux/page_ext.hmodified+1−1View file
include/linux/page_idle.hmodified+3−3View file
include/linux/pagemap.hmodified+3−4View file
include/linux/sched/user.hmodified+2−1View file
include/linux/threads.hmodified+1−1View file
include/linux/units.hmodified+7−3View file
include/linux/vmalloc.hmodified+0−3View file
include/trace/events/damon.hadded+43−0View file
include/trace/events/mmflags.hmodified+1−1View file
include/trace/events/page_ref.hmodified+2−2View file
init/initramfs.cmodified+2−0View file
init/main.cmodified+2−1View file
init/noinitramfs.cmodified+2−0View file
ipc/util.cmodified+4−12View file
kernel/acct.cmodified+1−1View file
kernel/fork.cmodified+0−2View file
kernel/profile.cmodified+11−10View file
kernel/sys.cmodified+0−7View file
kernel/user.cmodified+25−0View file
lib/Kconfig.debugmodified+4−5View file
lib/dump_stack.cmodified+2−1View file
lib/iov_iter.cmodified+6−2View file
lib/math/Kconfigmodified+1−1View file
lib/math/rational.cmodified+3−0View file
lib/test_printf.cmodified+1−1View file
lib/test_sort.cmodified+19−21View file
lib/vsprintf.cmodified+1−1View file
mm/Kconfigmodified+11−4View file
mm/Makefilemodified+3−1View file
mm/compaction.cmodified+7−13View file
mm/damon/Kconfigadded+68−0View file
mm/damon/Makefileadded+5−0View file
mm/damon/core-test.hadded+253−0View file
mm/damon/core.cadded+720−0View file
mm/damon/dbgfs-test.hadded+126−0View file
mm/damon/dbgfs.cadded+623−0View file
mm/damon/vaddr-test.hadded+329−0View file
mm/damon/vaddr.cadded+672−0View file
mm/early_ioremap.cmodified+0−5View file
mm/highmem.cmodified+1−1View file
mm/ioremap.cmodified+0−25View file
mm/kfence/core.cmodified+3−0View file
mm/kfence/kfence.hmodified+2−0View file
mm/kfence/kfence_test.cmodified+3−0View file
mm/kfence/report.cmodified+13−6View file
mm/kmemleak.cmodified+1−1View file
mm/memory_hotplug.cmodified+341−33View file
mm/memremap.cmodified+1−4View file
mm/page_alloc.cmodified+5−22View file
mm/page_ext.cmodified+11−1View file
mm/page_idle.cmodified+0−10View file
mm/page_isolation.cmodified+1−6View file
mm/page_owner.cmodified+1−13View file
mm/percpu.cmodified+0−1View file
mm/rmap.cmodified+4−2View file
mm/secretmem.cmodified+5−4View file
mm/vmalloc.cmodified+17−5View file
mm/workingset.cmodified+1−1View file
scripts/check_extable.shmodified+1−1View file
scripts/checkpatch.plmodified+57−36View file
tools/include/linux/bitmap.hmodified+2−2View file
tools/perf/bench/find-bit-bench.cmodified+1−1View file
tools/perf/builtin-c2c.cmodified+3−3View file
tools/perf/builtin-record.cmodified+1−1View file
tools/perf/tests/bitmap.cmodified+1−1View file
tools/perf/tests/mem2node.cmodified+1−1View file
tools/perf/util/affinity.cmodified+2−2View file
tools/perf/util/header.cmodified+2−2View file
tools/perf/util/metricgroup.cmodified+1−1View file
tools/perf/util/mmap.cmodified+2−2View file
tools/testing/selftests/damon/Makefileadded+7−0View file
tools/testing/selftests/damon/_chk_dependency.shadded+28−0View file
tools/testing/selftests/damon/debugfs_attrs.shadded+75−0View file
tools/testing/selftests/kvm/dirty_log_perf_test.cmodified+1−1View file
tools/testing/selftests/kvm/dirty_log_test.cmodified+2−2View file
tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.cmodified+1−1View file
tools/testing/selftests/memfd/memfd_test.cmodified+1−1View file

Only the first 600 diff lines are shown. Download the complete patch.

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

View file
diff --git a/Documentation/admin-guide/mm/damon/index.rst b/Documentation/admin-guide/mm/damon/index.rst
new file mode 100644
index 0000000..8c5dde3
--- /dev/null
+++ b/Documentation/admin-guide/mm/damon/index.rst
@@ -0,0 +1,15 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+========================
+Monitoring Data Accesses
+========================
+
+:doc:`DAMON </vm/damon/index>` allows light-weight data access monitoring.
+Using DAMON, users can analyze the memory access patterns of their systems and
+optimize those.
+
+.. toctree::
+ :maxdepth: 2
+
+ start
+ usage

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

View file
diff --git a/Documentation/admin-guide/mm/damon/start.rst b/Documentation/admin-guide/mm/damon/start.rst
new file mode 100644
index 0000000..d5eb89a
--- /dev/null
+++ b/Documentation/admin-guide/mm/damon/start.rst
@@ -0,0 +1,114 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+===============
+Getting Started
+===============
+
+This document briefly describes how you can use DAMON by demonstrating its
+default user space tool. Please note that this document describes only a part
+of its features for brevity. Please refer to :doc:`usage` for more details.
+
+
+TL; DR
+======
+
+Follow the commands below to monitor and visualize the memory access pattern of
+your workload. ::
+
+ # # build the kernel with CONFIG_DAMON_*=y, install it, and reboot
+ # mount -t debugfs none /sys/kernel/debug/
+ # git clone https://github.com/awslabs/damo
+ # ./damo/damo record $(pidof <your workload>)
+ # ./damo/damo report heat --plot_ascii
+
+The final command draws the access heatmap of ``<your workload>``. The heatmap
+shows which memory region (x-axis) is accessed when (y-axis) and how frequently
+(number; the higher the more accesses have been observed). ::
+
+ 111111111111111111111111111111111111111111111111111111110000
+ 111121111111111111111111111111211111111111111111111111110000
+ 000000000000000000000000000000000000000000000000001555552000
+ 000000000000000000000000000000000000000000000222223555552000
+ 000000000000000000000000000000000000000011111677775000000000
+ 000000000000000000000000000000000000000488888000000000000000
+ 000000000000000000000000000000000177888400000000000000000000
+ 000000000000000000000000000046666522222100000000000000000000
+ 000000000000000000000014444344444300000000000000000000000000
+ 000000000000000002222245555510000000000000000000000000000000
+ # access_frequency: 0 1 2 3 4 5 6 7 8 9
+ # x-axis: space (140286319947776-140286426374096: 101.496 MiB)
+ # y-axis: time (605442256436361-605479951866441: 37.695430s)
+ # resolution: 60x10 (1.692 MiB and 3.770s for each character)
+
+
+Prerequisites
+=============
+
+Kernel
+------
+
+You should first ensure your system is running on a kernel built with
+``CONFIG_DAMON_*=y``.
+
+
+User Space Tool
+---------------
+
+For the demonstration, we will use the default user space tool for DAMON,
+called DAMON Operator (DAMO). It is available at
+https://github.com/awslabs/damo. The examples below assume that ``damo`` is on
+your ``$PATH``. It's not mandatory, though.
+
+Because DAMO is using the debugfs interface (refer to :doc:`usage` for the
+detail) of DAMON, you should ensure debugfs is mounted. Mount it manually as
+below::
+
+ # mount -t debugfs none /sys/kernel/debug/
+
+or append the following line to your ``/etc/fstab`` file so that your system
+can automatically mount debugfs upon booting::
+
+ debugfs /sys/kernel/debug debugfs defaults 0 0
+
+
+Recording Data Access Patterns
+==============================
+
+The commands below record the memory access patterns of a program and save the
+monitoring results to a file. ::
+
+ $ git clone https://github.com/sjp38/masim
+ $ cd masim; make; ./masim ./configs/zigzag.cfg &
+ $ sudo damo record -o damon.data $(pidof masim)
+
+The first two lines of the commands download an artificial memory access
+generator program and run it in the background. The generator will repeatedly
+access two 100 MiB sized memory regions one by one. You can substitute this
+with your real workload. The last line asks ``damo`` to record the access
+pattern in the ``damon.data`` file.
+
+
+Visualizing Recorded Patterns
+=============================
+
+The following three commands visualize the recorded access patterns and save
+the results as separate image files. ::
+
+ $ damo report heats --heatmap access_pattern_heatmap.png
+ $ damo report wss --range 0 101 1 --plot wss_dist.png
+ $ damo report wss --range 0 101 1 --sortby time --plot wss_chron_change.png
+
+- ``access_pattern_heatmap.png`` will visualize the data access pattern in a
+ heatmap, showing which memory region (y-axis) got accessed when (x-axis)
+ and how frequently (color).
+- ``wss_dist.png`` will show the distribution of the working set size.
+- ``wss_chron_change.png`` will show how the working set size has
+ chronologically changed.
+
+You can view the visualizations of this example workload at [1]_.
+Visualizations of other realistic workloads are available at [2]_ [3]_ [4]_.
+
+.. [1] https://damonitor.github.io/doc/html/v17/admin-guide/mm/damon/start.html#visualizing-recorded-patterns
+.. [2] https://damonitor.github.io/test/result/visual/latest/rec.heatmap.1.png.html
+.. [3] https://damonitor.github.io/test/result/visual/latest/rec.wss_sz.png.html
+.. [4] https://damonitor.github.io/test/result/visual/latest/rec.wss_time.png.html

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

View file
diff --git a/Documentation/admin-guide/mm/damon/usage.rst b/Documentation/admin-guide/mm/damon/usage.rst
new file mode 100644
index 0000000..a72cda3
--- /dev/null
+++ b/Documentation/admin-guide/mm/damon/usage.rst
@@ -0,0 +1,112 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+===============
+Detailed Usages
+===============
+
+DAMON provides below three interfaces for different users.
+
+- *DAMON user space tool.*
+ This is for privileged people such as system administrators who want a
+ just-working human-friendly interface. Using this, users can use the DAMON’s
+ major features in a human-friendly way. It may not be highly tuned for
+ special cases, though. It supports only virtual address spaces monitoring.
+- *debugfs interface.*
+ This is for privileged user space programmers who want more optimized use of
+ DAMON. Using this, users can use DAMON’s major features by reading
+ from and writing to special debugfs files. Therefore, you can write and use
+ your personalized DAMON debugfs wrapper programs that reads/writes the
+ debugfs files instead of you. The DAMON user space tool is also a reference
+ implementation of such programs. It supports only virtual address spaces
+ monitoring.
+- *Kernel Space Programming Interface.*
+ This is for kernel space programmers. Using this, users can utilize every
+ feature of DAMON most flexibly and efficiently by writing kernel space
+ DAMON application programs for you. You can even extend DAMON for various
+ address spaces.
+
+Nevertheless, you could write your own user space tool using the debugfs
+interface. A reference implementation is available at
+https://github.com/awslabs/damo. If you are a kernel programmer, you could
+refer to :doc:`/vm/damon/api` for the kernel space programming interface. For
+the reason, this document describes only the debugfs interface
+
+debugfs Interface
+=================
+
+DAMON exports three files, ``attrs``, ``target_ids``, and ``monitor_on`` under
+its debugfs directory, ``<debugfs>/damon/``.
+
+
+Attributes
+----------
+
+Users can get and set the ``sampling interval``, ``aggregation interval``,
+``regions update interval``, and min/max number of monitoring target regions by
+reading from and writing to the ``attrs`` file. To know about the monitoring
+attributes in detail, please refer to the :doc:`/vm/damon/design`. For
+example, below commands set those values to 5 ms, 100 ms, 1,000 ms, 10 and
+1000, and then check it again::
+
+ # cd <debugfs>/damon
+ # echo 5000 100000 1000000 10 1000 > attrs
+ # cat attrs
+ 5000 100000 1000000 10 1000
+
+
+Target IDs
+----------
+
+Some types of address spaces supports multiple monitoring target. For example,
+the virtual memory address spaces monitoring can have multiple processes as the
+monitoring targets. Users can set the targets by writing relevant id values of
+the targets to, and get the ids of the current targets by reading from the
+``target_ids`` file. In case of the virtual address spaces monitoring, the
+values should be pids of the monitoring target processes. For example, below
+commands set processes having pids 42 and 4242 as the monitoring targets and
+check it again::
+
+ # cd <debugfs>/damon
+ # echo 42 4242 > target_ids
+ # cat target_ids
+ 42 4242
+
+Note that setting the target ids doesn't start the monitoring.
+
+
+Turning On/Off
+--------------
+
+Setting the files as described above doesn't incur effect unless you explicitly
+start the monitoring. You can start, stop, and check the current status of the
+monitoring by writing to and reading from the ``monitor_on`` file. Writing
+``on`` to the file starts the monitoring of the targets with the attributes.
+Writing ``off`` to the file stops those. DAMON also stops if every target
+process is terminated. Below example commands turn on, off, and check the
+status of DAMON::
+
+ # cd <debugfs>/damon
+ # echo on > monitor_on
+ # echo off > monitor_on
+ # cat monitor_on
+ off
+
+Please note that you cannot write to the above-mentioned debugfs files while
+the monitoring is turned on. If you write to the files while DAMON is running,
+an error code such as ``-EBUSY`` will be returned.
+
+
+Tracepoint for Monitoring Results
+=================================
+
+DAMON provides the monitoring results via a tracepoint,
+``damon:damon_aggregated``. While the monitoring is turned on, you could
+record the tracepoint events and show results using tracepoint supporting tools
+like ``perf``. For example::
+
+ # echo on > monitor_on
+ # perf record -e damon:damon_aggregated &
+ # sleep 5
+ # kill 9 $(pidof perf)
+ # echo off > monitor_on
+ # perf script

Documentation/admin-guide/mm/index.rst

View file
diff --git a/Documentation/admin-guide/mm/index.rst b/Documentation/admin-guide/mm/index.rst
index 4b14d8b..cbd19d5 100644
--- a/Documentation/admin-guide/mm/index.rst
+++ b/Documentation/admin-guide/mm/index.rst
@@ -27,6 +27,7 @@ the Linux memory management.
concepts
cma_debugfs
+ damon/index
hugetlbpage
idle_page_tracking
ksm

Documentation/admin-guide/mm/memory-hotplug.rst

View file
diff --git a/Documentation/admin-guide/mm/memory-hotplug.rst b/Documentation/admin-guide/mm/memory-hotplug.rst
index c6bae2d..03dfbc9 100644
--- a/Documentation/admin-guide/mm/memory-hotplug.rst
+++ b/Documentation/admin-guide/mm/memory-hotplug.rst
@@ -1,466 +1,576 @@
.. _admin_guide_memory_hotplug:
-==============
-Memory Hotplug
-==============
+==================
+Memory Hot(Un)Plug
+==================
-:Created: Jul 28 2007
-:Updated: Add some details about locking internals: Aug 20 2018
-
-This document is about memory hotplug including how-to-use and current status.
-Because Memory Hotplug is still under development, contents of this text will
-be changed often.
+This document describes generic Linux support for memory hot(un)plug with
+a focus on System RAM, including ZONE_MOVABLE support.
.. contents:: :local:
-.. note::
+Introduction
+============
- (1) x86_64's has special implementation for memory hotplug.
- This text does not describe it.
- (2) This text assumes that sysfs is mounted at ``/sys``.
+Memory hot(un)plug allows for increasing and decreasing the size of physical
+memory available to a machine at runtime. In the simplest case, it consists of
+physically plugging or unplugging a DIMM at runtime, coordinated with the
+operating system.
+Memory hot(un)plug is used for various purposes:
-Introduction
-============
+- The physical memory available to a machine can be adjusted at runtime, up- or
+ downgrading the memory capacity. This dynamic memory resizing, sometimes
+ referred to as "capacity on demand", is frequently used with virtual machines
+ and logical partitions.
+
+- Replacing hardware, such as DIMMs or whole NUMA nodes, without downtime. One
+ example is replacing failing memory modules.
-Purpose of memory hotplug
--------------------------
+- Reducing energy consumption either by physically unplugging memory modules or
+ by logically unplugging (parts of) memory modules from Linux.
-Memory Hotplug allows users to increase/decrease the amount of memory.
-Generally, there are two purposes.
+Further, the basic memory hot(un)plug infrastructure in Linux is nowadays also
+used to expose persistent memory, other performance-differentiated memory and
+reserved memory regions as ordinary system RAM to Linux.
-(A) For changing the amount of memory.
- This is to allow a feature like capacity on demand.
-(B) For installing/removing DIMMs or NUMA-nodes physically.
- This is to exchange DIMMs/NUMA-nodes, reduce power consumption, etc.
+Linux only supports memory hot(un)plug on selected 64 bit architectures, such as
+x86_64, arm64, ppc64, s390x and ia64.
-(A) is required by highly virtualized environments and (B) is required by
-hardware which supports memory power management.
+Memory Hot(Un)Plug Granularity
+------------------------------
-Linux memory hotplug is designed for both purpose.
+Memory hot(un)plug in Linux uses the SPARSEMEM memory model, which divides the
+physical memory address space into chunks of the same size: memory sections. The
+size of a memory section is architecture dependent. For example, x86_64 uses
+128 MiB and ppc64 uses 16 MiB.
-Phases of memory hotplug
+Memory sections are combined into chunks referred to as "memory blocks". The
+size of a memory block is architecture dependent and corresponds to the smallest
+granularity that can be hot(un)plugged. The default size of a memory block is
+the same as memory section size, unless an architecture specifies otherwise.
+
+All memory blocks have the same size.
+
+Phases of Memory Hotplug
------------------------
-There are 2 phases in Memory Hotplug:
+Memory hotplug consists of two phases:
- 1) Physical Memory Hotplug phase
- 2) Logical Memory Hotplug phase.
+(1) Adding the memory to Linux
+(2) Onlining memory blocks
-The First phase is to communicate hardware/firmware and make/erase
-environment for hotplugged memory. Basically, this phase is necessary
-for the purpose (B), but this is good phase for communication between
-highly virtualized environments too.
+In the first phase, metadata, such as the memory map ("memmap") and page tables
+for the direct mapping, is allocated and initialized, and memory blocks are
+created; the latter also creates sysfs files for managing newly created memory
+blocks.
-When memory is hotplugged, the kernel recognizes new memory, makes new memory
-management tables, and makes sysfs files for new memory's operation.
+In the second phase, added memory is exposed to the page allocator. After this
+phase, the memory is visible in memory statistics, such as free and total
+memory, of the system.
-If firmware supports notification of connection of new memory to OS,
-this phase is triggered automatically. ACPI can notify this event. If not,
-"probe" operation by system administration is used instead.
-(see :ref:`memory_hotplug_physical_mem`).
+Phases of Memory Hotunplug
+--------------------------
-Logical Memory Hotplug phase is to change memory state into
-available/unavailable for users. Amount of memory from user's view is
-changed by this phase. The kernel makes all memory in it as free pages
-when a memory range is available.
+Memory hotunplug consists of two phases:
-In this document, this phase is described as online/offline.
+(1) Offlining memory blocks
+(2) Removing the memory from Linux
-Logical Memory Hotplug phase is triggered by write of sysfs file by system
-administrator. For the hot-add case, it must be executed after Physical Hotplug
-phase by hand.
-(However, if you writes udev's hotplug scripts for memory hotplug, these
-phases can be execute in seamless way.)
+In the fist phase, memory is "hidden" from the page allocator again, for
+example, by migrating busy memory to other memory locations and removing all
+relevant free pages from the page allocator After this phase, the memory is no
+longer visible in memory statistics of the system.
-Unit of Memory online/offline operation
----------------------------------------
+In the second phase, the memory blocks are removed and metadata is freed.
-Memory hotplug uses SPARSEMEM memory model which allows memory to be divided
-into chunks of the same size. These chunks are called "sections". The size of
-a memory section is architecture dependent. For example, power uses 16MiB, ia64
-uses 1GiB.
+Memory Hotplug Notifications
+============================
-Memory sections are combined into chunks referred to as "memory blocks". The
-size of a memory block is architecture dependent and represents the logical
-unit upon which memory online/offline operations are to be performed. The
-default size of a memory block is the same as memory section size unless an
-architecture specifies otherwise. (see :ref:`memory_hotplug_sysfs_files`.)
+There are various ways how Linux is notified about memory hotplug events such
+that it can start adding hotplugged memory. This description is limited to
+systems that support ACPI; mechanisms specific to other firmware interfaces or
+virtual machines are not described.
-To determine the size (in bytes) of a memory block please read this file::
+ACPI Notifications
+------------------
- /sys/devices/system/memory/block_size_bytes
+Platforms that support ACPI, such as x86_64, can support memory hotplug
+notifications via ACPI.
-Kernel Configuration
-====================
+In general, a firmware supporting memory hotplug defines a memory class object
+HID "PNP0C80". When notified about hotplug of a new memory device, the ACPI
+driver will hotplug the memory to Linux.
-To use memory hotplug feature, kernel must be compiled with following
-config options.
+If the firmware supports hotplug of NUMA nodes, it defines an object _HID
+"ACPI0004", "PNP0A05", or "PNP0A06". When notified about an hotplug event, all
+assigned memory devices are added to Linux by the ACPI driver.
-- For all memory hotplug:
- - Memory model -> Sparse Memory (``CONFIG_SPARSEMEM``)
- - Allow for memory hot-add (``CONFIG_MEMORY_HOTPLUG``)
+Similarly, Linux can be notified about requests to hotunplug a memory device or
+a NUMA node via ACPI. The ACPI driver will try offlining all relevant memory
+blocks, and, if successful, hotunplug the memory from Linux.
-- To enable memory removal, the following are also necessary:
- - Allow for memory hot remove (``CONFIG_MEMORY_HOTREMOVE``)
- - Page Migration (``CONFIG_MIGRATION``)
+Manual Probing
+--------------
-- For ACPI memory hotplug, the following are also necessary:
- - Memory hotplug (under ACPI Support menu) (``CONFIG_ACPI_HOTPLUG_MEMORY``)
- - This option can be kernel module.
+On some architectures, the firmware may not be able to notify the operating
+system about a memory hotplug event. Instead, the memory has to be manually
+probed from user space.
-- As a related configuration, if your box has a feature of NUMA-node hotplug
- via ACPI, then this option is necessary too.
+The probe interface is located at::
- - ACPI0004,PNP0A05 and PNP0A06 Container Driver (under ACPI Support menu)
- (``CONFIG_ACPI_CONTAINER``).
+ /sys/devices/system/memory/probe
- This option can be kernel module too.
+Only complete memory blocks can be probed. Individual memory blocks are probed
+by providing the physical start address of the memory block::
+ % echo addr > /sys/devices/system/memory/probe
-.. _memory_hotplug_sysfs_files:
+Which results in a memory block for the range [addr, addr + memory_block_size)
+being created.
-sysfs files for memory hotplug
-==============================
+.. note::
-All memory blocks have their device information in sysfs. Each memory block
-is described under ``/sys/devices/system/memory`` as::
+ Using the probe interface is discouraged as it is easy to crash the kernel,
+ because Linux cannot validate user input; this interface might be removed in
+ the future.
- /sys/devices/system/memory/memoryXXX
+Onlining and Offlining Memory Blocks
+====================================
-where XXX is the memory block id.
+After a memory block has been created, Linux has to be instructed to actually
+make use of that memory: the memory block has to be "online".
-For the memory block covered by the sysfs directory. It is expected that all
-memory sections in this range are present and no memory holes exist in the
-range. Currently there is no way to determine if there is a memory hole, but
-the existence of one should not affect the hotplug capabilities of the memory
-block.
+Before a memory block can be removed, Linux has to stop using any memory part of
+the memory block: the memory block has to be "offlined".
-For example, assume 1GiB memory block size. A device for a memory starting at
-0x100000000 is ``/sys/device/system/memory/memory4``::
+The Linux kernel can be configured to automatically online added memory blocks
+and drivers automatically trigger offlining of memory blocks when trying
+hotunplug of memory. Memory blocks can only be removed once offlining succeeded
+and drivers may trigger offlining of memory blocks when attempting hotunplug of
+memory.
- (0x100000000 / 1Gib = 4)
+Onlining Memory Blocks Manually
+-------------------------------
-This device covers address range [0x100000000 ... 0x140000000)
+If auto-onlining of memory blocks isn't enabled, user-space has to manually
+trigger onlining of memory blocks. Often, udev rules are used to automate this
+task in user space.
-Under each memory block, you can see 5 files:
+Onlining of a memory block can be triggered via::
-- ``/sys/devices/system/memory/memoryXXX/phys_index``
-- ``/sys/devices/system/memory/memoryXXX/phys_device``
-- ``/sys/devices/system/memory/memoryXXX/state``
-- ``/sys/devices/system/memory/memoryXXX/removable``
-- ``/sys/devices/system/memory/memoryXXX/valid_zones``
+ % echo online > /sys/devices/system/memory/memoryXXX/state
-=================== ============================================================
-``phys_index`` read-only and contains memory block id, same as XXX.
-``state`` read-write
+Or alternatively::
- - at read: contains online/offline state of memory.
- - at write: user can specify "online_kernel",
+ % echo 1 > /sys/devices/system/memory/memoryXXX/online
- "online_movable", "online", "offline" command
- which will be performed on all sections in the block.
-``phys_device`` read-only: legacy interface only ever used on s390x to
- expose the covered storage increment.
-``removable`` read-only: legacy interface that indicated whether a memory
- block was likely to be offlineable or not. Newer kernel
- versions return "1" if and only if the kernel supports
- memory offlining.
-``valid_zones`` read-only: designed to show by which zone memory provided by
- a memory block is managed, and to show by which zone memory
- provided by an offline memory block could be managed when
- onlining.
-
- The first column shows it`s default zone.
-
- "memory6/valid_zones: Normal Movable" shows this memoryblock
- can be onlined to ZONE_NORMAL by default and to ZONE_MOVABLE
- by online_movable.
-
- "memory7/valid_zones: Movable Normal" shows this memoryblock
- can be onlined to ZONE_MOVABLE by default and to ZONE_NORMAL
- by online_kernel.
-=================== ============================================================
+The kernel will select the target zone automatically, usually defaulting to
+``ZONE_NORMAL`` unless ``movablecore=1`` has been specified on the kernel
+command line or if the memory block would intersect the ZONE_MOVABLE already.
-.. note::
+One can explicitly request to associate an offline memory block with
+ZONE_MOVABLE by::
- These directories/files appear after physical memory hotplug phase.
+ % echo online_movable > /sys/devices/system/memory/memoryXXX/state
-If CONFIG_NUMA is enabled the memoryXXX/ directories can also be accessed
-via symbolic links located in the ``/sys/devices/system/node/node*`` directories.
+Or one can explicitly request a kernel zone (usually ZONE_NORMAL) by::
-For example::
+ % echo online_kernel > /sys/devices/system/memory/memoryXXX/state
- /sys/devices/system/node/node0/memory9 -> ../../memory/memory9
+In any case, if onlining succeeds, the state of the memory block is changed to
+be "online". If it fails, the state of the memory block will remain unchanged
+and the above commands will fail.
-A backlink will also be created::
+Onlining Memory Blocks Automatically
+------------------------------------

This diff is incomplete. Download the complete patch.

Documentation/dev-tools/kfence.rst

View file

This diff is incomplete. Download the complete patch.

Documentation/kbuild/llvm.rst

View file

This diff is incomplete. Download the complete patch.

Documentation/vm/damon/api.rst

View file

This diff is incomplete. Download the complete patch.

Documentation/vm/damon/design.rst

View file

This diff is incomplete. Download the complete patch.

Documentation/vm/damon/faq.rst

View file

This diff is incomplete. Download the complete patch.

Documentation/vm/damon/index.rst

View file

This diff is incomplete. Download the complete patch.

Documentation/vm/index.rst

View file

This diff is incomplete. Download the complete patch.

MAINTAINERS

View file

This diff is incomplete. Download the complete patch.

arch/Kconfig

View file

This diff is incomplete. Download the complete patch.

arch/alpha/include/asm/agp.h

View file

This diff is incomplete. Download the complete patch.

arch/alpha/kernel/pci-sysfs.c

View file

This diff is incomplete. Download the complete patch.

arch/arc/kernel/traps.c

View file

This diff is incomplete. Download the complete patch.

arch/arm/configs/dove_defconfig

View file

This diff is incomplete. Download the complete patch.

arch/arm/configs/pxa_defconfig

View file

This diff is incomplete. Download the complete patch.

arch/arm/kernel/traps.c

View file

This diff is incomplete. Download the complete patch.

arch/arm64/mm/mmu.c

View file

This diff is incomplete. Download the complete patch.

arch/h8300/kernel/traps.c

View file

This diff is incomplete. Download the complete patch.

arch/hexagon/kernel/traps.c

View file

This diff is incomplete. Download the complete patch.

arch/ia64/mm/init.c

View file

This diff is incomplete. Download the complete patch.

arch/mips/configs/lemote2f_defconfig

View file

This diff is incomplete. Download the complete patch.

arch/mips/configs/pic32mzda_defconfig

View file

This diff is incomplete. Download the complete patch.

arch/mips/configs/rt305x_defconfig

View file

This diff is incomplete. Download the complete patch.

arch/mips/configs/xway_defconfig

View file

This diff is incomplete. Download the complete patch.

arch/nds32/kernel/traps.c

View file

This diff is incomplete. Download the complete patch.

arch/nios2/kernel/traps.c

View file

This diff is incomplete. Download the complete patch.

arch/openrisc/kernel/traps.c

View file

This diff is incomplete. Download the complete patch.

arch/parisc/configs/generic-32bit_defconfig

View file

This diff is incomplete. Download the complete patch.

arch/parisc/kernel/traps.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/traps.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/mm/mem.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/pseries/hotplug-memory.c

View file

This diff is incomplete. Download the complete patch.

arch/riscv/Kconfig

View file

This diff is incomplete. Download the complete patch.

arch/riscv/kernel/traps.c

View file

This diff is incomplete. Download the complete patch.

arch/s390/mm/init.c

View file

This diff is incomplete. Download the complete patch.

arch/sh/mm/init.c

View file

This diff is incomplete. Download the complete patch.

arch/um/kernel/trap.c

View file

This diff is incomplete. Download the complete patch.

arch/x86/configs/i386_defconfig

View file

This diff is incomplete. Download the complete patch.

arch/x86/configs/x86_64_defconfig

View file

This diff is incomplete. Download the complete patch.

arch/x86/mm/init_32.c

View file

This diff is incomplete. Download the complete patch.

arch/x86/mm/init_64.c

View file

This diff is incomplete. Download the complete patch.

drivers/acpi/acpi_memhotplug.c

View file

This diff is incomplete. Download the complete patch.

drivers/base/memory.c

View file

This diff is incomplete. Download the complete patch.

drivers/base/node.c

View file

This diff is incomplete. Download the complete patch.

drivers/dax/kmem.c

View file

This diff is incomplete. Download the complete patch.

drivers/devfreq/devfreq.c

View file

This diff is incomplete. Download the complete patch.

drivers/hwmon/mr75203.c

View file

This diff is incomplete. Download the complete patch.

drivers/iio/common/hid-sensors/hid-sensor-attributes.c

View file

This diff is incomplete. Download the complete patch.

drivers/iio/light/as73211.c

View file

This diff is incomplete. Download the complete patch.

drivers/media/i2c/ov02a10.c

View file

This diff is incomplete. Download the complete patch.

drivers/mtd/nand/raw/intel-nand-controller.c

View file

This diff is incomplete. Download the complete patch.

drivers/phy/st/phy-stm32-usbphyc.c

View file

This diff is incomplete. Download the complete patch.

drivers/thermal/devfreq_cooling.c

View file

This diff is incomplete. Download the complete patch.

drivers/virtio/virtio_mem.c

View file

This diff is incomplete. Download the complete patch.

fs/coredump.c

View file

This diff is incomplete. Download the complete patch.

fs/eventpoll.c

View file

This diff is incomplete. Download the complete patch.

fs/nilfs2/sysfs.c

View file

This diff is incomplete. Download the complete patch.

fs/nilfs2/the_nilfs.c

View file

This diff is incomplete. Download the complete patch.

fs/proc/array.c

View file

This diff is incomplete. Download the complete patch.

fs/proc/base.c

View file

This diff is incomplete. Download the complete patch.

include/asm-generic/early_ioremap.h

View file

This diff is incomplete. Download the complete patch.

include/linux/damon.h

View file

This diff is incomplete. Download the complete patch.

include/linux/highmem-internal.h

View file

This diff is incomplete. Download the complete patch.

include/linux/memory.h

View file

This diff is incomplete. Download the complete patch.

include/linux/memory_hotplug.h

View file

This diff is incomplete. Download the complete patch.

include/linux/mmzone.h

View file

This diff is incomplete. Download the complete patch.

include/linux/once.h

View file

This diff is incomplete. Download the complete patch.

include/linux/page-flags.h

View file

This diff is incomplete. Download the complete patch.

include/linux/page_ext.h

View file

This diff is incomplete. Download the complete patch.

include/linux/page_idle.h

View file

This diff is incomplete. Download the complete patch.

include/linux/pagemap.h

View file

This diff is incomplete. Download the complete patch.

include/linux/sched/user.h

View file

This diff is incomplete. Download the complete patch.

include/linux/threads.h

View file

This diff is incomplete. Download the complete patch.

include/linux/units.h

View file

This diff is incomplete. Download the complete patch.

include/linux/vmalloc.h

View file

This diff is incomplete. Download the complete patch.

include/trace/events/damon.h

View file

This diff is incomplete. Download the complete patch.

include/trace/events/mmflags.h

View file

This diff is incomplete. Download the complete patch.

include/trace/events/page_ref.h

View file

This diff is incomplete. Download the complete patch.

init/initramfs.c

View file

This diff is incomplete. Download the complete patch.

init/main.c

View file

This diff is incomplete. Download the complete patch.

init/noinitramfs.c

View file

This diff is incomplete. Download the complete patch.

ipc/util.c

View file

This diff is incomplete. Download the complete patch.

kernel/acct.c

View file

This diff is incomplete. Download the complete patch.

kernel/fork.c

View file

This diff is incomplete. Download the complete patch.

kernel/profile.c

View file

This diff is incomplete. Download the complete patch.

kernel/sys.c

View file

This diff is incomplete. Download the complete patch.

kernel/user.c

View file

This diff is incomplete. Download the complete patch.

lib/Kconfig.debug

View file

This diff is incomplete. Download the complete patch.

lib/dump_stack.c

View file

This diff is incomplete. Download the complete patch.

lib/iov_iter.c

View file

This diff is incomplete. Download the complete patch.

lib/math/Kconfig

View file

This diff is incomplete. Download the complete patch.

lib/math/rational.c

View file

This diff is incomplete. Download the complete patch.

lib/test_printf.c

View file

This diff is incomplete. Download the complete patch.

lib/test_sort.c

View file

This diff is incomplete. Download the complete patch.

lib/vsprintf.c

View file

This diff is incomplete. Download the complete patch.

mm/Kconfig

View file

This diff is incomplete. Download the complete patch.

mm/Makefile

View file

This diff is incomplete. Download the complete patch.

mm/compaction.c

View file

This diff is incomplete. Download the complete patch.

mm/damon/Kconfig

View file

This diff is incomplete. Download the complete patch.

mm/damon/Makefile

View file

This diff is incomplete. Download the complete patch.

mm/damon/core-test.h

View file

This diff is incomplete. Download the complete patch.

mm/damon/core.c

View file

This diff is incomplete. Download the complete patch.

mm/damon/dbgfs-test.h

View file

This diff is incomplete. Download the complete patch.

mm/damon/dbgfs.c

View file

This diff is incomplete. Download the complete patch.

mm/damon/vaddr-test.h

View file

This diff is incomplete. Download the complete patch.

mm/damon/vaddr.c

View file

This diff is incomplete. Download the complete patch.

mm/early_ioremap.c

View file

This diff is incomplete. Download the complete patch.

mm/highmem.c

View file

This diff is incomplete. Download the complete patch.

mm/ioremap.c

View file

This diff is incomplete. Download the complete patch.

mm/kfence/core.c

View file

This diff is incomplete. Download the complete patch.

mm/kfence/kfence.h

View file

This diff is incomplete. Download the complete patch.

mm/kfence/kfence_test.c

View file

This diff is incomplete. Download the complete patch.

mm/kfence/report.c

View file

This diff is incomplete. Download the complete patch.

mm/kmemleak.c

View file

This diff is incomplete. Download the complete patch.

mm/memory_hotplug.c

View file

This diff is incomplete. Download the complete patch.

mm/memremap.c

View file

This diff is incomplete. Download the complete patch.

mm/page_alloc.c

View file

This diff is incomplete. Download the complete patch.

mm/page_ext.c

View file

This diff is incomplete. Download the complete patch.

mm/page_idle.c

View file

This diff is incomplete. Download the complete patch.

mm/page_isolation.c

View file

This diff is incomplete. Download the complete patch.

mm/page_owner.c

View file

This diff is incomplete. Download the complete patch.

mm/percpu.c

View file

This diff is incomplete. Download the complete patch.

mm/rmap.c

View file

This diff is incomplete. Download the complete patch.

mm/secretmem.c

View file

This diff is incomplete. Download the complete patch.

mm/vmalloc.c

View file

This diff is incomplete. Download the complete patch.

mm/workingset.c

View file

This diff is incomplete. Download the complete patch.

scripts/check_extable.sh

View file

This diff is incomplete. Download the complete patch.

scripts/checkpatch.pl

View file

This diff is incomplete. Download the complete patch.

tools/include/linux/bitmap.h

View file

This diff is incomplete. Download the complete patch.

tools/perf/bench/find-bit-bench.c

View file

This diff is incomplete. Download the complete patch.

tools/perf/builtin-c2c.c

View file

This diff is incomplete. Download the complete patch.

tools/perf/builtin-record.c

View file

This diff is incomplete. Download the complete patch.

tools/perf/tests/bitmap.c

View file

This diff is incomplete. Download the complete patch.

tools/perf/tests/mem2node.c

View file

This diff is incomplete. Download the complete patch.

tools/perf/util/affinity.c

View file

This diff is incomplete. Download the complete patch.

tools/perf/util/header.c

View file

This diff is incomplete. Download the complete patch.

tools/perf/util/metricgroup.c

View file

This diff is incomplete. Download the complete patch.

tools/perf/util/mmap.c

View file

This diff is incomplete. Download the complete patch.

tools/testing/selftests/damon/Makefile

View file

This diff is incomplete. Download the complete patch.

tools/testing/selftests/damon/_chk_dependency.sh

View file

This diff is incomplete. Download the complete patch.

tools/testing/selftests/damon/debugfs_attrs.sh

View file

This diff is incomplete. Download the complete patch.

tools/testing/selftests/kvm/dirty_log_perf_test.c

View file

This diff is incomplete. Download the complete patch.

tools/testing/selftests/kvm/dirty_log_test.c

View file

This diff is incomplete. Download the complete patch.

tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.c

View file

This diff is incomplete. Download the complete patch.

tools/testing/selftests/memfd/memfd_test.c

View file

This diff is incomplete. Download the complete patch.