Skip to content

arch, mm: consolidate hugetlb early reservation

Mike Rapoport linux-alpha linux-csky linux-cxl linux-doc linux-hexagon linux-m68k linux-mips linux-mm linux-parisc linux-riscv linux-s390 linux-sh linux-snps-arc linux-um linuxppc-dev lkml loongarch openrisc sparclinux 3 versions – Applied

Status from this message: This series was applied to riscv/linux.git (fixes)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest29 patches 16 repliesApplied 29/29
  2. v228 patches 10 repliesSuperseded
  3. v128 patches 9 repliesSuperseded

Changes in v3 from the cover letter

* fix empty_zero_page initialization on arm
* fix ZONE_DMA limit calculation on powerpc
* add Acks

Patches in v3 All 29 applied

#Subject and filesSizeRepliesApplied
1/29alpha: introduce arch_zone_limits_init()arch/alpha/mm/init.c include/linux/mm.h+11 -50 repliesApplied
2/29arc: introduce arch_zone_limits_init()arch/arc/mm/init.c+20 -140 repliesApplied
3/29arm: introduce arch_zone_limits_init()arch/arm/mm/init.c+12 -70 repliesApplied
4/29arm: make initialization of zero page independent of the memory maparch/arm/include/asm/pgtable.h arch/arm/mm/mmu.c arch/arm/mm/nommu.c+4 -200 repliesApplied
5/29arm64: introduce arch_zone_limits_init()arch/arm64/mm/init.c+17 -50 repliesApplied
6/29csky: introduce arch_zone_limits_init()arch/csky/kernel/setup.c+9 -30 repliesApplied
7/29hexagon: introduce arch_zone_limits_init()arch/hexagon/mm/init.c+13 -100 repliesApplied
8/29loongarch: introduce arch_zone_limits_init()arch/loongarch/mm/init.c+7 -30 repliesApplied
9/29m68k: introduce arch_zone_limits_init()arch/m68k/mm/init.c arch/m68k/mm/mcfmmu.c arch/m68k/mm/motorola.c +1 more+9 -40 repliesApplied
10/29microblaze: introduce arch_zone_limits_init()arch/microblaze/mm/init.c+11 -60 repliesApplied
11/29mips: introduce arch_zone_limits_init()arch/mips/loongson64/numa.c arch/mips/mm/init.c arch/mips/sgi-ip27/ip27-memory.c+22 -80 repliesApplied
12/29nios2: introduce arch_zone_limits_init()arch/nios2/mm/init.c+6 -20 repliesApplied
13/29openrisc: introduce arch_zone_limits_init()arch/openrisc/mm/init.c+8 -40 repliesApplied
14/29parisc: introduce arch_zone_limits_init()arch/parisc/mm/init.c+6 -20 repliesApplied
15/29powerpc: introduce arch_zone_limits_init()arch/powerpc/mm/mem.c+12 -101 replyApplied
16/29riscv: introduce arch_zone_limits_init()arch/riscv/mm/init.c+7 -30 repliesApplied
17/29s390: introduce arch_zone_limits_init()arch/s390/mm/init.c+7 -22 repliesApplied
18/29sh: introduce arch_zone_limits_init()arch/sh/mm/init.c+6 -10 repliesApplied
19/29sparc: introduce arch_zone_limits_init()arch/sparc/mm/init_64.c arch/sparc/mm/srmmu.c+14 -41 replyApplied
20/29um: introduce arch_zone_limits_init()arch/um/kernel/mem.c+6 -10 repliesApplied
21/29x86: introduce arch_zone_limits_init()arch/x86/mm/init.c+9 -50 repliesApplied
22/29xtensa: introduce arch_zone_limits_init()arch/xtensa/mm/init.c+10 -60 repliesApplied
23/29arch, mm: consolidate initialization of nodes, zones and memory maparch/alpha/mm/init.c arch/arc/mm/init.c arch/arm/mm/init.c +32 more+15 -2002 repliesApplied
24/29arch, mm: consolidate initialization of SPARSE memory modelDocumentation/mm/memory-model.rst Documentation/translations/zh_CN/mm/memory-model.rst arch/alpha/kernel/setup.c +18 more+11 -597 repliesApplied
25/29mips: drop paging_init()arch/mips/include/asm/pgalloc.h arch/mips/include/asm/pgtable.h arch/mips/kernel/setup.c +3 more+3 -200 repliesApplied
26/29x86: don't reserve hugetlb memory in setup_arch()arch/x86/kernel/setup.c+0 -10 repliesApplied
27/29mm, arch: consolidate hugetlb CMA reservationDocumentation/driver-api/cxl/linux/early-boot.rst arch/arm64/include/asm/hugetlb.h arch/arm64/mm/hugetlbpage.c +13 more+51 -470 repliesApplied
28/29mm/hugetlb: drop hugetlb_cma_check()mm/hugetlb.c mm/hugetlb_cma.c mm/hugetlb_cma.h+3 -190 repliesApplied
29/29Revert "mm/hugetlb: deal with multiple calls to hugetlb_bootmem_alloc"include/linux/hugetlb.h mm/hugetlb.c mm/hugetlb_vmemmap.c+0 -290 repliesApplied

Reviews trailers per patch

10 of 29 patches have a Reviewed-by or Acked-by.

PatchMagnus LindholmVineet GuptaGuo RenDinh NguyenStafford HorneHelge DellerMuchun SongAndreas LarssonRitesh Harjani (IBM)
1/29A-b
2/29A-b
3/29
4/29
5/29
6/29A-b
7/29
8/29
9/29
10/29
11/29
12/29A-b
13/29A-b
14/29A-b
15/29R-b
16/29
17/29
18/29
19/29A-b
20/29
21/29
22/29
23/29
24/29
25/29
26/29
27/29
28/29A-b
29/29A-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 9 reviewers.

Read the v3 thread

Cover letter [PATCH v3 00/29] arch, mm: consolidate hugetlb early reservation

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

Hi,

Order in which early memory reservation for hugetlb happens depends on architecture, on configuration options and on command line parameters.

Some architectures rely on the core MM to call hugetlb_bootmem_alloc() while others call it very early to allow pre-allocation of HVO-style vmemmap.

When hugetlb_cma is supported by an architecture it is initialized during setup_arch() and then later hugetlb_init code needs to understand did it happen or not.

To make everything consistent and unified, both reservation of hugetlb memory from bootmem and creation of CMA areas for hugetlb must be called from core MM initialization and it would have been a simple change. However, HVO-style pre-initialization ordering requirements slightly complicate things and for HVO pre-init to work sparse and memory map should be initialized after hugetlb reservations.

This required pulling out the call to free_area_init() out of setup_arch() path and moving it MM initialization and this is what the first 23 patches do.

These changes are deliberately split into per-arch patches that change how the zone limits are calculated for each architecture and the patches 22 and 23 just remove the calls to free_area_init() and sprase_init() from arch/*.

Patch 24 is a simple cleanup for MIPS.

Patches 25 and 26 actually consolidate hugetlb reservations and patches 27 and 28 perform some aftermath cleanups.

I tried to trim the distribution list and although it's still quite long if you feel that someone was wrongly excluded please add them back.

The changes also available in git:
https://git.kernel.org/pub/scm/linux/kernel/git/rppt/linux.git/log/?h=hugetlb-init/v3

v3 changes:
* fix empty_zero_page initialization on arm
* fix ZONE_DMA limit calculation on powerpc
* add Acks

v2: https://lore.kernel.org/all/[email protected]
* move the hugetlb and memory map initializaion to mm_core_init_early()
* add Acks

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

Klara Modin (1):
arm: make initialization of zero page independent of the memory map

Mike Rapoport (Microsoft) (28):
alpha: introduce arch_zone_limits_init()
arc: introduce arch_zone_limits_init()
arm: introduce arch_zone_limits_init()
arm64: introduce arch_zone_limits_init()
csky: introduce arch_zone_limits_init()
hexagon: introduce arch_zone_limits_init()
loongarch: introduce arch_zone_limits_init()
m68k: introduce arch_zone_limits_init()
microblaze: introduce arch_zone_limits_init()
mips: introduce arch_zone_limits_init()
nios2: introduce arch_zone_limits_init()
openrisc: introduce arch_zone_limits_init()
parisc: introduce arch_zone_limits_init()
powerpc: introduce arch_zone_limits_init()
riscv: introduce arch_zone_limits_init()
s390: introduce arch_zone_limits_init()
sh: introduce arch_zone_limits_init()
sparc: introduce arch_zone_limits_init()
um: introduce arch_zone_limits_init()
x86: introduce arch_zone_limits_init()
xtensa: introduce arch_zone_limits_init()
arch, mm: consolidate initialization of nodes, zones and memory map arch, mm: consolidate initialization of SPARSE memory model
mips: drop paging_init()
x86: don't reserve hugetlb memory in setup_arch()
mm, arch: consolidate hugetlb CMA reservation
mm/hugetlb: drop hugetlb_cma_check()
Revert "mm/hugetlb: deal with multiple calls to hugetlb_bootmem_alloc"

 .../driver-api/cxl/linux/early-boot.rst       |  2 +-
 Documentation/mm/memory-model.rst             |  3 --
 .../translations/zh_CN/mm/memory-model.rst    |  2 -
 arch/alpha/kernel/setup.c                     |  1 -
 arch/alpha/mm/init.c                          | 16 ++++----
 arch/arc/mm/init.c                            | 37 +++++++++---------
 arch/arm/include/asm/pgtable.h                |  4 +-
 arch/arm/mm/init.c                            | 25 ++----------
 arch/arm/mm/mmu.c                             | 10 +----
 arch/arm/mm/nommu.c                           | 10 +----
 arch/arm64/include/asm/hugetlb.h              |  2 -
 arch/arm64/mm/hugetlbpage.c                   | 10 ++---
 arch/arm64/mm/init.c                          | 39 ++++++++-----------
 arch/csky/kernel/setup.c                      | 16 ++++----
 arch/hexagon/mm/init.c                        | 19 +++------
 arch/loongarch/include/asm/pgtable.h          |  2 -
 arch/loongarch/kernel/setup.c                 | 10 -----
 arch/loongarch/mm/init.c                      |  6 +--
 arch/m68k/mm/init.c                           |  8 ++--
 arch/m68k/mm/mcfmmu.c                         |  3 --
 arch/m68k/mm/motorola.c                       |  6 +--
 arch/m68k/mm/sun3mmu.c                        |  9 -----
 arch/microblaze/mm/init.c                     | 22 +++++------
 arch/mips/include/asm/pgalloc.h               |  2 -
 arch/mips/include/asm/pgtable.h               |  2 +-
 arch/mips/kernel/setup.c                      | 15 +------
 arch/mips/loongson64/numa.c                   | 10 ++---
 arch/mips/mm/init.c                           |  8 +---
 arch/mips/sgi-ip27/ip27-memory.c              |  8 +---
 arch/nios2/mm/init.c                          | 12 +++---
 arch/openrisc/mm/init.c                       | 10 +----
 arch/parisc/mm/init.c                         | 11 +-----
 arch/powerpc/include/asm/hugetlb.h            |  5 ---
 arch/powerpc/include/asm/setup.h              |  4 ++
 arch/powerpc/kernel/setup-common.c            |  1 -
 arch/powerpc/mm/hugetlbpage.c                 | 11 ++----
 arch/powerpc/mm/mem.c                         | 27 +++++--------
 arch/powerpc/mm/numa.c                        |  2 -
 arch/riscv/mm/hugetlbpage.c                   |  8 ++++
 arch/riscv/mm/init.c                          | 10 +----
 arch/s390/kernel/setup.c                      |  2 -
 arch/s390/mm/hugetlbpage.c                    |  8 ++++
 arch/s390/mm/init.c                           | 13 +++----
 arch/sh/mm/init.c                             | 12 +++---
 arch/sparc/mm/init_64.c                       | 17 +++-----
 arch/sparc/mm/srmmu.c                         | 17 ++++----
 arch/um/kernel/mem.c                          | 10 ++---
 arch/x86/kernel/setup.c                       |  5 ---
 arch/x86/mm/hugetlbpage.c                     |  8 ++++
 arch/x86/mm/init.c                            |  8 +---
 arch/x86/mm/init_32.c                         |  2 -
 arch/x86/mm/init_64.c                         |  4 --
 arch/x86/mm/mm_internal.h                     |  1 -
 arch/xtensa/mm/init.c                         | 14 +++----
 include/linux/hugetlb.h                       | 12 ++----
 include/linux/mm.h                            |  5 ++-
 include/linux/mmzone.h                        |  2 -
 init/main.c                                   |  1 +
 mm/hugetlb.c                                  | 13 -------
 mm/hugetlb_cma.c                              | 33 ++++++++--------
 mm/hugetlb_cma.h                              |  5 ---
 mm/hugetlb_vmemmap.c                          | 11 ------
 mm/internal.h                                 |  6 +++
 mm/mm_init.c                                  | 20 ++++++----
 64 files changed, 223 insertions(+), 414 deletions(-)

base-commit: 8f0b4cce4481fb22653697cced8d0d04027cb1e8

Signature · 1 line
2.51.0