Skip to content

arch, mm: deprecate DISCONTIGMEM

Mike Rapoport linux-alpha linux-arm-kernel linux-doc linux-fsdevel linux-ia64 linux-m68k linux-mm linux-snps-arc lkml 2 versions – Applied

Status from this message: [merged] arm-remove-config_arch_has_holes_memorymodel.patch removed from -mm tree

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest13 patches 25 repliesApplied 13/13
  2. v113 patches 7 repliesSuperseded

Changes in v2 from the cover letter

- remove additional stale '#ifdef CONFIG_SINGLE_MEMORY_CHUNK' on m68k
- fix bisectability on m68k

Patches in v2 All 13 applied

#Subject and filesSizeRepliesApplied
1/13alpha: switch from DISCONTIGMEM to SPARSEMEMarch/alpha/Kconfig arch/alpha/include/asm/mmzone.h arch/alpha/include/asm/page.h +3 more+38 -220 repliesApplied
2/13ia64: remove custom __early_pfn_to_nid()arch/ia64/Kconfig arch/ia64/mm/numa.c include/linux/mm.h +2 more+12 -510 repliesApplied
3/13ia64: remove 'ifdef CONFIG_ZONE_DMA32' statementsarch/ia64/mm/contig.c arch/ia64/mm/discontig.c+0 -40 repliesApplied
4/13ia64: discontig: paging_init(): remove local max_pfn calculationarch/ia64/mm/discontig.c+1 -40 repliesApplied
5/13ia64: split virtual map initialization out of paging_init()arch/ia64/mm/contig.c arch/ia64/mm/discontig.c+40 -310 repliesApplied
6/13ia64: forbid using VIRTUAL_MEM_MAP with FLATMEMarch/ia64/Kconfig arch/ia64/include/asm/meminit.h arch/ia64/mm/contig.c +1 more+22 -440 repliesApplied
7/13ia64: make SPARSEMEM default and disable DISCONTIGMEMarch/ia64/Kconfig+3 -30 repliesApplied
8/13arm: remove CONFIG_ARCH_HAS_HOLES_MEMORYMODELDocumentation/vm/memory-model.rst arch/arm/Kconfig arch/arm/mach-bcm/Kconfig +10 more+3 -661 replyApplied
9/13arm, arm64: move free_unused_memmap() to generic mmarch/Kconfig arch/arm/Kconfig arch/arm/mm/init.c +3 more+85 -1521 replyApplied
10/13arc: use FLATMEM with freeing of unused memory map instead of DISCONTIGMEMarch/arc/Kconfig arch/arc/include/asm/page.h arch/arc/mm/init.c+41 -113 repliesApplied
11/13m68k/mm: make node data and node setup depend on CONFIG_DISCONTIGMEMarch/m68k/Kconfig.cpu arch/m68k/include/asm/page_mm.h arch/m68k/include/asm/virtconvert.h +1 more+6 -60 repliesApplied
12/13m68k/mm: enable use of generic memory_model.h for !DISCONTIGMEMarch/m68k/Kconfig.cpu arch/m68k/include/asm/page.h arch/m68k/include/asm/page_mm.h +2 more+10 -90 repliesApplied
13/13m68k: deprecate DISCONTIGMEMarch/m68k/Kconfig.cpu+25 -10 repliesApplied

Reviews trailers per patch

3 of 13 patches have a Reviewed-by or Acked-by.

PatchDavid HildenbrandCatalin MarinasVineet GuptaJohn Paul Adrian Glaubitz
SeriesT-b
1/13
2/13
3/13
4/13
5/13
6/13
7/13
8/13A-b
9/13A-b
10/13A-b
11/13
12/13
13/13

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

Read the v2 thread

Cover letter [PATCH v2 00/13] arch, mm: deprecate DISCONTIGMEM

From: Mike Rapoport <[email protected]>

Hi,

It's been a while since DISCONTIGMEM is generally considered deprecated, but it is still used by four architectures. This set replaces DISCONTIGMEM with a different way to handle holes in the memory map and marks DISCONTIGMEM configuration as BROKEN in Kconfigs of these architectures with the intention to completely remove it in several releases.

While for 64-bit alpha and ia64 the switch to SPARSEMEM is quite obvious and was a matter of moving some bits around, for smaller 32-bit arc and m68k SPARSEMEM is not necessarily the best thing to do.

On 32-bit machines SPARSEMEM would require large sections to make section index fit in the page flags, but larger sections mean that more memory is wasted for unused memory map.

Besides, pfn_to_page() and page_to_pfn() become less efficient, at least on arc.

So I've decided to generalize arm's approach for freeing of unused parts of the memory map with FLATMEM and enable it for both arc and m68k. The details are in the description of patches 10 (arc) and 13 (m68k).

v2 changes:
- remove additional stale '#ifdef CONFIG_SINGLE_MEMORY_CHUNK' on m68k
- fix bisectability on m68k

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

Mike Rapoport (13):
alpha: switch from DISCONTIGMEM to SPARSEMEM
ia64: remove custom __early_pfn_to_nid()
ia64: remove 'ifdef CONFIG_ZONE_DMA32' statements
ia64: discontig: paging_init(): remove local max_pfn calculation
ia64: split virtual map initialization out of paging_init()
ia64: forbid using VIRTUAL_MEM_MAP with FLATMEM
ia64: make SPARSEMEM default and disable DISCONTIGMEM
arm: remove CONFIG_ARCH_HAS_HOLES_MEMORYMODEL
arm, arm64: move free_unused_memmap() to generic mm
arc: use FLATMEM with freeing of unused memory map instead of
DISCONTIGMEM
m68k/mm: make node data and node setup depend on CONFIG_DISCONTIGMEM m68k/mm: enable use of generic memory_model.h for !DISCONTIGMEM
m68k: deprecate DISCONTIGMEM

 Documentation/vm/memory-model.rst   |  3 +-
 arch/Kconfig                        |  3 ++
 arch/alpha/Kconfig                  |  8 +++
 arch/alpha/include/asm/mmzone.h     | 14 +----
 arch/alpha/include/asm/page.h       |  7 +--
 arch/alpha/include/asm/pgtable.h    | 12 ++---
 arch/alpha/include/asm/sparsemem.h  | 18 +++++++
 arch/alpha/kernel/setup.c           |  1 +
 arch/arc/Kconfig                    |  3 +-
 arch/arc/include/asm/page.h         | 20 ++++++--
 arch/arc/mm/init.c                  | 29 ++++++++---
 arch/arm/Kconfig                    | 10 +---
 arch/arm/mach-bcm/Kconfig           |  1 -
 arch/arm/mach-davinci/Kconfig       |  1 -
 arch/arm/mach-exynos/Kconfig        |  1 -
 arch/arm/mach-highbank/Kconfig      |  1 -
 arch/arm/mach-omap2/Kconfig         |  1 -
 arch/arm/mach-s5pv210/Kconfig       |  1 -
 arch/arm/mach-tango/Kconfig         |  1 -
 arch/arm/mm/init.c                  | 78 ----------------------------
 arch/arm64/Kconfig                  |  4 +-
 arch/arm64/mm/init.c                | 68 ------------------------
 arch/ia64/Kconfig                   | 11 ++--
 arch/ia64/include/asm/meminit.h     |  2 -
 arch/ia64/mm/contig.c               | 58 ++++++++++-----------
 arch/ia64/mm/discontig.c            | 44 ++++++++--------
 arch/ia64/mm/init.c                 | 14 -----
 arch/ia64/mm/numa.c                 | 30 -----------
 arch/m68k/Kconfig.cpu               | 31 +++++++++--
 arch/m68k/include/asm/page.h        |  2 +
 arch/m68k/include/asm/page_mm.h     |  7 ++-
 arch/m68k/include/asm/virtconvert.h |  5 --
 arch/m68k/mm/init.c                 |  8 +--
 fs/proc/kcore.c                     |  2 -
 include/linux/mm.h                  |  3 --
 include/linux/mmzone.h              | 42 ---------------
 mm/memblock.c                       | 80 +++++++++++++++++++++++++++++
 mm/mmzone.c                         | 14 -----
 mm/page_alloc.c                     | 16 ++++--
 mm/vmstat.c                         |  4 --
 40 files changed, 270 insertions(+), 388 deletions(-)
 create mode 100644 arch/alpha/include/asm/sparsemem.h

base-commit: 3650b228f83adda7e5ee532e2b90429c03f7b9ec

Signature · 1 line
2.28.0