Skip to content

mm: introduce numa_memblks

Mike Rapoport linux-acpi linux-arch linux-arm-kernel linux-cxl linux-devicetree linux-doc linux-mips linux-mm linux-riscv linux-s390 linux-sh linuxppc-dev lkml loongarch nvdimm sparclinux 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest26 patches 4 repliesIn review 24 of 26 applied
  2. v326 patches 54 repliesSuperseded
  3. v225 patches 4 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v117 patches42 repliesSuperseded

Patches in v4 24 of 26 applied

#Subject and filesSizeRepliesApplied
1/26mm: move kernel/numa.c to mm/kernel/Makefile mm/Makefile mm/numa.c+1 -10 replies
2/26MIPS: sgi-ip27: make NODE_DATA() the same as on all other architecturesarch/mips/include/asm/mach-ip27/mmzone.h arch/mips/sgi-ip27/ip27-memory.c+8 -20 repliesApplied
3/26MIPS: sgi-ip27: ensure node_possible_map only contains valid nodesarch/mips/sgi-ip27/ip27-smp.c+2 -00 repliesApplied
4/26MIPS: sgi-ip27: drop HAVE_ARCH_NODEDATA_EXTENSIONarch/mips/Kconfig arch/mips/sgi-ip27/ip27-memory.c+0 -110 repliesApplied
5/26MIPS: loongson64: rename __node_data to node_dataarch/mips/include/asm/mach-loongson64/mmzone.h arch/mips/loongson64/numa.c+6 -60 repliesApplied
6/26MIPS: loongson64: drop HAVE_ARCH_NODEDATA_EXTENSIONarch/mips/Kconfig arch/mips/loongson64/numa.c+0 -140 repliesApplied
7/26arch, mm: move definition of node_data to generic codearch/arm64/include/asm/Kbuild arch/arm64/include/asm/mmzone.h arch/arm64/include/asm/topology.h +29 more+22 -1440 repliesApplied
8/26mm: drop CONFIG_HAVE_ARCH_NODEDATA_EXTENSIONinclude/linux/memory_hotplug.h include/linux/numa.h mm/mm_init.c +1 more+18 -560 repliesApplied
9/26arch, mm: pull out allocation of NODE_DATA to generic codearch/loongarch/kernel/numa.c arch/mips/loongson64/numa.c arch/powerpc/mm/numa.c +6 more+38 -1190 repliesApplied
10/26x86/numa: simplify numa_distance allocationarch/x86/mm/numa.c+2 -50 repliesApplied
11/26x86/numa: use get_pfn_range_for_nid to verify that node spans memoryarch/x86/mm/numa.c+7 -100 repliesApplied
12/26x86/numa: move FAKE_NODE_* defines to numa_emuarch/x86/include/asm/numa.h arch/x86/mm/numa_emulation.c+3 -20 repliesApplied
13/26x86/numa_emu: simplify allocation of phys_distarch/x86/mm/numa_emulation.c+2 -60 repliesApplied
14/26x86/numa_emu: split __apicid_to_node update to a helper functionarch/x86/include/asm/numa.h arch/x86/mm/numa.c arch/x86/mm/numa_emulation.c+25 -130 repliesApplied
15/26x86/numa_emu: use a helper function to get MAX_DMA32_PFNarch/x86/include/asm/numa.h arch/x86/mm/numa.c arch/x86/mm/numa_emulation.c+8 -20 repliesApplied
16/26x86/numa: numa_{add,remove}_cpu: make cpu parameter unsignedarch/x86/include/asm/numa.h arch/x86/mm/numa.c arch/x86/mm/numa_emulation.c+15 -150 repliesApplied
17/26mm: introduce numa_memblksarch/x86/Kconfig arch/x86/include/asm/numa.h arch/x86/mm/amdtopology.c +9 more+436 -3830 repliesApplied
18/26mm: move numa_distance and related code from x86 to numa_memblksarch/x86/include/asm/numa.h arch/x86/mm/numa.c arch/x86/mm/numa_internal.h +2 more+108 -1080 repliesApplied
19/26mm: introduce numa_emulationarch/x86/Kconfig arch/x86/include/asm/numa.h arch/x86/mm/Makefile +5 more+27 -350 repliesApplied
20/26mm: numa_memblks: introduce numa_memblks_initarch/x86/mm/numa.c include/linux/numa_memblks.h mm/numa_memblks.c+48 -360 repliesApplied
21/26mm: numa_memblks: make several functions and variables staticinclude/linux/numa_memblks.h mm/numa_memblks.c+18 -260 repliesApplied
22/26mm: numa_memblks: use memblock_{start,end}_of_DRAM() when sanitizing meminfomm/numa_memblks.c+2 -20 repliesApplied
23/26of, numa: return -EINVAL when no numa-node-id is founddrivers/of/of_numa.c+2 -20 repliesApplied
24/26arch_numa: switch over to numa_memblksdrivers/base/Kconfig drivers/base/arch_numa.c include/asm-generic/numa.h +1 more+75 -1504 replies
25/26mm: make range-to-target_node lookup facility a part of numa_memblksarch/x86/include/asm/sparsemem.h arch/x86/mm/numa.c drivers/cxl/Kconfig +4 more+48 -490 repliesApplied
26/26docs: move numa=fake description to kernel-parameters.txtDocumentation/admin-guide/kernel-parameters.txt Documentation/arch/x86/x86_64/boot-options.rst+15 -120 repliesApplied

Reviews trailers per patch

All 26 patches have a Reviewed-by or Acked-by.

PatchDavid HildenbrandJonathan CameronZi YanDan WilliamsJiaxun YangDavidlohr Bueso
1/26A-b R-b T-b T-b A-b
2/26A-b R-b T-b A-b
3/26A-b R-b T-b A-b
4/26A-b R-b T-b A-b
5/26R-b R-b T-b A-b R-b
6/26A-b R-b T-b A-b
7/26A-b R-b T-b T-b A-b A-b
8/26T-b A-b
9/26A-b R-b T-b T-b A-b
10/26A-b R-b T-b T-b A-b
11/26A-b R-b T-b T-b A-b
12/26A-b R-b T-b T-b A-b
13/26A-b R-b T-b T-b A-b
14/26A-b R-b T-b T-b A-b
15/26A-b R-b T-b T-b A-b
16/26A-b R-b T-b T-b A-b
17/26A-b R-b T-b T-b A-b
18/26A-b R-b T-b T-b A-b
19/26R-b T-b T-b A-b
20/26A-b R-b T-b T-b A-b
21/26A-b R-b T-b T-b A-b
22/26A-b R-b T-b T-b A-b
23/26A-b R-b T-b A-b
24/26A-b R-b T-b T-b A-b
25/26A-b R-b T-b T-b R-b
26/26A-b R-b T-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 6 reviewers.

Read the v4 thread

Cover letter [PATCH v4 00/26] mm: introduce numa_memblks

From: "Mike Rapoport (Microsoft)" <[email protected]>

Hi,

Following the discussion about handling of CXL fixed memory windows on arm64 [1] I decided to bite the bullet and move numa_memblks from x86 to the generic code so they will be available on arm64/riscv and maybe on loongarch sometime later.

While it could be possible to use memblock to describe CXL memory windows, it currently lacks notion of unpopulated memory ranges and numa_memblks does implement this.

Another reason to make numa_memblks generic is that both arch_numa (arm64 and riscv) and loongarch use trimmed copy of x86 code although there is no fundamental reason why the same code cannot be used on all these platforms. Having numa_memblks in mm/ will make it's interaction with ACPI and FDT more consistent and I believe will reduce maintenance burden.

And with generic numa_memblks it is (almost) straightforward to enable NUMA emulation on arm64 and riscv.

The first 9 commits in this series are cleanups that are not strictly related to numa_memblks.
Commits 10-16 slightly reorder code in x86 to allow extracting numa_memblks and NUMA emulation to the generic code.
Commits 17-19 actually move the code from arch/x86/ to mm/ and commits 20-22 does some aftermath cleanups.
Commit 23 updates of_numa_init() to return error of no NUMA nodes were found in the device tree.
Commit 24 switches arch_numa to numa_memblks.
Commit 25 enables usage of phys_to_target_node() and memory_add_physaddr_to_nid() with numa_memblks.
Commit 26 moves the description for numa=fake from x86 to admin-guide.

[1] https://lore.kernel.org/all/[email protected]/

v3: https://lore.kernel.org/all/[email protected]
* update allocation of offline node, thanks Jonathan
* add comment about dependency of get_pfn_range_for_nid on memblock_set_node(), per Dan
* fix build errros with 32-bit phys_address_t reported by kbuild
* add Acked- and Reviewed-by, thanks Dan and David

v2: https://lore.kernel.org/all/[email protected]
* rebase on v6.11-rc1
* fix dummy_numa_init() in arch_numa, thanks Zi Yan
* update of_numa_init() to return error of no NUMA nodes were
* add Tested-by, thanks Zi Yan

v1: https://lore.kernel.org/all/[email protected]
* add cleanup for arch_alloc_nodedata and HAVE_ARCH_NODEDATA_EXTENSION
* add patch that moves description of numa=fake kernel parameter from x86 to admin-guide
* reduce rounding up of node_data allocations from PAGE_SIZE to SMP_CACHE_BYTES
* restore single allocation attempt of numa_distance
* fix several comments
* added review tags

Mike Rapoport (Microsoft) (26):
mm: move kernel/numa.c to mm/
MIPS: sgi-ip27: make NODE_DATA() the same as on all other architectures
MIPS: sgi-ip27: ensure node_possible_map only contains valid nodes
MIPS: sgi-ip27: drop HAVE_ARCH_NODEDATA_EXTENSION
MIPS: loongson64: rename __node_data to node_data
MIPS: loongson64: drop HAVE_ARCH_NODEDATA_EXTENSION
arch, mm: move definition of node_data to generic code
mm: drop CONFIG_HAVE_ARCH_NODEDATA_EXTENSION
arch, mm: pull out allocation of NODE_DATA to generic code x86/numa: simplify numa_distance allocation
x86/numa: use get_pfn_range_for_nid to verify that node spans memory x86/numa: move FAKE_NODE_* defines to numa_emu x86/numa_emu: simplify allocation of phys_dist x86/numa_emu: split __apicid_to_node update to a helper function x86/numa_emu: use a helper function to get MAX_DMA32_PFN x86/numa: numa_{add,remove}_cpu: make cpu parameter unsigned
mm: introduce numa_memblks
mm: move numa_distance and related code from x86 to numa_memblks
mm: introduce numa_emulation
mm: numa_memblks: introduce numa_memblks_init
mm: numa_memblks: make several functions and variables static
mm: numa_memblks: use memblock_{start,end}_of_DRAM() when sanitizing
meminfo
of, numa: return -EINVAL when no numa-node-id is found
arch_numa: switch over to numa_memblks
mm: make range-to-target_node lookup facility a part of numa_memblks
docs: move numa=fake description to kernel-parameters.txt

 .../admin-guide/kernel-parameters.txt         |  15 +
 .../arch/x86/x86_64/boot-options.rst          |  12 -
 arch/arm64/include/asm/Kbuild                 |   1 +
 arch/arm64/include/asm/mmzone.h               |  13 -
 arch/arm64/include/asm/topology.h             |   1 +
 arch/loongarch/include/asm/Kbuild             |   1 +
 arch/loongarch/include/asm/mmzone.h           |  16 -
 arch/loongarch/include/asm/topology.h         |   1 +
 arch/loongarch/kernel/numa.c                  |  21 -
 arch/mips/Kconfig                             |   5 -
 arch/mips/include/asm/mach-ip27/mmzone.h      |   1 -
 .../mips/include/asm/mach-loongson64/mmzone.h |   4 -
 arch/mips/loongson64/numa.c                   |  28 +-
 arch/mips/sgi-ip27/ip27-memory.c              |  12 +-
 arch/mips/sgi-ip27/ip27-smp.c                 |   2 +
 arch/powerpc/include/asm/mmzone.h             |   6 -
 arch/powerpc/mm/numa.c                        |  26 +-
 arch/riscv/include/asm/Kbuild                 |   1 +
 arch/riscv/include/asm/mmzone.h               |  13 -
 arch/riscv/include/asm/topology.h             |   4 +
 arch/s390/include/asm/Kbuild                  |   1 +
 arch/s390/include/asm/mmzone.h                |  17 -
 arch/s390/kernel/numa.c                       |   3 -
 arch/sh/include/asm/mmzone.h                  |   3 -
 arch/sh/mm/init.c                             |   7 +-
 arch/sh/mm/numa.c                             |   3 -
 arch/sparc/include/asm/mmzone.h               |   4 -
 arch/sparc/mm/init_64.c                       |  11 +-
 arch/x86/Kconfig                              |   9 +-
 arch/x86/include/asm/Kbuild                   |   1 +
 arch/x86/include/asm/mmzone.h                 |   6 -
 arch/x86/include/asm/mmzone_32.h              |  17 -
 arch/x86/include/asm/mmzone_64.h              |  18 -
 arch/x86/include/asm/numa.h                   |  26 +-
 arch/x86/include/asm/sparsemem.h              |   9 -
 arch/x86/mm/Makefile                          |   1 -
 arch/x86/mm/amdtopology.c                     |   1 +
 arch/x86/mm/numa.c                            | 622 +-----------------
 arch/x86/mm/numa_internal.h                   |  24 -
 drivers/acpi/numa/srat.c                      |   1 +
 drivers/base/Kconfig                          |   1 +
 drivers/base/arch_numa.c                      | 224 ++-----
 drivers/cxl/Kconfig                           |   2 +-
 drivers/dax/Kconfig                           |   2 +-
 drivers/of/of_numa.c                          |   5 +-
 include/asm-generic/mmzone.h                  |   5 +
 include/asm-generic/numa.h                    |   6 +-
 include/linux/memory_hotplug.h                |  48 --
 include/linux/numa.h                          |   8 +
 include/linux/numa_memblks.h                  |  58 ++
 kernel/Makefile                               |   1 -
 kernel/numa.c                                 |  26 -
 mm/Kconfig                                    |  11 +
 mm/Makefile                                   |   3 +
 mm/mm_init.c                                  |  10 +-
 mm/numa.c                                     |  69 ++
 {arch/x86/mm => mm}/numa_emulation.c          |  42 +-
 mm/numa_memblks.c                             | 571 ++++++++++++++++
 58 files changed, 893 insertions(+), 1166 deletions(-)
 delete mode 100644 arch/arm64/include/asm/mmzone.h
 delete mode 100644 arch/loongarch/include/asm/mmzone.h
 delete mode 100644 arch/riscv/include/asm/mmzone.h
 delete mode 100644 arch/s390/include/asm/mmzone.h
 delete mode 100644 arch/x86/include/asm/mmzone.h
 delete mode 100644 arch/x86/include/asm/mmzone_32.h
 delete mode 100644 arch/x86/include/asm/mmzone_64.h
 create mode 100644 include/asm-generic/mmzone.h
 create mode 100644 include/linux/numa_memblks.h
 delete mode 100644 kernel/numa.c
 create mode 100644 mm/numa.c
 rename {arch/x86/mm => mm}/numa_emulation.c (94%)
 create mode 100644 mm/numa_memblks.c

base-commit: 8400291e289ee6b2bf9779ff1c83a291501f017b

Signature · 1 line
2.43.0