[PATCH v3 6/6] arm64/mm: Drop configurable 48-bit physical address space limit
Klara Modin
klarasmodin at gmail.com
Fri Dec 20 15:39:19 PST 2024
Hi,
On 2024-12-12 09:18, Ard Biesheuvel wrote:
> From: Ard Biesheuvel <ardb at kernel.org>
>
> Currently, the maximum supported physical address space can be
> configured as either 48 bits or 52 bits. The only remaining difference
> between these in practice is that the former omits the masking and
> shifting required to construct TTBR and PTE values, which carry bits #48
> and higher disjoint from the rest of the physical address.
>
> The overhead of performing these additional calculations is negligible,
> and so there is little reason to retain support for two different
> configurations, and we can simply support whatever the hardware
> supports.
>
With this patch (32d053d6f5e92efd82349e7c481cba5a43dc1a22 in
next-20241220), my Raspberry Pi 3 won't boot unless I set it to use
52-bit virtual address space (i.e. neither 39 or 48 work with a 4 KiB
page size), nothing appears on the serial console. I didn't see anyghing
suspicious in the kernel log for the 52-bit case but I attached it as I
don't exactly have much else.
I see that 52 bit physical address space previously depended on either
64 KiB pages or 52 bit virtual address space, could that be related?
Please let me know if there's anything else you need.
Regards,
Klara Modin
> Signed-off-by: Ard Biesheuvel <ardb at kernel.org>
> ---
> arch/arm64/Kconfig | 31 +-------------------
> arch/arm64/include/asm/assembler.h | 13 ++------
> arch/arm64/include/asm/cpufeature.h | 3 +-
> arch/arm64/include/asm/kvm_pgtable.h | 3 +-
> arch/arm64/include/asm/pgtable-hwdef.h | 6 +---
> arch/arm64/include/asm/pgtable-prot.h | 4 +--
> arch/arm64/include/asm/pgtable.h | 11 +------
> arch/arm64/include/asm/sysreg.h | 6 ----
> arch/arm64/mm/pgd.c | 9 +++---
> arch/arm64/mm/proc.S | 2 --
> scripts/gdb/linux/constants.py.in | 1 -
> tools/arch/arm64/include/asm/sysreg.h | 6 ----
> 12 files changed, 14 insertions(+), 81 deletions(-)
>
> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
> index c1ca21adddc1..7ebd0ba32a32 100644
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@ -1416,38 +1416,9 @@ config ARM64_VA_BITS
> default 48 if ARM64_VA_BITS_48
> default 52 if ARM64_VA_BITS_52
>
> -choice
> - prompt "Physical address space size"
> - default ARM64_PA_BITS_48
> - help
> - Choose the maximum physical address range that the kernel will
> - support.
> -
> -config ARM64_PA_BITS_48
> - bool "48-bit"
> - depends on ARM64_64K_PAGES || !ARM64_VA_BITS_52
> -
> -config ARM64_PA_BITS_52
> - bool "52-bit"
> - depends on ARM64_64K_PAGES || ARM64_VA_BITS_52
> - help
> - Enable support for a 52-bit physical address space, introduced as
> - part of the ARMv8.2-LPA extension.
> -
> - With this enabled, the kernel will also continue to work on CPUs that
> - do not support ARMv8.2-LPA, but with some added memory overhead (and
> - minor performance overhead).
> -
> -endchoice
> -
> -config ARM64_PA_BITS
> - int
> - default 48 if ARM64_PA_BITS_48
> - default 52 if ARM64_PA_BITS_52
> -
> config ARM64_LPA2
> def_bool y
> - depends on ARM64_PA_BITS_52 && !ARM64_64K_PAGES
> + depends on !ARM64_64K_PAGES
>
> choice
> prompt "Endianness"
> diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
> index ad63457a05c5..01a1e3c16283 100644
> --- a/arch/arm64/include/asm/assembler.h
> +++ b/arch/arm64/include/asm/assembler.h
> @@ -342,14 +342,13 @@ alternative_cb_end
> mrs \tmp0, ID_AA64MMFR0_EL1
> // Narrow PARange to fit the PS field in TCR_ELx
> ubfx \tmp0, \tmp0, #ID_AA64MMFR0_EL1_PARANGE_SHIFT, #3
> - mov \tmp1, #ID_AA64MMFR0_EL1_PARANGE_MAX
> #ifdef CONFIG_ARM64_LPA2
> alternative_if_not ARM64_HAS_VA52
> mov \tmp1, #ID_AA64MMFR0_EL1_PARANGE_48
> -alternative_else_nop_endif
> -#endif
> cmp \tmp0, \tmp1
> csel \tmp0, \tmp1, \tmp0, hi
> +alternative_else_nop_endif
> +#endif
> bfi \tcr, \tmp0, \pos, #3
> .endm
>
> @@ -599,21 +598,13 @@ alternative_endif
> * ttbr: returns the TTBR value
> */
> .macro phys_to_ttbr, ttbr, phys
> -#ifdef CONFIG_ARM64_PA_BITS_52
> orr \ttbr, \phys, \phys, lsr #46
> and \ttbr, \ttbr, #TTBR_BADDR_MASK_52
> -#else
> - mov \ttbr, \phys
> -#endif
> .endm
>
> .macro phys_to_pte, pte, phys
> -#ifdef CONFIG_ARM64_PA_BITS_52
> orr \pte, \phys, \phys, lsr #PTE_ADDR_HIGH_SHIFT
> and \pte, \pte, #PHYS_TO_PTE_ADDR_MASK
> -#else
> - mov \pte, \phys
> -#endif
> .endm
>
> /*
> diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
> index b64e49bd9d10..ed327358e734 100644
> --- a/arch/arm64/include/asm/cpufeature.h
> +++ b/arch/arm64/include/asm/cpufeature.h
> @@ -885,9 +885,8 @@ static inline u32 id_aa64mmfr0_parange_to_phys_shift(int parange)
> * However, by the "D10.1.4 Principles of the ID scheme
> * for fields in ID registers", ARM DDI 0487C.a, any new
> * value is guaranteed to be higher than what we know already.
> - * As a safe limit, we return the limit supported by the kernel.
> */
> - default: return CONFIG_ARM64_PA_BITS;
> + default: return 52;
> }
> }
>
> diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/kvm_pgtable.h
> index aab04097b505..525aef178cb4 100644
> --- a/arch/arm64/include/asm/kvm_pgtable.h
> +++ b/arch/arm64/include/asm/kvm_pgtable.h
> @@ -30,8 +30,7 @@
>
> static inline u64 kvm_get_parange_max(void)
> {
> - if (kvm_lpa2_is_enabled() ||
> - (IS_ENABLED(CONFIG_ARM64_PA_BITS_52) && PAGE_SHIFT == 16))
> + if (kvm_lpa2_is_enabled() || PAGE_SHIFT == 16)
> return ID_AA64MMFR0_EL1_PARANGE_52;
> else
> return ID_AA64MMFR0_EL1_PARANGE_48;
> diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
> index a9136cc551cc..9b34180042b2 100644
> --- a/arch/arm64/include/asm/pgtable-hwdef.h
> +++ b/arch/arm64/include/asm/pgtable-hwdef.h
> @@ -176,7 +176,6 @@
> #define PTE_SWBITS_MASK _AT(pteval_t, (BIT(63) | GENMASK(58, 55)))
>
> #define PTE_ADDR_LOW (((_AT(pteval_t, 1) << (50 - PAGE_SHIFT)) - 1) << PAGE_SHIFT)
> -#ifdef CONFIG_ARM64_PA_BITS_52
> #ifdef CONFIG_ARM64_64K_PAGES
> #define PTE_ADDR_HIGH (_AT(pteval_t, 0xf) << 12)
> #define PTE_ADDR_HIGH_SHIFT 36
> @@ -186,7 +185,6 @@
> #define PTE_ADDR_HIGH_SHIFT 42
> #define PHYS_TO_PTE_ADDR_MASK GENMASK_ULL(49, 8)
> #endif
> -#endif
>
> /*
> * AttrIndx[2:0] encoding (mapping attributes defined in the MAIR* registers).
> @@ -327,12 +325,10 @@
> /*
> * TTBR.
> */
> -#ifdef CONFIG_ARM64_PA_BITS_52
> /*
> - * TTBR_ELx[1] is RES0 in this configuration.
> + * TTBR_ELx[1] is RES0 when using 52-bit physical addressing
> */
> #define TTBR_BADDR_MASK_52 GENMASK_ULL(47, 2)
> -#endif
>
> #ifdef CONFIG_ARM64_VA_BITS_52
> /* Must be at least 64-byte aligned to prevent corruption of the TTBR */
> diff --git a/arch/arm64/include/asm/pgtable-prot.h b/arch/arm64/include/asm/pgtable-prot.h
> index a95f1f77bb39..b73acf25341f 100644
> --- a/arch/arm64/include/asm/pgtable-prot.h
> +++ b/arch/arm64/include/asm/pgtable-prot.h
> @@ -81,7 +81,7 @@ extern unsigned long prot_ns_shared;
> #define lpa2_is_enabled() false
> #define PTE_MAYBE_SHARED PTE_SHARED
> #define PMD_MAYBE_SHARED PMD_SECT_S
> -#define PHYS_MASK_SHIFT (CONFIG_ARM64_PA_BITS)
> +#define PHYS_MASK_SHIFT (52)
> #else
> static inline bool __pure lpa2_is_enabled(void)
> {
> @@ -90,7 +90,7 @@ static inline bool __pure lpa2_is_enabled(void)
>
> #define PTE_MAYBE_SHARED (lpa2_is_enabled() ? 0 : PTE_SHARED)
> #define PMD_MAYBE_SHARED (lpa2_is_enabled() ? 0 : PMD_SECT_S)
> -#define PHYS_MASK_SHIFT (lpa2_is_enabled() ? CONFIG_ARM64_PA_BITS : 48)
> +#define PHYS_MASK_SHIFT (lpa2_is_enabled() ? 52 : 48)
> #endif
>
> /*
> diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
> index 6986345b537a..ec8124d66b9c 100644
> --- a/arch/arm64/include/asm/pgtable.h
> +++ b/arch/arm64/include/asm/pgtable.h
> @@ -69,10 +69,9 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
> pr_err("%s:%d: bad pte %016llx.\n", __FILE__, __LINE__, pte_val(e))
>
> /*
> - * Macros to convert between a physical address and its placement in a
> + * Helpers to convert between a physical address and its placement in a
> * page table entry, taking care of 52-bit addresses.
> */
> -#ifdef CONFIG_ARM64_PA_BITS_52
> static inline phys_addr_t __pte_to_phys(pte_t pte)
> {
> pte_val(pte) &= ~PTE_MAYBE_SHARED;
> @@ -83,10 +82,6 @@ static inline pteval_t __phys_to_pte_val(phys_addr_t phys)
> {
> return (phys | (phys >> PTE_ADDR_HIGH_SHIFT)) & PHYS_TO_PTE_ADDR_MASK;
> }
> -#else
> -#define __pte_to_phys(pte) (pte_val(pte) & PTE_ADDR_LOW)
> -#define __phys_to_pte_val(phys) (phys)
> -#endif
>
> #define pte_pfn(pte) (__pte_to_phys(pte) >> PAGE_SHIFT)
> #define pfn_pte(pfn,prot) \
> @@ -1495,11 +1490,7 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf,
> update_mmu_cache_range(NULL, vma, addr, ptep, 1)
> #define update_mmu_cache_pmd(vma, address, pmd) do { } while (0)
>
> -#ifdef CONFIG_ARM64_PA_BITS_52
> #define phys_to_ttbr(addr) (((addr) | ((addr) >> 46)) & TTBR_BADDR_MASK_52)
> -#else
> -#define phys_to_ttbr(addr) (addr)
> -#endif
>
> /*
> * On arm64 without hardware Access Flag, copying from user will fail because
> diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
> index b8303a83c0bf..f902893ec903 100644
> --- a/arch/arm64/include/asm/sysreg.h
> +++ b/arch/arm64/include/asm/sysreg.h
> @@ -916,12 +916,6 @@
> #define ID_AA64MMFR0_EL1_TGRAN_2_SUPPORTED_LPA2 0x3
> #define ID_AA64MMFR0_EL1_TGRAN_2_SUPPORTED_MAX 0x7
>
> -#ifdef CONFIG_ARM64_PA_BITS_52
> -#define ID_AA64MMFR0_EL1_PARANGE_MAX ID_AA64MMFR0_EL1_PARANGE_52
> -#else
> -#define ID_AA64MMFR0_EL1_PARANGE_MAX ID_AA64MMFR0_EL1_PARANGE_48
> -#endif
> -
> #if defined(CONFIG_ARM64_4K_PAGES)
> #define ID_AA64MMFR0_EL1_TGRAN_SHIFT ID_AA64MMFR0_EL1_TGRAN4_SHIFT
> #define ID_AA64MMFR0_EL1_TGRAN_LPA2 ID_AA64MMFR0_EL1_TGRAN4_52_BIT
> diff --git a/arch/arm64/mm/pgd.c b/arch/arm64/mm/pgd.c
> index 0c501cabc238..8722ab6d4b1c 100644
> --- a/arch/arm64/mm/pgd.c
> +++ b/arch/arm64/mm/pgd.c
> @@ -48,20 +48,21 @@ void pgd_free(struct mm_struct *mm, pgd_t *pgd)
>
> void __init pgtable_cache_init(void)
> {
> + unsigned int pgd_size = PGD_SIZE;
> +
> if (pgdir_is_page_size())
> return;
>
> -#ifdef CONFIG_ARM64_PA_BITS_52
> /*
> * With 52-bit physical addresses, the architecture requires the
> * top-level table to be aligned to at least 64 bytes.
> */
> - BUILD_BUG_ON(PGD_SIZE < 64);
> -#endif
> + if (PHYS_MASK_SHIFT >= 52)
> + pgd_size = max(pgd_size, 64);
>
> /*
> * Naturally aligned pgds required by the architecture.
> */
> - pgd_cache = kmem_cache_create("pgd_cache", PGD_SIZE, PGD_SIZE,
> + pgd_cache = kmem_cache_create("pgd_cache", pgd_size, pgd_size,
> SLAB_PANIC, NULL);
> }
> diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
> index b8edc5765441..51ed0e9d0a0d 100644
> --- a/arch/arm64/mm/proc.S
> +++ b/arch/arm64/mm/proc.S
> @@ -197,10 +197,8 @@ SYM_FUNC_ALIAS(__pi_idmap_cpu_replace_ttbr1, idmap_cpu_replace_ttbr1)
>
> .macro pte_to_phys, phys, pte
> and \phys, \pte, #PTE_ADDR_LOW
> -#ifdef CONFIG_ARM64_PA_BITS_52
> and \pte, \pte, #PTE_ADDR_HIGH
> orr \phys, \phys, \pte, lsl #PTE_ADDR_HIGH_SHIFT
> -#endif
> .endm
>
> .macro kpti_mk_tbl_ng, type, num_entries
> diff --git a/scripts/gdb/linux/constants.py.in b/scripts/gdb/linux/constants.py.in
> index fd6bd69c5096..05034c0b8fd7 100644
> --- a/scripts/gdb/linux/constants.py.in
> +++ b/scripts/gdb/linux/constants.py.in
> @@ -141,7 +141,6 @@ LX_CONFIG(CONFIG_ARM64_4K_PAGES)
> LX_CONFIG(CONFIG_ARM64_16K_PAGES)
> LX_CONFIG(CONFIG_ARM64_64K_PAGES)
> if IS_BUILTIN(CONFIG_ARM64):
> - LX_VALUE(CONFIG_ARM64_PA_BITS)
> LX_VALUE(CONFIG_ARM64_VA_BITS)
> LX_VALUE(CONFIG_PAGE_SHIFT)
> LX_VALUE(CONFIG_ARCH_FORCE_MAX_ORDER)
> diff --git a/tools/arch/arm64/include/asm/sysreg.h b/tools/arch/arm64/include/asm/sysreg.h
> index cd8420e8c3ad..daeecb1a5366 100644
> --- a/tools/arch/arm64/include/asm/sysreg.h
> +++ b/tools/arch/arm64/include/asm/sysreg.h
> @@ -574,12 +574,6 @@
> #define ID_AA64MMFR0_EL1_TGRAN_2_SUPPORTED_MIN 0x2
> #define ID_AA64MMFR0_EL1_TGRAN_2_SUPPORTED_MAX 0x7
>
> -#ifdef CONFIG_ARM64_PA_BITS_52
> -#define ID_AA64MMFR0_EL1_PARANGE_MAX ID_AA64MMFR0_EL1_PARANGE_52
> -#else
> -#define ID_AA64MMFR0_EL1_PARANGE_MAX ID_AA64MMFR0_EL1_PARANGE_48
> -#endif
> -
> #if defined(CONFIG_ARM64_4K_PAGES)
> #define ID_AA64MMFR0_EL1_TGRAN_SHIFT ID_AA64MMFR0_EL1_TGRAN4_SHIFT
> #define ID_AA64MMFR0_EL1_TGRAN_SUPPORTED_MIN ID_AA64MMFR0_EL1_TGRAN4_SUPPORTED_MIN
-------------- next part --------------
# bad: [8155b4ef3466f0e289e8fcc9e6e62f3f4dceeac2] Add linux-next specific files for 20241220
# good: [8faabc041a001140564f718dabe37753e88b37fa] Merge tag 'net-6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
git bisect start 'next/master' 'next/stable'
# bad: [d711d1b348a1574a2c24872512067d190b63fd68] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
git bisect bad d711d1b348a1574a2c24872512067d190b63fd68
# bad: [3aa602263e025bb42ca8766a16bceff287a8f0ee] Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git
git bisect bad 3aa602263e025bb42ca8766a16bceff287a8f0ee
# good: [c4262cd734f8695b217332ed2ca7237a7e753b62] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git
git bisect good c4262cd734f8695b217332ed2ca7237a7e753b62
# bad: [a03c7cb185a0648d4f67fb63acf4b98b6fe8d0f7] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git
git bisect bad a03c7cb185a0648d4f67fb63acf4b98b6fe8d0f7
# bad: [2086880948dccced5110e472a99915913cec1b8b] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
git bisect bad 2086880948dccced5110e472a99915913cec1b8b
# good: [e7bb49e3f6435ff3611b83f78a61d387f24d80f8] perf x86: Define arch_fetch_insn in NO_AUXTRACE builds
git bisect good e7bb49e3f6435ff3611b83f78a61d387f24d80f8
# bad: [7bdd902c162d5576785095a0f8885df84bb472f5] Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
git bisect bad 7bdd902c162d5576785095a0f8885df84bb472f5
# bad: [d6ab634f1b323db6639b8b776f5d95ae747b342a] Merge branches 'for-next/cpufeature', 'for-next/docs', 'for-next/misc' and 'for-next/mm' into for-next/core
git bisect bad d6ab634f1b323db6639b8b776f5d95ae747b342a
# bad: [32d053d6f5e92efd82349e7c481cba5a43dc1a22] arm64/mm: Drop configurable 48-bit physical address space limit
git bisect bad 32d053d6f5e92efd82349e7c481cba5a43dc1a22
# good: [f0da16992aef7e246b2f3bba1492e3a52c38ca0e] arm64/kvm: Configure HYP TCR.PS/DS based on host stage1
git bisect good f0da16992aef7e246b2f3bba1492e3a52c38ca0e
# good: [92b6919d7fb29691a8bc5aca49044056683542ca] arm64: Kconfig: force ARM64_PAN=y when enabling TTBR0 sw PAN
git bisect good 92b6919d7fb29691a8bc5aca49044056683542ca
# first bad commit: [32d053d6f5e92efd82349e7c481cba5a43dc1a22] arm64/mm: Drop configurable 48-bit physical address space limit
-------------- next part --------------
A non-text attachment was scrubbed...
Name: config.gz
Type: application/gzip
Size: 34839 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20241221/7c853777/attachment.gz>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dmesg-52-bit.log.gz
Type: application/gzip
Size: 7734 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20241221/7c853777/attachment-0001.gz>
More information about the linux-arm-kernel
mailing list