Skip to contentSkip to conversation

mm: increase lowmem size in linux-7.0

PATCH In review Arnd Bergmann 8 participants 19 messages Dec 19, 2025 – Jan 8

Subsystems (11)
lore
Share & tools
lore
#0 lore raw

cover mm: increase lowmem size in linux-7.0

From: Arnd Bergmann <[email protected]>

At the kernel summit in Tokyo last week, I hosted a session on dealing with highmem in the long run, see the link below.

My feeling was that we got sufficient consensus on the plan to keep the funcationality present for the time being but instead reduce the scope of highmem in the kernel as much as we can without hurting users.

The short summary is a three stage process:

1. Nudge users towards using a larger lowmem zone with the CONFIG_VMSPLIT_* options if at all possible.

2. Drop most __GFP_HIGHMEM allocations and corresponding kmap() calls from the kernel, leaving only the subset that is likely to contain the majority of the actual allocations. Specifically we will keep anonymous and regular file backed user mappings, zsmalloc, and huge pages.

3. In a few years, also drop the page cache allocations and leave perhaps only zsmalloc using a much simpler interface. I suggested five years as the time until we do this, but the timing depends a lot on how the first two stages work out in practice, and how long the remaining highmem users plan to keep updating their kernels.

This series implements stage 1, mostly using Kconfig changes to the default settings but leaving the traditional behavior as a CONFIG_EXPERT choice in Kconfig. With the new defaults, most installations that use highmem today with 1 GiB or 2 GiB of system RAM will see all of their RAM in the lowmem zone after upgrading their kernels. My estimate is that instead of 80% to 90% of maintained embedded 32-bit systems, this should cover over 98%.

As I don't actually have hardware in the category that still needs highmem, I tested this using a qemu-system for Armv7 and PPC6xx running a Debian userland with all combinations of VMSPLIT and HIGHMEM options. I ran some kernel builds on the Arm guest to ensure that the new options don't cause functional or performance regressions for regular workloads that don't exceed the virtual address space. I also ran some tests with Firefox and was positively surprised to see that this still works on the VMSPLIT_2G_OPT configuration without highmem, though it gets close to both the address space and lowmem size limits.

The change to use VMSPLIT_3G_OPT by default on Armv5 means that I could include a patch to no longer support highmem at all on VIVT caches, as suggested by Jason Gunthorpe.

Arnd

Arnd Bergmann (4):
arch/*: increase lowmem size to avoid highmem use
ARM: add CONFIG_VMSPLIT_2G_OPT option
ARM: remove support for highmem on VIVT
mm: remove ARCH_NEEDS_KMAP_HIGH_GET

 arch/arm/Kconfig                            |  12 ++-
 arch/arm/configs/aspeed_g5_defconfig        |   1 -
 arch/arm/configs/dove_defconfig             |   2 -
 arch/arm/configs/gemini_defconfig           |   1 -
 arch/arm/configs/multi_v5_defconfig         |   1 -
 arch/arm/configs/mv78xx0_defconfig          |   2 -
 arch/arm/configs/mvebu_v5_defconfig         |   1 -
 arch/arm/configs/u8500_defconfig            |   1 -
 arch/arm/configs/vt8500_v6_v7_defconfig     |   3 -
 arch/arm/include/asm/highmem.h              |  56 +----------
 arch/arm/mach-omap2/Kconfig                 |   1 -
 arch/arm/mm/cache-feroceon-l2.c             |  31 +-----
 arch/arm/mm/cache-xsc3l2.c                  |  47 +--------
 arch/arm/mm/dma-mapping.c                   |  12 +--
 arch/arm/mm/flush.c                         |  19 +---
 arch/microblaze/Kconfig                     |   9 +-
 arch/microblaze/configs/mmu_defconfig       |   1 -
 arch/powerpc/Kconfig                        |  17 ++--
 arch/powerpc/configs/44x/akebono_defconfig  |   1 -
 arch/powerpc/configs/85xx/ksi8560_defconfig |   1 -
 arch/powerpc/configs/85xx/stx_gp3_defconfig |   1 -
 arch/x86/Kconfig                            |   4 +-
 mm/highmem.c                                | 100 ++------------------
 23 files changed, 56 insertions(+), 268 deletions(-)
Signature · 17 lines
2.39.5

Cc: Andrew Morton <[email protected]>
Cc: Andreas Larsson <[email protected]>
Cc: Christophe Leroy (CS GROUP) <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: Jason Gunthorpe <[email protected]>
Cc: Linus Walleij <[email protected]>
Cc: Matthew Wilcox <[email protected]>
Cc: Richard Weinberger <[email protected]>
Cc: Russell King <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
#1 lore raw

PATCH 1/4 arch/*: increase lowmem size to avoid highmem use

From: Arnd Bergmann <[email protected]>

Most of the common 32-bit architectures (x86, arm, powerpc) all use the default virtual memory layout that was already in place for i386 systems in the 1990s, using exactly 3GiB of user TASK_SIZE, with the upper 1GiB of addresses split between (at most 896MiB) lowmem and vmalloc.

Linux-2.3 introduced CONFIG_HIGHMEM for large x86 server machines that had 4GiB of RAM or more, with the VMSPLIT_3G/2G/1G options added in v2.6.16 for machines that had one or two gigabytes of memory but wanted to avoid the overhead from managing highmem. Over time, similar options appeared on other 32-bit architectures.

Twenty years later, it makes sense to reconsider the default settings, as the tradeoffs have changed a bit:

- Configurations with more than 2GiB have become extremely rare, as any users with large memory have moved on to 64-bit systems. There were only ever a few Laptop models in this category: Apple Powerbook G4 (2005), Macbook (2006), IBM Thinkpad X60 (2006), Arm Chromebooks based on Exynos 5800 (2014), Tegra K1 (2014) and RK3288 (2015), and manufacturer support for all of these has ended in 2020 or (much) earlier.
Embedded systems with more than 2GiB use additional SoCs of a similar vintage: Intel Atom Z5xx (2008), Freescale QorIQ (2008), Marvell Armada XP (2010), Freescale i.MX6Q (2011), LSI Axxia (2013), TI Keystone2 (2014), Renesas RZ/G1M (2015). Most boards based on these have stopped receiving kernel upgrades. Newer 32-bit chips only support smaller memory configurations, though in particular the i.MX6Q and Keystone2 families have expected support cycles past 2035. While 32-bit server installations used to support even larger memory, none of those seem to still be used in production on any architecture.

- While general-purpose distributes for 32-bit targets were common, it was rather risky to change the CONFIG_VMSPLIT setting because there is always a possibility of running into device driver bugs or applications that need a large virtual memory size. Presumably a lot of these issues have been resolved now, so most setups should be fine using a custom vmsplit instead of highmem now.

- As fewer users test highmem, the expectation is that it will increasingly break in the future, so getting users to change the vmsplit means that even if there is a bug to fix initially, it improves the situation in the long run.

- Highmem will ultimately need to be removed, at least for the page cache and most other code using it today. In a previous discussion, I had suggested doing this as early as 2029, but based on the discussions since ELC, the plan is now to leave highmem-enabled page cache as an option until at least 2029, at which point remaining users will have the choice between no longer updating kernels or using a combination of a custom vmsplit and zram/zswap. Changing the defaults now should both speed up the highmem deprecation and make it less painful for users.

- The most VM space intensive applications tend to be web browsers, specifcally Chrome/ChromeOS and Firefox. Both have now stopped providing binary updates, but Firefox can still be built from source. Testing various combinations on Debian/armhf, I found that Firefox 140 can still show complex websites with VMSPLIT_2G_OPT with and without HIGHMEM, though it failed for me both with the small address space of VMSPLIT_1G and the small lowmem of VMSPLIT_3G_OPT when HIGHMEM is disabled.
This is likely to get worse with future versions, so embedded users may still be forced to migrate to specialized browsers like WPE Webkit when HIGHMEM pagecache is finally removed.

Based on the above observations and the discussion at the kernel summit, change the defaults to the most appropriate values: use 1GiB of lowmem on non-highmem configurations, and either 2GiB or 1.75GiB of lowmem on highmem builds, depending on what is available on the architecture. As ARM_LPAE and X86_PAE builds both require a gigabyte-aligned vmsplit, those get to use VMSPLIT_2G. The result is that the majority of previous highmem users now only need lowmem. For platform specific defconfig files that are known to only support up to 1GiB of RAM, drop the CONFIG_HIGHMEM line as well as a simplification.

On PowerPC and Microblaze, the options have somewhat different names but should have the same effect. MIPS and Xtensa cannot support a larger than 512MB of lowmem but are limited to small DDR2 memory in most implementations, with MT7621 being a notable exception. ARC and C-Sky could support a configurable vmsplit in theory, but it's not clear if anyone still cares.
SPARC is currently limited to 192MB of lowmem and should get patched to behave either like arm/x86 or powerpc/microblaze to support 2GiB of lowmem.

There are likely going to be regressions from the changed defaults, in particular when hitting previously hidden device driver bugs that fail to set the correct DMA mask, or from applications that need a large virtual address space.
Ideally the in-kernel problems should all be fixable, but the previous behavior is still selectable as a fallback with CONFIG_EXPERT=y

Cc Russell King <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Madhavan Srinivasan <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Nicholas Piggin <[email protected]>
Cc Christophe Leroy (CS GROUP) <[email protected]>
Cc Michal Simek <[email protected]>
Cc Andrew Morton <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Cc Liam R. Howlett <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Nishanth Menon <[email protected]>
Cc Andreas Larsson <[email protected]>
Cc Lucas Stach <[email protected]>
---
 arch/arm/Kconfig                            |  5 ++++-
 arch/arm/configs/aspeed_g5_defconfig        |  1 -
 arch/arm/configs/dove_defconfig             |  2 --
 arch/arm/configs/mv78xx0_defconfig          |  2 --
 arch/arm/configs/u8500_defconfig            |  1 -
 arch/arm/configs/vt8500_v6_v7_defconfig     |  3 ---
 arch/arm/mach-omap2/Kconfig                 |  1 -
 arch/microblaze/Kconfig                     |  9 ++++++---
 arch/microblaze/configs/mmu_defconfig       |  1 -
 arch/powerpc/Kconfig                        | 17 +++++++++++------
 arch/powerpc/configs/44x/akebono_defconfig  |  1 -
 arch/powerpc/configs/85xx/ksi8560_defconfig |  1 -
 arch/powerpc/configs/85xx/stx_gp3_defconfig |  1 -
 arch/x86/Kconfig                            |  4 +++-
 14 files changed, 24 insertions(+), 25 deletions(-)
arch/arm/Kconfig +4 -1
index fa83c040ee2d..7c0ac017e086 100644
@@ -1009,7 +1009,8 @@ config BL_SWITCHER_DUMMY_IF
 choice
 	prompt "Memory split"
 	depends on MMU
-	default VMSPLIT_3G
+	default VMSPLIT_2G if HIGHMEM || ARM_LPAE
+	default VMSPLIT_3G_OPT
 	help
 	  Select the desired split between kernel and user memory.
 
@@ -1018,8 +1019,10 @@ choice
 
 	config VMSPLIT_3G
 		bool "3G/1G user/kernel split"
+		depends on !HIGHMEM || EXPERT
 	config VMSPLIT_3G_OPT
 		depends on !ARM_LPAE
+		depends on !HIGHMEM || EXPERT
 		bool "3G/1G user/kernel split (for full 1G low memory)"
 	config VMSPLIT_2G
 		bool "2G/2G user/kernel split"
arch/arm/configs/aspeed_g5_defconfig +0 -1
index 2e6ea13c1e9b..be5ea1775b3f 100644
@@ -27,7 +27,6 @@ CONFIG_SMP=y
 # CONFIG_ARM_CPU_TOPOLOGY is not set
 CONFIG_VMSPLIT_2G=y
 CONFIG_NR_CPUS=2
-CONFIG_HIGHMEM=y
 CONFIG_UACCESS_WITH_MEMCPY=y
 # CONFIG_ATAGS is not set
 CONFIG_VFP=y
arch/arm/configs/dove_defconfig +0 -2
index e98c35df675e..75c67678c4ba 100644
@@ -7,8 +7,6 @@ CONFIG_EXPERT=y
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_DOVE=y
 CONFIG_MACH_CM_A510=y
-CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_VFP=y
arch/arm/configs/mv78xx0_defconfig +0 -1
index d3a26efe766c..cbd47155eca9 100644
@@ -11,7 +11,6 @@ CONFIG_ARCH_MULTI_V5=y
 CONFIG_ARCH_MV78XX0=y
 CONFIG_MACH_TERASTATION_WXL=y
 CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
 CONFIG_FPE_NWFPE=y
 CONFIG_VFP=y
 CONFIG_KPROBES=y
arch/arm/configs/u8500_defconfig +0 -1
index e88533b78327..a53269cbe475 100644
@@ -6,7 +6,6 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_ARCH_U8500=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=2
-CONFIG_HIGHMEM=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CMDLINE="root=/dev/ram0 console=ttyAMA2,115200n8"
arch/arm/configs/vt8500_v6_v7_defconfig +0 -2
index 41607a84abc8..1f6dca21d569 100644
@@ -8,8 +8,6 @@ CONFIG_ARM_ERRATA_720789=y
 CONFIG_ARM_ERRATA_775420=y
 CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
-CONFIG_HIGHPTE=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_VFP=y
arch/arm/mach-omap2/Kconfig +0 -1
index 821727eefd5a..4a2591985ff3 100644
@@ -135,7 +135,6 @@ config ARCH_OMAP2PLUS_TYPICAL
 	bool "Typical OMAP configuration"
 	default y
 	select AEABI
-	select HIGHMEM
 	select I2C
 	select I2C_OMAP
 	select MENELAUS if ARCH_OMAP2
arch/microblaze/Kconfig +6 -3
index 484ebb3baedf..c25b8185bbbd 100644
@@ -163,7 +163,8 @@ config LOWMEM_SIZE_BOOL
 
 config LOWMEM_SIZE
 	hex "Maximum low memory size (in bytes)" if LOWMEM_SIZE_BOOL
-	default "0x30000000"
+	default "0x80000000" if HIGHMEM
+	default "0x40000000"
 
 config MANUAL_RESET_VECTOR
 	hex "Microblaze reset vector address setup"
@@ -189,7 +190,8 @@ config KERNEL_START_BOOL
 
 config KERNEL_START
 	hex "Virtual address of kernel base" if KERNEL_START_BOOL
-	default "0xc0000000"
+	default "0x70000000" if HIGHMEM
+	default "0xb0000000"
 
 config TASK_SIZE_BOOL
 	bool "Set custom user task size"
@@ -203,7 +205,8 @@ config TASK_SIZE_BOOL
 
 config TASK_SIZE
 	hex "Size of user task space" if TASK_SIZE_BOOL
-	default "0x80000000"
+	default "0x70000000" if HIGHMEM
+	default "0xb0000000"
 
 config MB_MANAGER
 	bool "Support for Microblaze Manager"
arch/microblaze/configs/mmu_defconfig +0 -1
index fbbdcb394ca2..255fa7b69117 100644
@@ -15,7 +15,6 @@ CONFIG_XILINX_MICROBLAZE0_USE_FPU=2
 CONFIG_HZ_100=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE_FORCE=y
-CONFIG_HIGHMEM=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
arch/powerpc/Kconfig +11 -6
index 9537a61ebae0..1fa92ed8f28c 100644
@@ -490,6 +490,7 @@ menu "Kernel options"
 config HIGHMEM
 	bool "High memory support"
 	depends on PPC32
+	depends on PPC_BOOK3S_32 || PPC_85xx || 44x
 	select KMAP_LOCAL
 
 source "kernel/Kconfig.hz"
@@ -1190,7 +1191,8 @@ config LOWMEM_SIZE_BOOL
 
 config LOWMEM_SIZE
 	hex "Maximum low memory size (in bytes)" if LOWMEM_SIZE_BOOL
-	default "0x30000000"
+	default "0x80000000" if HIGHMEM
+	default "0x40000000"
 
 config LOWMEM_CAM_NUM_BOOL
 	bool "Set number of CAMs to use to map low memory"
@@ -1242,7 +1244,8 @@ config PAGE_OFFSET_BOOL
 
 config PAGE_OFFSET
 	hex "Virtual address of memory base" if PAGE_OFFSET_BOOL
-	default "0xc0000000"
+	default "0x70000000" if HIGHMEM
+	default "0xb0000000"
 
 config KERNEL_START_BOOL
 	bool "Set custom kernel base address"
@@ -1258,8 +1261,9 @@ config KERNEL_START_BOOL
 config KERNEL_START
 	hex "Virtual address of kernel base" if KERNEL_START_BOOL
 	default PAGE_OFFSET if PAGE_OFFSET_BOOL
-	default "0xc2000000" if CRASH_DUMP && !NONSTATIC_KERNEL
-	default "0xc0000000"
+	default "0x72000000" if HIGHMEM && CRASH_DUMP && !NONSTATIC_KERNEL
+	default "0xb2000000" if CRASH_DUMP && !NONSTATIC_KERNEL
+	default PAGE_OFFSET
 
 config PHYSICAL_START_BOOL
 	bool "Set physical address where the kernel is loaded"
@@ -1295,8 +1299,9 @@ config TASK_SIZE_BOOL
 config TASK_SIZE
 	hex "Size of user task space" if TASK_SIZE_BOOL
 	default "0x80000000" if PPC_8xx
-	default "0xb0000000" if PPC_BOOK3S_32 && EXECMEM
-	default "0xc0000000"
+	default "0x60000000" if PPC_BOOK3S_32 && EXECMEM && HIGHMEM
+	default "0xa0000000" if PPC_BOOK3S_32 && EXECMEM
+	default PAGE_OFFSET
 
 config MODULES_SIZE_BOOL
 	bool "Set custom size for modules/execmem area"
arch/powerpc/configs/44x/akebono_defconfig +0 -1
index 02e88648a2e6..992db368848f 100644
@@ -14,7 +14,6 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_PPC_47x=y
 # CONFIG_EBONY is not set
 CONFIG_AKEBONO=y
-CONFIG_HIGHMEM=y
 CONFIG_HZ_100=y
 CONFIG_IRQ_ALL_CPUS=y
 # CONFIG_COMPACTION is not set
arch/powerpc/configs/85xx/ksi8560_defconfig +0 -1
index 9cb211fb6d1e..f2ac1fc41303 100644
@@ -9,7 +9,6 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_KSI8560=y
 CONFIG_CPM2=y
 CONFIG_GEN_RTC=y
-CONFIG_HIGHMEM=y
 CONFIG_BINFMT_MISC=y
 CONFIG_MATH_EMULATION=y
 # CONFIG_SECCOMP is not set
arch/powerpc/configs/85xx/stx_gp3_defconfig +0 -1
index 0a42072fa23c..1033977711d6 100644
@@ -7,7 +7,6 @@ CONFIG_MODULES=y
 CONFIG_MODVERSIONS=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_STX_GP3=y
-CONFIG_HIGHMEM=y
 CONFIG_BINFMT_MISC=m
 CONFIG_MATH_EMULATION=y
 CONFIG_PCI=y
arch/x86/Kconfig +3 -1
index 80527299f859..b40c8fd6cac1 100644
@@ -1416,7 +1416,9 @@ config HIGHMEM4G
 
 choice
 	prompt "Memory split" if EXPERT
-	default VMSPLIT_3G
+	default VMSPLIT_2G_OPT if HIGHMEM && !X86_PAE
+	default VMSPLIT_2G if X86_PAE
+	default VMSPLIT_3G_OPT
 	depends on X86_32
 	help
 	  Select the desired split between kernel and user memory.
Signature · 1 line
2.39.5
Acked-by on v1 1/4
#2 lore raw

Re: [PATCH 1/4] arch/*: increase lowmem size to avoid highmem use

arch/x86/Kconfig config HIGHMEM4G · line 1422

Quoted 11 lines · Arnd Bergmann
arch/x86/Kconfig +3 -1
@@ -1416,7 +1416,9 @@ config HIGHMEM4G
 
 choice
 	prompt "Memory split" if EXPERT
-	default VMSPLIT_3G
+	default VMSPLIT_2G_OPT if HIGHMEM && !X86_PAE
+	default VMSPLIT_2G if X86_PAE
+	default VMSPLIT_3G_OPT
 	depends on X86_32

For simplicity, I think this can just be:

- default VMSPLIT_3G
+ default VMSPLIT_2G

I doubt the 2G vs. 2G_OPT matters in very many cases. If it does, folks can just set it in their config manually.

But, in the end, I don't this this matters all that much. If you think having x86 be consistent with ARM, for example, is more important and ARM really wants this complexity, I can live with it.

Either way:

#3 lore raw

Re: [PATCH 1/4] arch/*: increase lowmem size to avoid highmem use

Quoted 18 lines · Dave Hansen

arch/x86/Kconfig config HIGHMEM4G · line 1422

Quoted 11 lines · Arnd Bergmann
arch/x86/Kconfig +3 -1
@@ -1416,7 +1416,9 @@ config HIGHMEM4G
 
 choice
 	prompt "Memory split" if EXPERT
-	default VMSPLIT_3G
+	default VMSPLIT_2G_OPT if HIGHMEM && !X86_PAE
+	default VMSPLIT_2G if X86_PAE
+	default VMSPLIT_3G_OPT
 	depends on X86_32

For simplicity, I think this can just be:

(quoted diff) +1 -1
-	default VMSPLIT_3G
+	default VMSPLIT_2G
Quoted 6 lines

I doubt the 2G vs. 2G_OPT matters in very many cases. If it does, folks can just set it in their config manually.

But, in the end, I don't this this matters all that much. If you think having x86 be consistent with ARM, for example, is more important and ARM really wants this complexity, I can live with it.

Yes, I think we do want the default of VMSPLIT_3G_OPT for configs that have neither highmem nor lpae, otherwise the most common embedded configs go from 3072 MiB to 1792 MiB of virtual addressing, and that is much more likely to cause regressions than the 2816 MiB default.

It would be nice to not need the VMSPLIT_2G default for PAE/LPAE, but that seems like a larger change.

Arnd

#4 lore raw

Re: [PATCH 1/4] arch/*: increase lowmem size to avoid highmem use

Quoted 17 lines · Arnd Bergmann
Quoted 11 lines

For simplicity, I think this can just be:

(quoted diff) +1 -1
-	default VMSPLIT_3G
+	default VMSPLIT_2G

I doubt the 2G vs. 2G_OPT matters in very many cases. If it does, folks can just set it in their config manually.

But, in the end, I don't this this matters all that much. If you think having x86 be consistent with ARM, for example, is more important and ARM really wants this complexity, I can live with it.

Yes, I think we do want the default of VMSPLIT_3G_OPT for configs that have neither highmem nor lpae, otherwise the most common embedded configs go from 3072 MiB to 1792 MiB of virtual addressing, and that is much more likely to cause regressions than the 2816 MiB default.

Quoted 2 lines

It would be nice to not need the VMSPLIT_2G default for PAE/LPAE, but that seems like a larger change.

The only thing we'd "regress" would be someone who is repeatedly starting from scratch with a defconfig and expecting defconfig to be the same all the time. I honestly think that's highly unlikely.

If folks are upgrading and _actually_ exposed to regressions, they've got an existing config and won't be hit by these defaults at *all*. They won't actually regress.

In other words, I think we can be a lot more aggressive about defaults than with the feature set we support. I'd much rather add complexity in here for solving a real problem, like if we have armies of 32-bit x86 users constantly starting new projects from scratch and using defconfigs.

I'd _really_ like to keep the defaults as simple as possible.

#5 lore raw

Re: [PATCH 1/4] arch/*: increase lowmem size to avoid highmem use

Quoted 10 lines · Dave Hansen
Quoted 8 lines · Arnd Bergmann
Quoted 3 lines

But, in the end, I don't this this matters all that much. If you think having x86 be consistent with ARM, for example, is more important and ARM really wants this complexity, I can live with it.

Yes, I think we do want the default of VMSPLIT_3G_OPT for configs that have neither highmem nor lpae, otherwise the most common embedded configs go from 3072 MiB to 1792 MiB of virtual addressing, and that is much more likely to cause regressions than the 2816 MiB default.

Quoted 3 lines

The only thing we'd "regress" would be someone who is repeatedly starting from scratch with a defconfig and expecting defconfig to be the same all the time. I honestly think that's highly unlikely.

The entire vmsplit selection is guarded by a CONFIG_EXPERT conditional, so I would expect it to change both for embedded distros that store a project specific defconfig and for individual users that have a full .config. If someone sets CONFIG_EXPERT, they do indeed keep any previous defaults, but I'm also less worried about them.

In the Arm version, the 'choice' statement itself does not depend on CONFIG_EXPERT, but I've added 'depends on !HIGHMEM || EXPERT' in VMSPLIT_3G and VMSPLIT_3G_OPT for a similar effect.

Quoted 10 lines

If folks are upgrading and _actually_ exposed to regressions, they've got an existing config and won't be hit by these defaults at *all*. They won't actually regress.

In other words, I think we can be a lot more aggressive about defaults than with the feature set we support. I'd much rather add complexity in here for solving a real problem, like if we have armies of 32-bit x86 users constantly starting new projects from scratch and using defconfigs.

I'd _really_ like to keep the defaults as simple as possible.

I'm fine with

default VMSPLIT_2G_OPT if !X86_LPAE
default VMSPLIT_2G

and dropping the VMSPLIT_3G_OPT default for non-highmem x86 builds if you think that's better. I still think we need the special case for X86_LPAE/NX users to get to the point of having VMSPLIT_2G_OPT as the default across architectures for current HIGHMEM users that have exactly 2GB.

I honestly don't know enough about x86-32 users to have a good idea who should be optimizing for. The embedded systems (vortex86 and geode) seem to mostly have 512MB or less and no PAE, so it probably works either way. As with similar Arm configurations, these seemed like the highest priority to me.

I see there are a few rare vortex86dx3 boards and the upcoming vortex86ex3 that can have 2GB and would be using HIGHMEM=y but PAE=n today, and these really want the 2G_OPT split by default, not VMSPLIT_2G.

Hobbyists running on vintage PC systems instead may have intentionally seeked out the few machines that actually support 2GB or 3.5GB of RAM on late Pentium-M or early Atom CPUs, though most of the historic machines between the i486 and the last 32-bit desktops would likely have much less.

Arnd

#6 lore raw

Re: [PATCH 1/4] arch/*: increase lowmem size to avoid highmem use

On 12/20/25 04:17, Arnd Bergmann wrote:
...

Quoted 7 lines

I'm fine with

default VMSPLIT_2G_OPT if !X86_LPAE
default VMSPLIT_2G

and dropping the VMSPLIT_3G_OPT default for non-highmem x86 builds if you think that's better.

That's fine with me too.

#7 lore raw

Re: [PATCH 1/4] arch/*: increase lowmem size to avoid highmem use

In reply to Dave Hansen
Quoted 29 lines · Dave Hansen
Quoted 17 lines · Arnd Bergmann
Quoted 11 lines

For simplicity, I think this can just be:

(quoted diff) +1 -1
-	default VMSPLIT_3G
+	default VMSPLIT_2G

I doubt the 2G vs. 2G_OPT matters in very many cases. If it does, folks can just set it in their config manually.

But, in the end, I don't this this matters all that much. If you think having x86 be consistent with ARM, for example, is more important and ARM really wants this complexity, I can live with it.

Yes, I think we do want the default of VMSPLIT_3G_OPT for configs that have neither highmem nor lpae, otherwise the most common embedded configs go from 3072 MiB to 1792 MiB of virtual addressing, and that is much more likely to cause regressions than the 2816 MiB default.

Quoted 2 lines

It would be nice to not need the VMSPLIT_2G default for PAE/LPAE, but that seems like a larger change.

The only thing we'd "regress" would be someone who is repeatedly starting from scratch with a defconfig and expecting defconfig to be the same all the time. I honestly think that's highly unlikely.

If folks are upgrading and _actually_ exposed to regressions, they've got an existing config and won't be hit by these defaults at *all*. They won't actually regress.

Quoted 6 lines

In other words, I think we can be a lot more aggressive about defaults than with the feature set we support. I'd much rather add complexity in here for solving a real problem, like if we have armies of 32-bit x86 users constantly starting new projects from scratch and using defconfigs.

I'd _really_ like to keep the defaults as simple as possible.

I agree with that. In particular in areas where there is the chance that we could count the number of people that actually care about that with one hand (in binary ;) ).

Signature · 3 lines
Cheers

David
#8 lore raw

Re: [PATCH 1/4] arch/*: increase lowmem size to avoid highmem use

Quoted 30 lines · David Hildenbrand (Red Hat)
Quoted 29 lines · Dave Hansen
Quoted 17 lines · Arnd Bergmann
Quoted 11 lines

For simplicity, I think this can just be:

(quoted diff) +1 -1
-	default VMSPLIT_3G
+	default VMSPLIT_2G

I doubt the 2G vs. 2G_OPT matters in very many cases. If it does, folks can just set it in their config manually.

But, in the end, I don't this this matters all that much. If you think having x86 be consistent with ARM, for example, is more important and ARM really wants this complexity, I can live with it.

Yes, I think we do want the default of VMSPLIT_3G_OPT for configs that have neither highmem nor lpae, otherwise the most common embedded configs go from 3072 MiB to 1792 MiB of virtual addressing, and that is much more likely to cause regressions than the 2816 MiB default.

Quoted 2 lines

It would be nice to not need the VMSPLIT_2G default for PAE/LPAE, but that seems like a larger change.

The only thing we'd "regress" would be someone who is repeatedly starting from scratch with a defconfig and expecting defconfig to be the same all the time. I honestly think that's highly unlikely.

If folks are upgrading and _actually_ exposed to regressions, they've got an existing config and won't be hit by these defaults at *all*. They won't actually regress.

Quoted 9 lines
Quoted 6 lines

In other words, I think we can be a lot more aggressive about defaults than with the feature set we support. I'd much rather add complexity in here for solving a real problem, like if we have armies of 32-bit x86 users constantly starting new projects from scratch and using defconfigs.

I'd _really_ like to keep the defaults as simple as possible.

I agree with that. In particular in areas where there is the chance that we could count the number of people that actually care about that with one hand (in binary ;) ).

So, maximum 31? ;)

reviewer Reviewed-by on v1 1/4
#9 lore raw

Re: [PATCH 1/4] arch/*: increase lowmem size to avoid highmem use

In reply to Arnd Bergmann

Le 19/12/2025 à 17:15, Arnd Bergmann a écrit :

Quoted 123 lines

From: Arnd Bergmann <[email protected]>

Most of the common 32-bit architectures (x86, arm, powerpc) all use the default virtual memory layout that was already in place for i386 systems in the 1990s, using exactly 3GiB of user TASK_SIZE, with the upper 1GiB of addresses split between (at most 896MiB) lowmem and vmalloc.

Linux-2.3 introduced CONFIG_HIGHMEM for large x86 server machines that had 4GiB of RAM or more, with the VMSPLIT_3G/2G/1G options added in v2.6.16 for machines that had one or two gigabytes of memory but wanted to avoid the overhead from managing highmem. Over time, similar options appeared on other 32-bit architectures.

Twenty years later, it makes sense to reconsider the default settings, as the tradeoffs have changed a bit:

- Configurations with more than 2GiB have become extremely rare, as any users with large memory have moved on to 64-bit systems. There were only ever a few Laptop models in this category: Apple Powerbook G4 (2005), Macbook (2006), IBM Thinkpad X60 (2006), Arm Chromebooks based on Exynos 5800 (2014), Tegra K1 (2014) and RK3288 (2015), and manufacturer support for all of these has ended in 2020 or (much) earlier.
Embedded systems with more than 2GiB use additional SoCs of a similar vintage: Intel Atom Z5xx (2008), Freescale QorIQ (2008), Marvell Armada XP (2010), Freescale i.MX6Q (2011), LSI Axxia (2013), TI Keystone2 (2014), Renesas RZ/G1M (2015). Most boards based on these have stopped receiving kernel upgrades. Newer 32-bit chips only support smaller memory configurations, though in particular the i.MX6Q and Keystone2 families have expected support cycles past 2035. While 32-bit server installations used to support even larger memory, none of those seem to still be used in production on any architecture.

- While general-purpose distributes for 32-bit targets were common, it was rather risky to change the CONFIG_VMSPLIT setting because there is always a possibility of running into device driver bugs or applications that need a large virtual memory size. Presumably a lot of these issues have been resolved now, so most setups should be fine using a custom vmsplit instead of highmem now.

- As fewer users test highmem, the expectation is that it will increasingly break in the future, so getting users to change the vmsplit means that even if there is a bug to fix initially, it improves the situation in the long run.

- Highmem will ultimately need to be removed, at least for the page cache and most other code using it today. In a previous discussion, I had suggested doing this as early as 2029, but based on the discussions since ELC, the plan is now to leave highmem-enabled page cache as an option until at least 2029, at which point remaining users will have the choice between no longer updating kernels or using a combination of a custom vmsplit and zram/zswap. Changing the defaults now should both speed up the highmem deprecation and make it less painful for users.

- The most VM space intensive applications tend to be web browsers, specifcally Chrome/ChromeOS and Firefox. Both have now stopped providing binary updates, but Firefox can still be built from source. Testing various combinations on Debian/armhf, I found that Firefox 140 can still show complex websites with VMSPLIT_2G_OPT with and without HIGHMEM, though it failed for me both with the small address space of VMSPLIT_1G and the small lowmem of VMSPLIT_3G_OPT when HIGHMEM is disabled.
This is likely to get worse with future versions, so embedded users may still be forced to migrate to specialized browsers like WPE Webkit when HIGHMEM pagecache is finally removed.

Based on the above observations and the discussion at the kernel summit, change the defaults to the most appropriate values: use 1GiB of lowmem on non-highmem configurations, and either 2GiB or 1.75GiB of lowmem on highmem builds, depending on what is available on the architecture. As ARM_LPAE and X86_PAE builds both require a gigabyte-aligned vmsplit, those get to use VMSPLIT_2G. The result is that the majority of previous highmem users now only need lowmem. For platform specific defconfig files that are known to only support up to 1GiB of RAM, drop the CONFIG_HIGHMEM line as well as a simplification.

On PowerPC and Microblaze, the options have somewhat different names but should have the same effect. MIPS and Xtensa cannot support a larger than 512MB of lowmem but are limited to small DDR2 memory in most implementations, with MT7621 being a notable exception. ARC and C-Sky could support a configurable vmsplit in theory, but it's not clear if anyone still cares.
SPARC is currently limited to 192MB of lowmem and should get patched to behave either like arm/x86 or powerpc/microblaze to support 2GiB of lowmem.

There are likely going to be regressions from the changed defaults, in particular when hitting previously hidden device driver bugs that fail to set the correct DMA mask, or from applications that need a large virtual address space.
Ideally the in-kernel problems should all be fixable, but the previous behavior is still selectable as a fallback with CONFIG_EXPERT=y

Cc Russell King <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Madhavan Srinivasan <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Nicholas Piggin <[email protected]>
Cc Christophe Leroy (CS GROUP) <[email protected]>
Cc Michal Simek <[email protected]>
Cc Andrew Morton <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Cc Liam R. Howlett <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Nishanth Menon <[email protected]>
Cc Andreas Larsson <[email protected]>
Cc Lucas Stach <[email protected]>
Quoted 14 lines
---
  arch/arm/Kconfig                            |  5 ++++-
  arch/arm/configs/aspeed_g5_defconfig        |  1 -
  arch/arm/configs/dove_defconfig             |  2 --
  arch/arm/configs/mv78xx0_defconfig          |  2 --
  arch/arm/configs/u8500_defconfig            |  1 -
  arch/arm/configs/vt8500_v6_v7_defconfig     |  3 ---
  arch/arm/mach-omap2/Kconfig                 |  1 -
  arch/microblaze/Kconfig                     |  9 ++++++---
  arch/microblaze/configs/mmu_defconfig       |  1 -
  arch/powerpc/Kconfig                        | 17 +++++++++++------
  arch/powerpc/configs/44x/akebono_defconfig  |  1 -
  arch/powerpc/configs/85xx/ksi8560_defconfig |  1 -
  arch/powerpc/configs/85xx/stx_gp3_defconfig |  1 -

Be aware that it will likely trivialy conflict with https://lore.kernel.org/linuxppc-dev/6a2575420770d075cd090b5a316730a2ffafdee4.1766574657.git.chleroy@kernel.org/

Another point is that it will increase the overall memory usage when people activate KASAN as KASAN reserves 1/8 of RAM for lowmem memory. I think we need to look at the impact on available virtual memory, because 1/8 of 2G is 256M which is the size of the last segment shared by KASAN shadow mem and vmalloc.

Christophe

#10 lore raw

Re: [PATCH 1/4] arch/*: increase lowmem size to avoid highmem use

Le 24/12/2025 à 12:35, Christophe Leroy (CS GROUP) a écrit :

Quoted 141 lines

Le 19/12/2025 à 17:15, Arnd Bergmann a écrit :

Quoted 123 lines

From: Arnd Bergmann <[email protected]>

Most of the common 32-bit architectures (x86, arm, powerpc) all use the default virtual memory layout that was already in place for i386 systems in the 1990s, using exactly 3GiB of user TASK_SIZE, with the upper 1GiB of addresses split between (at most 896MiB) lowmem and vmalloc.

Linux-2.3 introduced CONFIG_HIGHMEM for large x86 server machines that had 4GiB of RAM or more, with the VMSPLIT_3G/2G/1G options added in v2.6.16 for machines that had one or two gigabytes of memory but wanted to avoid the overhead from managing highmem. Over time, similar options appeared on other 32-bit architectures.

Twenty years later, it makes sense to reconsider the default settings, as the tradeoffs have changed a bit:

  - Configurations with more than 2GiB have become extremely rare, as any users with large memory have moved on to 64-bit systems. There were only ever a few Laptop models in this category: Apple Powerbook G4 (2005), Macbook (2006), IBM Thinkpad X60 (2006), Arm Chromebooks based on Exynos 5800 (2014), Tegra K1 (2014) and RK3288 (2015), and manufacturer support for all of these has ended in 2020 or (much) earlier.
    Embedded systems with more than 2GiB use additional SoCs of a similar vintage: Intel Atom Z5xx (2008), Freescale QorIQ (2008), Marvell Armada XP (2010), Freescale i.MX6Q (2011), LSI Axxia (2013), TI Keystone2 (2014), Renesas RZ/G1M (2015). Most boards based on these have stopped receiving kernel upgrades. Newer 32-bit chips only support smaller memory configurations, though in particular the i.MX6Q and Keystone2 families have expected support cycles past 2035. While 32-bit server installations used to support even larger memory, none of those seem to still be used in production on any architecture.

  - While general-purpose distributes for 32-bit targets were common, it was rather risky to change the CONFIG_VMSPLIT setting because there is always a possibility of running into device driver bugs or applications that need a large virtual memory size. Presumably a lot of these issues have been resolved now, so most setups should be fine using a custom vmsplit instead of highmem now.

  - As fewer users test highmem, the expectation is that it will increasingly break in the future, so getting users to change the vmsplit means that even if there is a bug to fix initially, it improves the situation in the long run.

  - Highmem will ultimately need to be removed, at least for the page cache and most other code using it today. In a previous discussion, I had suggested doing this as early as 2029, but based on the discussions since ELC, the plan is now to leave highmem-enabled page cache as an option until at least 2029, at which point remaining users will have the choice between no longer updating kernels or using a combination of a custom vmsplit and zram/zswap. Changing the defaults now should both speed up the highmem deprecation and make it less painful for users.

  - The most VM space intensive applications tend to be web browsers, specifcally Chrome/ChromeOS and Firefox. Both have now stopped providing binary updates, but Firefox can still be built from source. Testing various combinations on Debian/armhf, I found that Firefox 140 can still show complex websites with VMSPLIT_2G_OPT with and without HIGHMEM, though it failed for me both with the small address space of VMSPLIT_1G and the small lowmem of VMSPLIT_3G_OPT when HIGHMEM is disabled.
    This is likely to get worse with future versions, so embedded users may still be forced to migrate to specialized browsers like WPE Webkit when HIGHMEM pagecache is finally removed.

Based on the above observations and the discussion at the kernel summit, change the defaults to the most appropriate values: use 1GiB of lowmem on non-highmem configurations, and either 2GiB or 1.75GiB of lowmem on highmem builds, depending on what is available on the architecture.  As ARM_LPAE and X86_PAE builds both require a gigabyte-aligned vmsplit, those get to use VMSPLIT_2G. The result is that the majority of previous highmem users now only need lowmem. For platform specific defconfig files that are known to only support up to 1GiB of RAM, drop the CONFIG_HIGHMEM line as well as a simplification.

On PowerPC and Microblaze, the options have somewhat different names but should have the same effect. MIPS and Xtensa cannot support a larger than 512MB of lowmem but are limited to small DDR2 memory in most implementations, with MT7621 being a notable exception. ARC and C-Sky could support a configurable vmsplit in theory, but it's not clear if anyone still cares.
SPARC is currently limited to 192MB of lowmem and should get patched to behave either like arm/x86 or powerpc/microblaze to support 2GiB of lowmem.

There are likely going to be regressions from the changed defaults, in particular when hitting previously hidden device driver bugs that fail to set the correct DMA mask, or from applications that need a large virtual address space.
Ideally the in-kernel problems should all be fixable, but the previous behavior is still selectable as a fallback with CONFIG_EXPERT=y

Cc Russell King <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Madhavan Srinivasan <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Nicholas Piggin <[email protected]>
Cc Christophe Leroy (CS GROUP) <[email protected]>
Cc Michal Simek <[email protected]>
Cc Andrew Morton <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Cc Liam R. Howlett <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Nishanth Menon <[email protected]>
Cc Andreas Larsson <[email protected]>
Cc Lucas Stach <[email protected]>
Quoted 14 lines

---
  arch/arm/Kconfig                            |  5 ++++- arch/arm/configs/aspeed_g5_defconfig        |  1 - arch/arm/configs/dove_defconfig             |  2 -- arch/arm/configs/mv78xx0_defconfig          |  2 -- arch/arm/configs/u8500_defconfig            |  1 - arch/arm/configs/vt8500_v6_v7_defconfig     |  3 --- arch/arm/mach-omap2/Kconfig                 |  1 - arch/microblaze/Kconfig                     |  9 ++++++--- arch/microblaze/configs/mmu_defconfig       |  1 - arch/powerpc/Kconfig                        | 17 +++++++++++------ arch/powerpc/configs/44x/akebono_defconfig  |  1 - arch/powerpc/configs/85xx/ksi8560_defconfig |  1 - arch/powerpc/configs/85xx/stx_gp3_defconfig |  1 -

Quoted 5 lines

Be aware that it will likely trivialy conflict with https:// lore.kernel.org/linuxppc- dev/6a2575420770d075cd090b5a316730a2ffafdee4.1766574657.git.chleroy@kernel.org/

Another point is that it will increase the overall memory usage when people activate KASAN as KASAN reserves 1/8 of RAM for lowmem memory. I think we need to look at the impact on available virtual memory, because 1/8 of 2G is 256M which is the size of the last segment shared by KASAN shadow mem and vmalloc.

After testing I see two problems.

First one is on powerpc e500, increasing CONFIG_LOWMEM_SIZE is not enough, CONFIG_LOWMEM_CAM_NUM also need to be increased, otherwise additional lowmem is not mapped because e500 linux port is not designed to handle additional lowmem with standard pages.

For some details see commit 49e3d8ea6248 ("powerpc/fsl_booke: Enable STRICT_KERNEL_RWX")

Second one is with KASAN, as anticipated above in my first response. With a 2G+ kernel memory space, the KASAN shadow mem is 256M+, which means we get an overlap between lowmem space [0x70000000-0xefffffff] and KASAN shadow mem [0xee000000-0xffffffff]. So when KASAN is enabled, either change CONFIG_PAGE_OFFSET and CONFIG_TASK_SIZE to 0x60000000 instead of 0x70000000, or reduce CONFIG_LOWMEM_SIZE from 0x80000000 to 0x70000000.

Christophe

#11 lore raw

PATCH 2/4 ARM: add CONFIG_VMSPLIT_2G_OPT option

In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>

Unlike x86 and powerpc, there is currently no option to use exactly 2GiB of lowmem on Arm. Since 2GiB is still a relatively common configuration on embedded systems, it makes sense to allow this to be used in non-highmem builds.

Add the Kconfig option and make this the default for non-LPAE builds with highmem enabled instead of CONFIG_VMSPLIT_2G. LPAE still requires the vmsplit to be on a gigabyte boundary, so this is only available for classic pagetables at the moment, same as CONFIG_VMSPLIT_3G_OPT.

Tested in qemu -M virt, both with and without HIGHMEM enabled.

---
 arch/arm/Kconfig | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
arch/arm/Kconfig +7 -1
index 7c0ac017e086..921ea61aa96e 100644
@@ -1009,7 +1009,8 @@ config BL_SWITCHER_DUMMY_IF
 choice
 	prompt "Memory split"
 	depends on MMU
-	default VMSPLIT_2G if HIGHMEM || ARM_LPAE
+	default VMSPLIT_2G if ARM_LPAE
+	default VMSPLIT_2G_OPT if HIGHMEM
 	default VMSPLIT_3G_OPT
 	help
 	  Select the desired split between kernel and user memory.
@@ -1026,6 +1027,9 @@ choice
 		bool "3G/1G user/kernel split (for full 1G low memory)"
 	config VMSPLIT_2G
 		bool "2G/2G user/kernel split"
+	config VMSPLIT_2G_OPT
+		depends on !ARM_LPAE
+		bool "2G/2G user/kernel split (for full 2G low memory)"
 	config VMSPLIT_1G
 		bool "1G/3G user/kernel split"
 endchoice
@@ -1034,6 +1038,7 @@ config PAGE_OFFSET
 	hex
 	default PHYS_OFFSET if !MMU
 	default 0x40000000 if VMSPLIT_1G
+	default 0x70000000 if VMSPLIT_2G_OPT
 	default 0x80000000 if VMSPLIT_2G
 	default 0xB0000000 if VMSPLIT_3G_OPT
 	default 0xC0000000
@@ -1042,6 +1047,7 @@ config KASAN_SHADOW_OFFSET
 	hex
 	depends on KASAN
 	default 0x1f000000 if PAGE_OFFSET=0x40000000
+	default 0x4f000000 if PAGE_OFFSET=0x70000000
 	default 0x5f000000 if PAGE_OFFSET=0x80000000
 	default 0x9f000000 if PAGE_OFFSET=0xC0000000
 	default 0x8f000000 if PAGE_OFFSET=0xB0000000
Signature · 1 line
2.39.5
#12 lore raw

PATCH 3/4 ARM: remove support for highmem on VIVT

In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>

As Jason Gunthorpe noticed, supporting VIVT caches adds some complications to highmem that can be avoided these days:

While all ARMv4 and ARMv5 CPUs use virtually indexed caches, they no longer really need highmem because we have practically discontinued support for large-memory configurations already. The only machines I could find anywhere for memory on ARMv5 are:

- The Intel IOP platform was used on relatively large memory configurations but we dropped kernel support in 2019 and 2022, respectively.

- The Marvell mv78xx0 platform was the initial user of Arm highmem, with the DB-78x00-BP supporting 2GB of memory. While the platform is still around, the only remaining board file is for Buffalo WLX (Terastation Duo), which has only 512MB.

- The Kirkwood platform supports 2GB, and there are actually boards with that configuration that can still work. However, there are no known users of the OpenBlocks A7, and the Freebox V6 is already using CONFIG_VMSPLIT_2G to avoid enabling highmem.

Remove the Arm specific portions here, making CONFIG_HIGHMEM conditional on modern caches.

---
 arch/arm/Kconfig                    |  1 +
 arch/arm/configs/gemini_defconfig   |  1 -
 arch/arm/configs/multi_v5_defconfig |  1 -
 arch/arm/configs/mvebu_v5_defconfig |  1 -
 arch/arm/include/asm/highmem.h      | 56 ++---------------------------
 arch/arm/mm/cache-feroceon-l2.c     | 31 ++--------------
 arch/arm/mm/cache-xsc3l2.c          | 47 +++---------------------
 arch/arm/mm/dma-mapping.c           | 12 ++-----
 arch/arm/mm/flush.c                 | 19 +++-------
 9 files changed, 16 insertions(+), 153 deletions(-)
arch/arm/Kconfig +1 -0
index 921ea61aa96e..790897a457d4 100644
@@ -1204,6 +1204,7 @@ config ARCH_SPARSEMEM_ENABLE
 config HIGHMEM
 	bool "High Memory Support"
 	depends on MMU
+	depends on !CPU_CACHE_VIVT
 	select KMAP_LOCAL
 	select KMAP_LOCAL_NON_LINEAR_PTE_ARRAY
 	help
arch/arm/configs/gemini_defconfig +0 -1
index 7b1daec630cb..1bb4f47ea3c8 100644
@@ -12,7 +12,6 @@ CONFIG_ARCH_MULTI_V4=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_GEMINI=y
 CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
 CONFIG_CMDLINE="console=ttyS0,115200n8"
 CONFIG_PM=y
 CONFIG_PARTITION_ADVANCED=y
arch/arm/configs/multi_v5_defconfig +0 -1
index 59b020e66a0b..5106fc2d2a00 100644
@@ -37,7 +37,6 @@ CONFIG_MACH_MSS2_DT=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_VERSATILE=y
 CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CPU_FREQ=y
arch/arm/configs/mvebu_v5_defconfig +0 -1
index d1742a7cae6a..ba17bd3237fb 100644
@@ -24,7 +24,6 @@ CONFIG_MACH_D2NET_DT=y
 CONFIG_MACH_NET2BIG=y
 CONFIG_MACH_MSS2_DT=y
 CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CPU_FREQ=y
arch/arm/include/asm/highmem.h +2 -54

68 lines not on this page · raw message

arch/arm/mm/cache-feroceon-l2.c +2 -29
index 2bfefb252ffd..1316b6ab295a 100644
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/highmem.h>
 #include <linux/io.h>
 #include <asm/cacheflush.h>
 #include <asm/cp15.h>
@@ -38,30 +37,6 @@
  * between which we don't want to be preempted.
  */
 
-static inline unsigned long l2_get_va(unsigned long paddr)
-{
-#ifdef CONFIG_HIGHMEM
-	/*
-	 * Because range ops can't be done on physical addresses,
-	 * we simply install a virtual mapping for it only for the
-	 * TLB lookup to occur, hence no need to flush the untouched
-	 * memory mapping afterwards (note: a cache flush may happen
-	 * in some circumstances depending on the path taken in kunmap_atomic).
-	 */
-	void *vaddr = kmap_atomic_pfn(paddr >> PAGE_SHIFT);
-	return (unsigned long)vaddr + (paddr & ~PAGE_MASK);
-#else
-	return __phys_to_virt(paddr);
-#endif
-}
-
-static inline void l2_put_va(unsigned long vaddr)
-{
-#ifdef CONFIG_HIGHMEM
-	kunmap_atomic((void *)vaddr);
-#endif
-}
-
 static inline void l2_clean_pa(unsigned long addr)
 {
 	__asm__("mcr p15, 1, %0, c15, c9, 3" : : "r" (addr));
@@ -78,14 +53,13 @@ static inline void l2_clean_pa_range(unsigned long start, unsigned long end)
 	 */
 	BUG_ON((start ^ end) >> PAGE_SHIFT);
 
-	va_start = l2_get_va(start);
+	va_start = __phys_to_virt(start);
 	va_end = va_start + (end - start);
 	raw_local_irq_save(flags);
 	__asm__("mcr p15, 1, %0, c15, c9, 4\n\t"
 		"mcr p15, 1, %1, c15, c9, 5"
 		: : "r" (va_start), "r" (va_end));
 	raw_local_irq_restore(flags);
-	l2_put_va(va_start);
 }
 
 static inline void l2_clean_inv_pa(unsigned long addr)
@@ -109,14 +83,13 @@ static inline void l2_inv_pa_range(unsigned long start, unsigned long end)
 	 */
 	BUG_ON((start ^ end) >> PAGE_SHIFT);
 
-	va_start = l2_get_va(start);
+	va_start = __phys_to_virt(start);
 	va_end = va_start + (end - start);
 	raw_local_irq_save(flags);
 	__asm__("mcr p15, 1, %0, c15, c11, 4\n\t"
 		"mcr p15, 1, %1, c15, c11, 5"
 		: : "r" (va_start), "r" (va_end));
 	raw_local_irq_restore(flags);
-	l2_put_va(va_start);
 }
 
 static inline void l2_inv_all(void)
arch/arm/mm/cache-xsc3l2.c +5 -42

106 lines not on this page · raw message

arch/arm/mm/dma-mapping.c +2 -10
index a4c765d24692..696f6f1f259e 100644
@@ -647,18 +647,10 @@ static void dma_cache_maint_page(phys_addr_t phys, size_t size,
 			if (len + offset > PAGE_SIZE)
 				len = PAGE_SIZE - offset;
 
-			if (cache_is_vipt_nonaliasing()) {
-				vaddr = kmap_atomic_pfn(pfn);
+			vaddr = kmap_atomic(phys_to_page(phys));
+			if (vaddr) {
 				op(vaddr + offset, len, dir);
 				kunmap_atomic(vaddr);
-			} else {
-				struct page *page = phys_to_page(phys);
-
-				vaddr = kmap_high_get(page);
-				if (vaddr) {
-					op(vaddr + offset, len, dir);
-					kunmap_high(page);
-				}
 			}
 		} else {
 			phys += offset;
arch/arm/mm/flush.c +4 -15
index 19470d938b23..998b75f77364 100644
@@ -208,21 +208,10 @@ void __flush_dcache_folio(struct address_space *mapping, struct folio *folio)
 					folio_size(folio));
 	} else {
 		unsigned long i;
-		if (cache_is_vipt_nonaliasing()) {
-			for (i = 0; i < folio_nr_pages(folio); i++) {
-				void *addr = kmap_local_folio(folio,
-								i * PAGE_SIZE);
-				__cpuc_flush_dcache_area(addr, PAGE_SIZE);
-				kunmap_local(addr);
-			}
-		} else {
-			for (i = 0; i < folio_nr_pages(folio); i++) {
-				void *addr = kmap_high_get(folio_page(folio, i));
-				if (addr) {
-					__cpuc_flush_dcache_area(addr, PAGE_SIZE);
-					kunmap_high(folio_page(folio, i));
-				}
-			}
+		for (i = 0; i < folio_nr_pages(folio); i++) {
+			void *addr = kmap_local_folio(folio, i * PAGE_SIZE);
+			__cpuc_flush_dcache_area(addr, PAGE_SIZE);
+			kunmap_local(addr);
 		}
 	}
 
Signature · 1 line
2.39.5
#13 lore raw

Re: [PATCH 3/4] ARM: remove support for highmem on VIVT

Quoted 29 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

As Jason Gunthorpe noticed, supporting VIVT caches adds some complications to highmem that can be avoided these days:

While all ARMv4 and ARMv5 CPUs use virtually indexed caches, they no longer really need highmem because we have practically discontinued support for large-memory configurations already. The only machines I could find anywhere for memory on ARMv5 are:

- The Intel IOP platform was used on relatively large memory configurations but we dropped kernel support in 2019 and 2022, respectively.

- The Marvell mv78xx0 platform was the initial user of Arm highmem, with the DB-78x00-BP supporting 2GB of memory. While the platform is still around, the only remaining board file is for Buffalo WLX (Terastation Duo), which has only 512MB.

- The Kirkwood platform supports 2GB, and there are actually boards with that configuration that can still work. However, there are no known users of the OpenBlocks A7, and the Freebox V6 is already using CONFIG_VMSPLIT_2G to avoid enabling highmem.

Remove the Arm specific portions here, making CONFIG_HIGHMEM conditional on modern caches.

Quoted 11 lines
---
 arch/arm/Kconfig                    |  1 +
 arch/arm/configs/gemini_defconfig   |  1 -
 arch/arm/configs/multi_v5_defconfig |  1 -
 arch/arm/configs/mvebu_v5_defconfig |  1 -
 arch/arm/include/asm/highmem.h      | 56 ++---------------------------
 arch/arm/mm/cache-feroceon-l2.c     | 31 ++--------------
 arch/arm/mm/cache-xsc3l2.c          | 47 +++---------------------
 arch/arm/mm/dma-mapping.c           | 12 ++-----
 arch/arm/mm/flush.c                 | 19 +++-------
 9 files changed, 16 insertions(+), 153 deletions(-)

This looks great, but do you think there should be a boot time crash if a VIVT and HIGHMEM are enabled, just incase?

Jason

#14 lore raw

Re: [PATCH 3/4] ARM: remove support for highmem on VIVT

Quoted 12 lines · Jason Gunthorpe
Quoted 10 lines · Arnd Bergmann
 arch/arm/Kconfig                    |  1 +
 arch/arm/configs/gemini_defconfig   |  1 -
 arch/arm/configs/multi_v5_defconfig |  1 -
 arch/arm/configs/mvebu_v5_defconfig |  1 -
 arch/arm/include/asm/highmem.h      | 56 ++---------------------------
 arch/arm/mm/cache-feroceon-l2.c     | 31 ++--------------
 arch/arm/mm/cache-xsc3l2.c          | 47 +++---------------------
 arch/arm/mm/dma-mapping.c           | 12 ++-----
 arch/arm/mm/flush.c                 | 19 +++-------
 9 files changed, 16 insertions(+), 153 deletions(-)
Quoted 2 lines

This looks great, but do you think there should be a boot time crash if a VIVT and HIGHMEM are enabled, just incase?

Do you mean in the common code or just for Arm?

We could use the Arm specific cache_is_vivt() macro, but it feels like the 'dpends on !CPU_CACHE_VIVT' Kconfig check I added is both safer and simpler.

In common code I don't see a way to detect vivt caches. There is cpu_dcache_is_aliasing(), but that also seems to cover ARM11 processors with aliasing VIPT caches, which are otherwise fine here.

Arnd

#15 lore raw

Re: [PATCH 3/4] ARM: remove support for highmem on VIVT

Quoted 13 lines · Arnd Bergmann
Quoted 12 lines · Jason Gunthorpe
Quoted 10 lines · Arnd Bergmann
 arch/arm/Kconfig                    |  1 +
 arch/arm/configs/gemini_defconfig   |  1 -
 arch/arm/configs/multi_v5_defconfig |  1 -
 arch/arm/configs/mvebu_v5_defconfig |  1 -
 arch/arm/include/asm/highmem.h      | 56 ++---------------------------
 arch/arm/mm/cache-feroceon-l2.c     | 31 ++--------------
 arch/arm/mm/cache-xsc3l2.c          | 47 +++---------------------
 arch/arm/mm/dma-mapping.c           | 12 ++-----
 arch/arm/mm/flush.c                 | 19 +++-------
 9 files changed, 16 insertions(+), 153 deletions(-)
Quoted 8 lines
Quoted 2 lines

This looks great, but do you think there should be a boot time crash if a VIVT and HIGHMEM are enabled, just incase?

Do you mean in the common code or just for Arm?

We could use the Arm specific cache_is_vivt() macro, but it feels like the 'dpends on !CPU_CACHE_VIVT' Kconfig check I added is both safer and simpler.

Okay, so maybe I'm asking if !CPU_CACHE_VIVT then the kernel fails to boot on vivt systems, maybe it already does?

It would be ARM specific, all this stuff is only for ARM32..

Jason

#16 lore raw

Re: [PATCH 3/4] ARM: remove support for highmem on VIVT

Quoted 6 lines · Jason Gunthorpe
Quoted 5 lines · Arnd Bergmann
Quoted 3 lines · Jason Gunthorpe

This looks great, but do you think there should be a boot time crash if a VIVT and HIGHMEM are enabled, just incase?

Quoted 9 lines
Quoted 5 lines

Do you mean in the common code or just for Arm?

We could use the Arm specific cache_is_vivt() macro, but it feels like the 'dpends on !CPU_CACHE_VIVT' Kconfig check I added is both safer and simpler.

Okay, so maybe I'm asking if !CPU_CACHE_VIVT then the kernel fails to boot on vivt systems, maybe it already does?

Yes, in two separate ways:

- you can build a kernel for any combination of armv4/v4t/v5 CPUs (all VIVT), or any combination of armv6/v6k/v7/v7ve/v8 CPUs (all VIPT or PIPT), but we already enforce that you cannot mix the two in any way. The two sets are sufficiently different in terms of instruction set, MMU cache and FPU that trying to boot the wrong one probably doesn't even get to the point of printing any output.

- If something changed about the assumption above, any Arm kernel still needs to enable support for each individual CPU model that you may want to boot on. Enabling a SoC family will select the CPUs used in that SoC, and enabling a CPU type selects the cache features like CPU_CACHE_VIVT. Attempting to boot on a CPU model that is not enabled in the kernel build makes it fail in setup_arch() with:

                pr_err("CPU%u: configuration botched (ID %08x), CPU halted\n",
                       smp_processor_id(), midr);
                while (1)
                        ;

     Arnd
#17 lore raw

Re: [PATCH 3/4] ARM: remove support for highmem on VIVT

In reply to Jason Gunthorpe
Quoted 17 lines · Jason Gunthorpe
Quoted 16 lines · Arnd Bergmann
Quoted 14 lines · Jason Gunthorpe
Quoted 10 lines · Arnd Bergmann
 arch/arm/Kconfig                    |  1 +
 arch/arm/configs/gemini_defconfig   |  1 -
 arch/arm/configs/multi_v5_defconfig |  1 -
 arch/arm/configs/mvebu_v5_defconfig |  1 -
 arch/arm/include/asm/highmem.h      | 56 ++---------------------------
 arch/arm/mm/cache-feroceon-l2.c     | 31 ++--------------
 arch/arm/mm/cache-xsc3l2.c          | 47 +++---------------------
 arch/arm/mm/dma-mapping.c           | 12 ++-----
 arch/arm/mm/flush.c                 | 19 +++-------
 9 files changed, 16 insertions(+), 153 deletions(-)

This looks great, but do you think there should be a boot time crash if a VIVT and HIGHMEM are enabled, just incase?

Quoted 8 lines
Quoted 5 lines

Do you mean in the common code or just for Arm?

We could use the Arm specific cache_is_vivt() macro, but it feels like the 'dpends on !CPU_CACHE_VIVT' Kconfig check I added is both safer and simpler.

Okay, so maybe I'm asking if !CPU_CACHE_VIVT then the kernel fails to boot on vivt systems, maybe it already does?

The cache modes (CPU_CACHE_xxx) are (were) selected by the processor config entries. Not having the correct processor support built in to the kernel will cause a boot failure.

Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
#18 lore raw

PATCH 4/4 mm: remove ARCH_NEEDS_KMAP_HIGH_GET

In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>

Arm has stopped setting ARCH_NEEDS_KMAP_HIGH_GET, so this is handled using the same wrappers across all architectures now, which leaves room for simplification.

Replace lock_kmap()/unlock_kmap() with open-coded spinlocks and drop the now empty arch_kmap_local_high_get() and kmap_high_unmap_local() helpers.

---
 mm/highmem.c | 100 ++++++---------------------------------------------
 1 file changed, 10 insertions(+), 90 deletions(-)
mm/highmem.c +10 -90
index b5c8e4c2d5d4..bdeec56471c9 100644
@@ -143,25 +143,6 @@ static  __cacheline_aligned_in_smp DEFINE_SPINLOCK(kmap_lock);
 
 pte_t *pkmap_page_table;
 
-/*
- * Most architectures have no use for kmap_high_get(), so let's abstract
- * the disabling of IRQ out of the locking in that case to save on a
- * potential useless overhead.
- */
-#ifdef ARCH_NEEDS_KMAP_HIGH_GET
-#define lock_kmap()             spin_lock_irq(&kmap_lock)
-#define unlock_kmap()           spin_unlock_irq(&kmap_lock)
-#define lock_kmap_any(flags)    spin_lock_irqsave(&kmap_lock, flags)
-#define unlock_kmap_any(flags)  spin_unlock_irqrestore(&kmap_lock, flags)
-#else
-#define lock_kmap()             spin_lock(&kmap_lock)
-#define unlock_kmap()           spin_unlock(&kmap_lock)
-#define lock_kmap_any(flags)    \
-		do { spin_lock(&kmap_lock); (void)(flags); } while (0)
-#define unlock_kmap_any(flags)  \
-		do { spin_unlock(&kmap_lock); (void)(flags); } while (0)
-#endif
-
 struct page *__kmap_to_page(void *vaddr)
 {
 	unsigned long base = (unsigned long) vaddr & PAGE_MASK;
@@ -237,9 +218,9 @@ static void flush_all_zero_pkmaps(void)
 
 void __kmap_flush_unused(void)
 {
-	lock_kmap();
+	spin_lock(&kmap_lock);
 	flush_all_zero_pkmaps();
-	unlock_kmap();
+	spin_unlock(&kmap_lock);
 }
 
 static inline unsigned long map_new_virtual(struct page *page)
@@ -273,10 +254,10 @@ static inline unsigned long map_new_virtual(struct page *page)
 
 			__set_current_state(TASK_UNINTERRUPTIBLE);
 			add_wait_queue(pkmap_map_wait, &wait);
-			unlock_kmap();
+			spin_unlock(&kmap_lock);
 			schedule();
 			remove_wait_queue(pkmap_map_wait, &wait);
-			lock_kmap();
+			spin_lock(&kmap_lock);
 
 			/* Somebody else might have mapped it while we slept */
 			if (page_address(page))
@@ -312,60 +293,32 @@ void *kmap_high(struct page *page)
 	 * For highmem pages, we can't trust "virtual" until
 	 * after we have the lock.
 	 */
-	lock_kmap();
+	spin_lock(&kmap_lock);
 	vaddr = (unsigned long)page_address(page);
 	if (!vaddr)
 		vaddr = map_new_virtual(page);
 	pkmap_count[PKMAP_NR(vaddr)]++;
 	BUG_ON(pkmap_count[PKMAP_NR(vaddr)] < 2);
-	unlock_kmap();
+	spin_unlock(&kmap_lock);
 	return (void *) vaddr;
 }
 EXPORT_SYMBOL(kmap_high);
 
-#ifdef ARCH_NEEDS_KMAP_HIGH_GET
-/**
- * kmap_high_get - pin a highmem page into memory
- * @page: &struct page to pin
- *
- * Returns the page's current virtual memory address, or NULL if no mapping
- * exists.  If and only if a non null address is returned then a
- * matching call to kunmap_high() is necessary.
- *
- * This can be called from any context.
- */
-void *kmap_high_get(const struct page *page)
-{
-	unsigned long vaddr, flags;
-
-	lock_kmap_any(flags);
-	vaddr = (unsigned long)page_address(page);
-	if (vaddr) {
-		BUG_ON(pkmap_count[PKMAP_NR(vaddr)] < 1);
-		pkmap_count[PKMAP_NR(vaddr)]++;
-	}
-	unlock_kmap_any(flags);
-	return (void *) vaddr;
-}
-#endif
-
 /**
  * kunmap_high - unmap a highmem page into memory
  * @page: &struct page to unmap
  *
- * If ARCH_NEEDS_KMAP_HIGH_GET is not defined then this may be called
- * only from user context.
+ * This may be called only from user context.
  */
 void kunmap_high(const struct page *page)
 {
 	unsigned long vaddr;
 	unsigned long nr;
-	unsigned long flags;
 	int need_wakeup;
 	unsigned int color = get_pkmap_color(page);
 	wait_queue_head_t *pkmap_map_wait;
 
-	lock_kmap_any(flags);
+	spin_lock(&kmap_lock);
 	vaddr = (unsigned long)page_address(page);
 	BUG_ON(!vaddr);
 	nr = PKMAP_NR(vaddr);
@@ -392,7 +345,7 @@ void kunmap_high(const struct page *page)
 		pkmap_map_wait = get_pkmap_wait_queue_head(color);
 		need_wakeup = waitqueue_active(pkmap_map_wait);
 	}
-	unlock_kmap_any(flags);
+	spin_unlock(&kmap_lock);
 
 	/* do wake-up, if needed, race-free outside of the spin lock */
 	if (need_wakeup)
@@ -507,30 +460,11 @@ static inline void kmap_local_idx_pop(void)
 #define arch_kmap_local_unmap_idx(idx, vaddr)	kmap_local_calc_idx(idx)
 #endif
 
-#ifndef arch_kmap_local_high_get
-static inline void *arch_kmap_local_high_get(const struct page *page)
-{
-	return NULL;
-}
-#endif
-
 #ifndef arch_kmap_local_set_pte
 #define arch_kmap_local_set_pte(mm, vaddr, ptep, ptev)	\
 	set_pte_at(mm, vaddr, ptep, ptev)
 #endif
 
-/* Unmap a local mapping which was obtained by kmap_high_get() */
-static inline bool kmap_high_unmap_local(unsigned long vaddr)
-{
-#ifdef ARCH_NEEDS_KMAP_HIGH_GET
-	if (vaddr >= PKMAP_ADDR(0) && vaddr < PKMAP_ADDR(LAST_PKMAP)) {
-		kunmap_high(pte_page(ptep_get(&pkmap_page_table[PKMAP_NR(vaddr)])));
-		return true;
-	}
-#endif
-	return false;
-}
-
 static pte_t *__kmap_pte;
 
 static pte_t *kmap_get_pte(unsigned long vaddr, int idx)
@@ -574,8 +508,6 @@ EXPORT_SYMBOL_GPL(__kmap_local_pfn_prot);
 
 void *__kmap_local_page_prot(const struct page *page, pgprot_t prot)
 {
-	void *kmap;
-
 	/*
 	 * To broaden the usage of the actual kmap_local() machinery always map
 	 * pages when debugging is enabled and the architecture has no problems
@@ -584,11 +516,6 @@ void *__kmap_local_page_prot(const struct page *page, pgprot_t prot)
 	if (!IS_ENABLED(CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP) && !PageHighMem(page))
 		return page_address(page);
 
-	/* Try kmap_high_get() if architecture has it enabled */
-	kmap = arch_kmap_local_high_get(page);
-	if (kmap)
-		return kmap;
-
 	return __kmap_local_pfn_prot(page_to_pfn(page), prot);
 }
 EXPORT_SYMBOL(__kmap_local_page_prot);
@@ -606,14 +533,7 @@ void kunmap_local_indexed(const void *vaddr)
 			WARN_ON_ONCE(1);
 			return;
 		}
-		/*
-		 * Handle mappings which were obtained by kmap_high_get()
-		 * first as the virtual address of such mappings is below
-		 * PAGE_OFFSET. Warn for all other addresses which are in
-		 * the user space part of the virtual address space.
-		 */
-		if (!kmap_high_unmap_local(addr))
-			WARN_ON_ONCE(addr < PAGE_OFFSET);
+		WARN_ON_ONCE(addr < PAGE_OFFSET);
 		return;
 	}
 
Signature · 1 line
2.39.5