Skip to content

arm64: Enable LPA2 support for 4k and 16k pages

Ard Biesheuvel linux-arm-kernel lkml 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest19 patches 24 repliesIn review
  2. v1 RFC7 patches 5 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/19arm64/mm: Simplify and document pte_to_phys() for 52 bit addressesarch/arm64/include/asm/assembler.h arch/arm64/include/asm/pgtable-hwdef.h arch/arm64/include/asm/pgtable.h+6 -70 replies
2/19arm64/mm: Add FEAT_LPA2 specific TCR_EL1.DS fieldarch/arm64/include/asm/pgtable-hwdef.h+1 -00 replies
3/19arm64/mm: Add FEAT_LPA2 specific ID_AA64MMFR0.TGRAN[2]arch/arm64/include/asm/sysreg.h+2 -00 replies
4/19arm64: kaslr: Adjust randomization range dynamicallyarch/arm64/kernel/pi/kaslr_early.c arch/arm64/mm/mmu.c+23 -210 replies
5/19arm64: mm: get rid of kimage_vaddr global variablearch/arm64/include/asm/memory.h arch/arm64/kernel/head.S arch/arm64/mm/mmu.c+3 -80 replies
6/19arm64: head: remove order argument from early mapping routinearch/arm64/kernel/head.S+11 -150 replies
7/19arm64: mm: Handle LVA support as a CPU featurearch/arm64/include/asm/memory.h arch/arm64/kernel/cpufeature.c arch/arm64/kernel/head.S +5 more+49 -391 reply
8/19arm64: mm: Deal with potential ID map extension if VA_BITS > VA_BITS_MINarch/arm64/include/asm/kernel-pgtable.h arch/arm64/kernel/head.S arch/arm64/mm/mmu.c +1 more+26 -250 replies
9/19arm64: mm: Add feature override support for LVAarch/arm64/include/asm/assembler.h arch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpufeature.c +3 more+50 -100 replies
10/19arm64: mm: Wire up TCR.DS bit to PTE shareability fieldsarch/arm64/Kconfig arch/arm64/include/asm/pgtable-prot.h arch/arm64/mm/mmap.c +1 more+32 -20 replies
11/19arm64: mm: Add LPA2 support to phys<->pte conversion routinesarch/arm64/include/asm/assembler.h arch/arm64/include/asm/pgtable-hwdef.h arch/arm64/include/asm/pgtable.h +1 more+20 -190 replies
12/19arm64: mm: Add definitions to support 5 levels of pagingarch/arm64/include/asm/pgalloc.h arch/arm64/include/asm/pgtable-hwdef.h arch/arm64/include/asm/pgtable-types.h +3 more+181 -96 replies
13/19arm64: mm: add 5 level paging support to G-to-nG conversion routinearch/arm64/kernel/cpufeature.c arch/arm64/mm/proc.S+44 -50 replies
14/19arm64: Enable LPA2 at boot if supported by the systemarch/arm64/include/asm/assembler.h arch/arm64/include/asm/kernel-pgtable.h arch/arm64/include/asm/memory.h +6 more+151 -131 reply
15/19arm64: mm: Add 5 level paging support to fixmap and swapper handlingarch/arm64/include/asm/fixmap.h arch/arm64/include/asm/pgtable.h arch/arm64/mm/mmu.c+91 -90 replies
16/19arm64: kasan: Reduce minimum shadow alignment and enable 5 level pagingarch/arm64/Kconfig arch/arm64/mm/kasan_init.c+112 -141 reply
17/19arm64: mm: Add support for folding PUDs at runtimearch/arm64/include/asm/pgalloc.h arch/arm64/include/asm/pgtable.h arch/arm64/include/asm/tlb.h +3 more+87 -140 replies
18/19arm64: ptdump: Disregard unaddressable VA spacearch/arm64/mm/ptdump.c+3 -10 replies
19/19arm64: Enable 52-bit virtual addressing for 4k and 16k granule configsarch/arm64/Kconfig arch/arm64/kernel/cpufeature.c+28 -110 replies

Reviews trailers per patch

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

PatchArd BiesheuvelCatalin Marinas
1/19R-b
2/19A-b
3/19A-b
4/19
5/19
6/19
7/19
8/19
9/19
10/19
11/19
12/19
13/19
14/19
15/19
16/19
17/19
18/19
19/19

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 00/19] arm64: Enable LPA2 support for 4k and 16k pages

Enable support for LPA2 when running with 4k or 16k pages. In the former case, this requires 5 level paging with a runtime fallback to 4 on non-LPA2 hardware. For consistency, the same approach is adopted for 16k pages, where we fall back to 3 level paging (47 bit virtual addressing) on non-LPA2 configurations. (Falling back to 48 bits would involve finding a workaround for the fact that we cannot construct a level 0 table covering 52 bits of VA space that appears aligned to its size in memory, and has the top 2 entries that represent the 48-bit region appearing at an alignment of 64 bytes, which is required by the architecture for TTBR address values. Also, using an additional level of paging to translate a single VA bit is wasteful in terms of TLB efficiency)

This means support for falling back to 3 levels of paging at runtime when configured for 4 is also needed.

Another thing worth to note is that the repurposed physical address bits in the page table descriptors were not RES0 before, and so there is now a big global switch (called TCR.DS) which controls how all page table descriptors are interpreted. This requires some extra care in the PTE conversion helpers, and additional handling in the boot code to ensure that we set TCR.DS safely if supported (and not overridden)

Note that this series is mostly orthogonal to work by Anshuman done last
year: this series assumes that 52-bit physical addressing is never needed to map the kernel image itself, and therefore that we never need ID map range extension to cover the kernel with a 5th level when running with 4. And given that the LPA2 architectural feature covers both the virtual and physical range extensions, where enabling the latter is required to enable the former, we can simplify things further by only enabling them as a pair. (I.e., 52-bit physical addressing cannot be enabled for 48-bit VA space or smaller)

This series applies onto some of my previous work that is still in flight, so these patches will not apply in isolation. Complete branch can be found here:
https://git.kernel.org/pub/scm/linux/kernel/git/ardb/linux.git/log/?h=arm64-4k-lpa2

It supersedes the RFC v1 I sent out last week, which covered 16k pages only. It also supersedes some related work I sent out in isolation before:

[PATCH] arm64: mm: Enable KASAN for 16k/48-bit VA configurations [PATCH 0/3] arm64: mm: Model LVA support as a CPU feature

Tested on QEMU with -cpu max and lpa2 both off and on, as well as using the arm64.nolva override kernel command line parameter. Note that this requires a QEMU built from the latest sources.

Cc Marc Zyngier <[email protected]>
Cc Will Deacon <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Kees Cook <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Mark Brown <[email protected]>
Cc Anshuman Khandual <[email protected]>
Cc Richard Henderson <[email protected]>
Cc Ryan Roberts <[email protected]>

Anshuman Khandual (3):
arm64/mm: Simplify and document pte_to_phys() for 52 bit addresses arm64/mm: Add FEAT_LPA2 specific TCR_EL1.DS field arm64/mm: Add FEAT_LPA2 specific ID_AA64MMFR0.TGRAN[2]

Ard Biesheuvel (16):
arm64: kaslr: Adjust randomization range dynamically
arm64: mm: get rid of kimage_vaddr global variable
arm64: head: remove order argument from early mapping routine
arm64: mm: Handle LVA support as a CPU feature
arm64: mm: Deal with potential ID map extension if VA_BITS >
VA_BITS_MIN
arm64: mm: Add feature override support for LVA
arm64: mm: Wire up TCR.DS bit to PTE shareability fields
arm64: mm: Add LPA2 support to phys<->pte conversion routines
arm64: mm: Add definitions to support 5 levels of paging
arm64: mm: add 5 level paging support to G-to-nG conversion routine
arm64: Enable LPA2 at boot if supported by the system
arm64: mm: Add 5 level paging support to fixmap and swapper handling
arm64: kasan: Reduce minimum shadow alignment and enable 5 level
paging
arm64: mm: Add support for folding PUDs at runtime
arm64: ptdump: Disregard unaddressable VA space
arm64: Enable 52-bit virtual addressing for 4k and 16k granule configs

 arch/arm64/Kconfig                      |  23 ++-
 arch/arm64/include/asm/assembler.h      |  42 ++---
 arch/arm64/include/asm/cpufeature.h     |   2 +
 arch/arm64/include/asm/fixmap.h         |   1 +
 arch/arm64/include/asm/kernel-pgtable.h |  27 ++-
 arch/arm64/include/asm/memory.h         |  23 ++-
 arch/arm64/include/asm/pgalloc.h        |  53 +++++-
 arch/arm64/include/asm/pgtable-hwdef.h  |  34 +++-
 arch/arm64/include/asm/pgtable-prot.h   |  18 +-
 arch/arm64/include/asm/pgtable-types.h  |   6 +
 arch/arm64/include/asm/pgtable.h        | 197 ++++++++++++++++++--
 arch/arm64/include/asm/sysreg.h         |   2 +
 arch/arm64/include/asm/tlb.h            |   3 +-
 arch/arm64/kernel/cpufeature.c          |  46 ++++-
 arch/arm64/kernel/head.S                |  99 +++++-----
 arch/arm64/kernel/image-vars.h          |   4 +
 arch/arm64/kernel/pi/idreg-override.c   |  29 ++-
 arch/arm64/kernel/pi/kaslr_early.c      |  23 ++-
 arch/arm64/kernel/pi/map_kernel.c       | 115 +++++++++++-
 arch/arm64/kernel/sleep.S               |   3 -
 arch/arm64/mm/init.c                    |   2 +-
 arch/arm64/mm/kasan_init.c              | 124 ++++++++++--
 arch/arm64/mm/mmap.c                    |   4 +
 arch/arm64/mm/mmu.c                     | 138 ++++++++++----
 arch/arm64/mm/pgd.c                     |  17 +-
 arch/arm64/mm/proc.S                    |  76 +++++++-
 arch/arm64/mm/ptdump.c                  |   4 +-
 arch/arm64/tools/cpucaps                |   1 +
 28 files changed, 907 insertions(+), 209 deletions(-)
Signature · 7 lines
2.38.1.584.g0f3c55d4c2-goog


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel