arch: pgtable: define MAX_POSSIBLE_PHYSMEM_BITS where needed
Subsystems (8)
PATCH 1/1 arch: pgtable: define MAX_POSSIBLE_PHYSMEM_BITS where needed
From: Arnd Bergmann <[email protected]>
Stefan Agner reported a bug when using zsram on 32-bit Arm machines with RAM above the 4GB address boundary:
Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = a27bd01c [00000000] *pgd=236a0003, *pmd=1ffa64003 Internal error: Oops: 207 [#1] SMP ARM Modules linked in: mdio_bcm_unimac(+) brcmfmac cfg80211 brcmutil raspberrypi_hwmon hci_uart crc32_arm_ce bcm2711_thermal phy_generic genet CPU: 0 PID: 123 Comm: mkfs.ext4 Not tainted 5.9.6 #1 Hardware name: BCM2711 PC is at zs_map_object+0x94/0x338 LR is at zram_bvec_rw.constprop.0+0x330/0xa64 pc : [<c0602b38>] lr : [<c0bda6a0>] psr: 60000013 sp : e376bbe0 ip : 00000000 fp : c1e2921c r10: 00000002 r9 : c1dda730 r8 : 00000000 r7 : e8ff7a00 r6 : 00000000 r5 : 02f9ffa0 r4 : e3710000 r3 : 000fdffe r2 : c1e0ce80 r1 : ebf979a0 r0 : 00000000 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user Control: 30c5383d Table: 235c2a80 DAC: fffffffd Process mkfs.ext4 (pid: 123, stack limit = 0x495a22e6) Stack: (0xe376bbe0 to 0xe376c000)
As it turns out, zsram needs to know the maximum memory size, which is defined in MAX_PHYSMEM_BITS when CONFIG_SPARSEMEM is set, or in MAX_POSSIBLE_PHYSMEM_BITS on the x86 architecture.
The same problem will be hit on all 32-bit architectures that have a physical address space larger than 4GB and happen to not enable sparsemem and include asm/sparsemem.h from asm/pgtable.h.
After the initial discussion, I suggested just always defining MAX_POSSIBLE_PHYSMEM_BITS whenever CONFIG_PHYS_ADDR_T_64BIT is set, or provoking a build error otherwise. This addresses all configurations that can currently have this runtime bug, but leaves all other configurations unchanged.
I looked up the possible number of bits in source code and datasheets, here is what I found:
- on ARC, CONFIG_ARC_HAS_PAE40 controls whether 32 or 40 bits are used
- on ARM, CONFIG_LPAE enables 40 bit addressing, without it we never support more than 32 bits, even though supersections in theory allow up to 40 bits as well.
- on MIPS, some MIPS32r1 or later chips support 36 bits, and MIPS32r5 XPA supports up to 60 bits in theory, but 40 bits are more than anyone will ever ship
- On PowerPC, there are three different implementations of 36 bit addressing, but 32-bit is used without CONFIG_PTE_64BIT
- On RISC-V, the normal page table format can support 34 bit addressing. There is no highmem support on RISC-V, so anything above 2GB is unused, but it might be useful to eventually support CONFIG_ZRAM for high pages.
---
If everyone is happy with this version, I would suggest merging this as a bugfix through my asm-generic tree for linux-5.10. I originally said I'd send individual patches for each architecture tree, but I now think this is easier and better documents what is going on.
--- arch/arc/include/asm/pgtable.h | 2 ++ arch/arm/include/asm/pgtable-2level.h | 2 ++ arch/arm/include/asm/pgtable-3level.h | 2 ++ arch/mips/include/asm/pgtable-32.h | 3 +++ arch/powerpc/include/asm/book3s/32/pgtable.h | 2 ++ arch/powerpc/include/asm/nohash/32/pgtable.h | 2 ++ arch/riscv/include/asm/pgtable-32.h | 2 ++ include/linux/pgtable.h | 13 +++++++++++++ 8 files changed, 28 insertions(+)
arch/arc/include/asm/pgtable.h +2 -0
@@ -134,8 +134,10 @@#ifdef CONFIG_ARC_HAS_PAE40 #define PTE_BITS_NON_RWX_IN_PD1 (0xff00000000 | PAGE_MASK | _PAGE_CACHEABLE) +#define MAX_POSSIBLE_PHYSMEM_BITS 40#else #define PTE_BITS_NON_RWX_IN_PD1 (PAGE_MASK | _PAGE_CACHEABLE) +#define MAX_POSSIBLE_PHYSMEM_BITS 32#endif /**************************************************************************
arch/arm/include/asm/pgtable-2level.h +2 -0
@@ -75,6 +75,8 @@#define PTE_HWTABLE_OFF (PTE_HWTABLE_PTRS * sizeof(pte_t))#define PTE_HWTABLE_SIZE (PTRS_PER_PTE * sizeof(u32)) +#define MAX_POSSIBLE_PHYSMEM_BITS 32 +/* * PMD_SHIFT determines the size of the area a second-level page table can map * PGDIR_SHIFT determines what a third-level page table entry can map
arch/arm/include/asm/pgtable-3level.h +2 -0
@@ -25,6 +25,8 @@#define PTE_HWTABLE_OFF (0)#define PTE_HWTABLE_SIZE (PTRS_PER_PTE * sizeof(u64)) +#define MAX_POSSIBLE_PHYSMEM_BITS 40 +/* * PGDIR_SHIFT determines the size a top-level page table entry can map. */
arch/mips/include/asm/pgtable-32.h +3 -0
@@ -154,6 +154,7 @@ static inline void pmd_clear(pmd_t *pmdp)#if defined(CONFIG_XPA ) +#define MAX_POSSIBLE_PHYSMEM_BITS 40#define pte_pfn (x) (((unsigned long)((x).pte_high >> _PFN_SHIFT)) | (unsigned long)((x).pte_low << _PAGE_PRESENT_SHIFT))static inline pte_t pfn_pte (unsigned long pfn,pgprot_t prot)
@@ -169,6 +170,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot)#elif defined(CONFIG_PHYS_ADDR_T_64BIT ) && defined(CONFIG_CPU_MIPS32 ) +#define MAX_POSSIBLE_PHYSMEM_BITS 36#define pte_pfn (x) ((unsigned long)((x).pte_high >> 6))static inline pte_t pfn_pte (unsigned long pfn,pgprot_t prot)
@@ -183,6 +185,7 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot)#else +#define MAX_POSSIBLE_PHYSMEM_BITS 32#ifdef CONFIG_CPU_VR41XX #define pte_pfn (x) ((unsigned long)((x).pte >> (PAGE_SHIFT + 2)))#define pfn_pte (pfn, prot) __pte(((pfn) << (PAGE_SHIFT + 2)) | pgprot_val(prot))
arch/powerpc/include/asm/book3s/32/pgtable.h +2 -0
@@ -36,8 +36,10 @@ static inline bool pte_user(pte_t pte)*/ #ifdef CONFIG_PTE_64BIT #define PTE_RPN_MASK (~((1ULL << PTE_RPN_SHIFT) - 1)) +#define MAX_POSSIBLE_PHYSMEM_BITS 36#else #define PTE_RPN_MASK (~((1UL << PTE_RPN_SHIFT) - 1)) +#define MAX_POSSIBLE_PHYSMEM_BITS 32#endif /*
arch/powerpc/include/asm/nohash/32/pgtable.h +2 -0
@@ -153,8 +153,10 @@ int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot);*/ #if defined(CONFIG_PPC32 ) && defined(CONFIG_PTE_64BIT )#define PTE_RPN_MASK (~((1ULL << PTE_RPN_SHIFT) - 1)) +#define MAX_POSSIBLE_PHYSMEM_BITS 36#else #define PTE_RPN_MASK (~((1UL << PTE_RPN_SHIFT) - 1)) +#define MAX_POSSIBLE_PHYSMEM_BITS 32#endif /*
arch/riscv/include/asm/pgtable-32.h +2 -0
@@ -14,4 +14,6 @@#define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)#define PGDIR_MASK (~(PGDIR_SIZE - 1)) +#define MAX_POSSIBLE_PHYSMEM_BITS 34 +#endif /* _ASM_RISCV_PGTABLE_32_H */
include/linux/pgtable.h +13 -0
@@ -1427,6 +1427,19 @@ typedef unsigned int pgtbl_mod_mask;#endif /* !__ASSEMBLY__ */ +#if !defined(MAX_POSSIBLE_PHYSMEM_BITS ) && !defined(CONFIG_64BIT ) +#ifdef CONFIG_PHYS_ADDR_T_64BIT +/* +* ZSMALLOC needs to know the highest PFN on 32-bit architectures +* with physical address space extension, but falls back to +* BITS_PER_LONG otherwise. +*/ +#error Missing MAX_POSSIBLE_PHYSMEM_BITS definition +#else +#define MAX_POSSIBLE_PHYSMEM_BITS 32 +#endif +#endif +#ifndef has_transparent_hugepage#ifdef CONFIG_TRANSPARENT_HUGEPAGE #define has_transparent_hugepage () 1
Signature · 1 line
2.27.0
Quoted 78 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Stefan Agner reported a bug when using zsram on 32-bit Arm machines with RAM above the 4GB address boundary:
Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = a27bd01c [00000000] *pgd=236a0003, *pmd=1ffa64003 Internal error: Oops: 207 [#1] SMP ARM Modules linked in: mdio_bcm_unimac(+) brcmfmac cfg80211 brcmutil raspberrypi_hwmon hci_uart crc32_arm_ce bcm2711_thermal phy_generic genet CPU: 0 PID: 123 Comm: mkfs.ext4 Not tainted 5.9.6 #1 Hardware name: BCM2711 PC is at zs_map_object+0x94/0x338 LR is at zram_bvec_rw.constprop.0+0x330/0xa64 pc : [<c0602b38>] lr : [<c0bda6a0>] psr: 60000013 sp : e376bbe0 ip : 00000000 fp : c1e2921c r10: 00000002 r9 : c1dda730 r8 : 00000000 r7 : e8ff7a00 r6 : 00000000 r5 : 02f9ffa0 r4 : e3710000 r3 : 000fdffe r2 : c1e0ce80 r1 : ebf979a0 r0 : 00000000 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user Control: 30c5383d Table: 235c2a80 DAC: fffffffd Process mkfs.ext4 (pid: 123, stack limit = 0x495a22e6) Stack: (0xe376bbe0 to 0xe376c000)As it turns out, zsram needs to know the maximum memory size, which is defined in
MAX_PHYSMEM_BITSwhenCONFIG_SPARSEMEMis set, or inMAX_POSSIBLE_PHYSMEM_BITSon the x86 architecture.The same problem will be hit on all 32-bit architectures that have a physical address space larger than 4GB and happen to not enable sparsemem and include
asm/sparsemem.hfromasm/pgtable.h.After the initial discussion, I suggested just always defining
MAX_POSSIBLE_PHYSMEM_BITSwheneverCONFIG_PHYS_ADDR_T_64BITis set, or provoking a build error otherwise. This addresses all configurations that can currently have this runtime bug, but leaves all other configurations unchanged.I looked up the possible number of bits in source code and datasheets, here is what I found:
- on ARC,
CONFIG_ARC_HAS_PAE40controls whether 32 or 40 bits are used
- on ARM,CONFIG_LPAEenables 40 bit addressing, without it we never support more than 32 bits, even though supersections in theory allow up to 40 bits as well.
- on MIPS, some MIPS32r1 or later chips support 36 bits, and MIPS32r5 XPA supports up to 60 bits in theory, but 40 bits are more than anyone will ever ship
- On PowerPC, there are three different implementations of 36 bit addressing, but 32-bit is used withoutCONFIG_PTE_64BIT
- On RISC-V, the normal page table format can support 34 bit addressing. There is no highmem support on RISC-V, so anything above 2GB is unused, but it might be useful to eventually supportCONFIG_ZRAMfor high pages.Fixes 61989a80fb3a ("staging: zsmalloc: zsmalloc memory allocation library")Fixes 02390b87a945 ("mm/zsmalloc: Prepare to variable MAX_PHYSMEM_BITS")Cc Stefan Agner <[email protected]>Cc Mike Rapoport <[email protected]>Cc Kirill A. Shutemov <[email protected]>Cc Nitin Gupta <[email protected]>Cc Minchan Kim <[email protected]>Cc Vineet Gupta <[email protected]>Cc Russell King <[email protected]>Cc Thomas Bogendoerfer <[email protected]>Cc Michael Ellerman <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Paul Walmsley <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Albert Ou <[email protected]>Link https://lore.kernel.org/linux-mm/bdfa44bf1c570b05d6c70898e2bbb0acf234ecdf.1604762181.git.stefan@agner.ch/ open hereSigned-off-by Arnd Bergmann <[email protected]>
Quoted 7 lines
---
If everyone is happy with this version, I would suggest merging this as a bugfix through my asm-generic tree for linux-5.10. I originally said I'd send individual patches for each architecture tree, but I now think this is easier and better documents what is going on.--- arch/mips/include/asm/pgtable-32.h | 3 +++
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Quoted 86 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Stefan Agner reported a bug when using zsram on 32-bit Arm machines with RAM above the 4GB address boundary:
Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = a27bd01c [00000000] *pgd=236a0003, *pmd=1ffa64003 Internal error: Oops: 207 [#1] SMP ARM Modules linked in: mdio_bcm_unimac(+) brcmfmac cfg80211 brcmutil raspberrypi_hwmon hci_uart crc32_arm_ce bcm2711_thermal phy_generic genet CPU: 0 PID: 123 Comm: mkfs.ext4 Not tainted 5.9.6 #1 Hardware name: BCM2711 PC is at zs_map_object+0x94/0x338 LR is at zram_bvec_rw.constprop.0+0x330/0xa64 pc : [<c0602b38>] lr : [<c0bda6a0>] psr: 60000013 sp : e376bbe0 ip : 00000000 fp : c1e2921c r10: 00000002 r9 : c1dda730 r8 : 00000000 r7 : e8ff7a00 r6 : 00000000 r5 : 02f9ffa0 r4 : e3710000 r3 : 000fdffe r2 : c1e0ce80 r1 : ebf979a0 r0 : 00000000 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user Control: 30c5383d Table: 235c2a80 DAC: fffffffd Process mkfs.ext4 (pid: 123, stack limit = 0x495a22e6) Stack: (0xe376bbe0 to 0xe376c000)As it turns out, zsram needs to know the maximum memory size, which is defined in
MAX_PHYSMEM_BITSwhenCONFIG_SPARSEMEMis set, or inMAX_POSSIBLE_PHYSMEM_BITSon the x86 architecture.The same problem will be hit on all 32-bit architectures that have a physical address space larger than 4GB and happen to not enable sparsemem and include
asm/sparsemem.hfromasm/pgtable.h.After the initial discussion, I suggested just always defining
MAX_POSSIBLE_PHYSMEM_BITSwheneverCONFIG_PHYS_ADDR_T_64BITis set, or provoking a build error otherwise. This addresses all configurations that can currently have this runtime bug, but leaves all other configurations unchanged.I looked up the possible number of bits in source code and datasheets, here is what I found:
- on ARC,
CONFIG_ARC_HAS_PAE40controls whether 32 or 40 bits are used
- on ARM,CONFIG_LPAEenables 40 bit addressing, without it we never support more than 32 bits, even though supersections in theory allow up to 40 bits as well.
- on MIPS, some MIPS32r1 or later chips support 36 bits, and MIPS32r5 XPA supports up to 60 bits in theory, but 40 bits are more than anyone will ever ship
- On PowerPC, there are three different implementations of 36 bit addressing, but 32-bit is used withoutCONFIG_PTE_64BIT
- On RISC-V, the normal page table format can support 34 bit addressing. There is no highmem support on RISC-V, so anything above 2GB is unused, but it might be useful to eventually supportCONFIG_ZRAMfor high pages.Fixes 61989a80fb3a ("staging: zsmalloc: zsmalloc memory allocation library")Fixes 02390b87a945 ("mm/zsmalloc: Prepare to variable MAX_PHYSMEM_BITS")Cc Stefan Agner <[email protected]>Cc Mike Rapoport <[email protected]>Cc Kirill A. Shutemov <[email protected]>Cc Nitin Gupta <[email protected]>Cc Minchan Kim <[email protected]>Cc Vineet Gupta <[email protected]>Cc Russell King <[email protected]>Cc Thomas Bogendoerfer <[email protected]>Cc Michael Ellerman <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Paul Walmsley <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Albert Ou <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>---
If everyone is happy with this version, I would suggest merging this as a bugfix through my asm-generic tree for linux-5.10. I originally said I'd send individual patches for each architecture tree, but I now think this is easier and better documents what is going on.
Quoted 4 lines
--- arch/arc/include/asm/pgtable.h | 2 ++ arch/arm/include/asm/pgtable-2level.h | 2 ++ arch/arm/include/asm/pgtable-3level.h | 2 ++
Tested, it fixed the issue on my test system, thanks!
For ARM:
--
Stefan
Quoted 151 lines
arch/mips/include/asm/pgtable-32.h | 3 +++ arch/powerpc/include/asm/book3s/32/pgtable.h | 2 ++ arch/powerpc/include/asm/nohash/32/pgtable.h | 2 ++ arch/riscv/include/asm/pgtable-32.h | 2 ++ include/linux/pgtable.h | 13 +++++++++++++ 8 files changed, 28 insertions(+)arch/arc/include/asm/pgtable.h +2
-0@@ -134,8 +134,10 @@#ifdef CONFIG_ARC_HAS_PAE40 #define PTE_BITS_NON_RWX_IN_PD1 (0xff00000000 | PAGE_MASK | _PAGE_CACHEABLE) +#define MAX_POSSIBLE_PHYSMEM_BITS 40#else #define PTE_BITS_NON_RWX_IN_PD1 (PAGE_MASK | _PAGE_CACHEABLE) +#define MAX_POSSIBLE_PHYSMEM_BITS 32#endif /************************************************************************** arch/arm/include/asm/pgtable-2level.h +2
-0@@ -75,6 +75,8 @@#define PTE_HWTABLE_OFF (PTE_HWTABLE_PTRS * sizeof(pte_t))#define PTE_HWTABLE_SIZE (PTRS_PER_PTE * sizeof(u32)) +#define MAX_POSSIBLE_PHYSMEM_BITS 32 +/* * PMD_SHIFT determines the size of the area a second-level page table can map * PGDIR_SHIFT determines what a third-level page table entry can map arch/arm/include/asm/pgtable-3level.h +2
-0@@ -25,6 +25,8 @@#define PTE_HWTABLE_OFF (0)#define PTE_HWTABLE_SIZE (PTRS_PER_PTE * sizeof(u64)) +#define MAX_POSSIBLE_PHYSMEM_BITS 40 +/* * PGDIR_SHIFT determines the size a top-level page table entry can map. */ arch/mips/include/asm/pgtable-32.h +1
-0@@ -154,6 +154,7 @@ static inline void pmd_clear(pmd_t *pmdp)#if defined(CONFIG_XPA ) +#define MAX_POSSIBLE_PHYSMEM_BITS 40#define pte_pfn (x) (((unsigned long)((x).pte_high >> _PFN_SHIFT)) | (unsigned long)((x).pte_low << _PAGE_PRESENT_SHIFT)) static inline pte_t
pfn_pte(unsigned long pfn, pgprot_t prot)arch/mips/include/asm/pgtable-32.h +2
-0@@ -169,6 +170,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot)#elif defined(CONFIG_PHYS_ADDR_T_64BIT ) && defined(CONFIG_CPU_MIPS32 ) +#define MAX_POSSIBLE_PHYSMEM_BITS 36#define pte_pfn (x) ((unsigned long)((x).pte_high >> 6))static inline pte_t pfn_pte (unsigned long pfn,pgprot_t prot)@@ -183,6 +185,7 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot)#else +#define MAX_POSSIBLE_PHYSMEM_BITS 32#ifdef CONFIG_CPU_VR41XX #define pte_pfn (x) ((unsigned long)((x).pte >> (PAGE_SHIFT + 2)))#define
pfn_pte(pfn, prot)__pte(((pfn) << (PAGE_SHIFT+ 2)) |pgprot_val(prot))arch/powerpc/include/asm/book3s/32/pgtable.h +2
-0@@ -36,8 +36,10 @@ static inline bool pte_user(pte_t pte)*/ #ifdef CONFIG_PTE_64BIT #define PTE_RPN_MASK (~((1ULL << PTE_RPN_SHIFT) - 1)) +#define MAX_POSSIBLE_PHYSMEM_BITS 36#else #define PTE_RPN_MASK (~((1UL << PTE_RPN_SHIFT) - 1)) +#define MAX_POSSIBLE_PHYSMEM_BITS 32#endif /* arch/powerpc/include/asm/nohash/32/pgtable.h +2
-0@@ -153,8 +153,10 @@ int map_kernel_page(unsigned long va, phys_addr_tpa, pgprot_t prot); */ #if defined(CONFIG_PPC32 ) && defined(CONFIG_PTE_64BIT )#define PTE_RPN_MASK (~((1ULL << PTE_RPN_SHIFT) - 1)) +#define MAX_POSSIBLE_PHYSMEM_BITS 36#else #define PTE_RPN_MASK (~((1UL << PTE_RPN_SHIFT) - 1)) +#define MAX_POSSIBLE_PHYSMEM_BITS 32#endif /*
arch/riscv/include/asm/pgtable-32.h +2
-0@@ -14,4 +14,6 @@#define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)#define PGDIR_MASK (~(PGDIR_SIZE - 1)) +#define MAX_POSSIBLE_PHYSMEM_BITS 34 +#endif /* _ASM_RISCV_PGTABLE_32_H */ include/linux/pgtable.h +13
-0@@ -1427,6 +1427,19 @@ typedef unsigned int pgtbl_mod_mask;#endif /* !__ASSEMBLY__ */ +#if !defined(MAX_POSSIBLE_PHYSMEM_BITS ) && !defined(CONFIG_64BIT ) +#ifdef CONFIG_PHYS_ADDR_T_64BIT +/* +* ZSMALLOC needs to know the highest PFN on 32-bit architectures +* with physical address space extension, but falls back to +* BITS_PER_LONG otherwise. +*/ +#error Missing MAX_POSSIBLE_PHYSMEM_BITS definition +#else +#define MAX_POSSIBLE_PHYSMEM_BITS 32 +#endif +#endif +#ifndef has_transparent_hugepage#ifdef CONFIG_TRANSPARENT_HUGEPAGE #define has_transparent_hugepage () 1
Quoted 70 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Stefan Agner reported a bug when using zsram on 32-bit Arm machines with RAM above the 4GB address boundary:
Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = a27bd01c [00000000] *pgd=236a0003, *pmd=1ffa64003 Internal error: Oops: 207 [#1] SMP ARM Modules linked in: mdio_bcm_unimac(+) brcmfmac cfg80211 brcmutil raspberrypi_hwmon hci_uart crc32_arm_ce bcm2711_thermal phy_generic genet CPU: 0 PID: 123 Comm: mkfs.ext4 Not tainted 5.9.6 #1 Hardware name: BCM2711 PC is at zs_map_object+0x94/0x338 LR is at zram_bvec_rw.constprop.0+0x330/0xa64 pc : [<c0602b38>] lr : [<c0bda6a0>] psr: 60000013 sp : e376bbe0 ip : 00000000 fp : c1e2921c r10: 00000002 r9 : c1dda730 r8 : 00000000 r7 : e8ff7a00 r6 : 00000000 r5 : 02f9ffa0 r4 : e3710000 r3 : 000fdffe r2 : c1e0ce80 r1 : ebf979a0 r0 : 00000000 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user Control: 30c5383d Table: 235c2a80 DAC: fffffffd Process mkfs.ext4 (pid: 123, stack limit = 0x495a22e6) Stack: (0xe376bbe0 to 0xe376c000)As it turns out, zsram needs to know the maximum memory size, which is defined in
MAX_PHYSMEM_BITSwhenCONFIG_SPARSEMEMis set, or inMAX_POSSIBLE_PHYSMEM_BITSon the x86 architecture.The same problem will be hit on all 32-bit architectures that have a physical address space larger than 4GB and happen to not enable sparsemem and include
asm/sparsemem.hfromasm/pgtable.h.After the initial discussion, I suggested just always defining
MAX_POSSIBLE_PHYSMEM_BITSwheneverCONFIG_PHYS_ADDR_T_64BITis set, or provoking a build error otherwise. This addresses all configurations that can currently have this runtime bug, but leaves all other configurations unchanged.I looked up the possible number of bits in source code and datasheets, here is what I found:
- on ARC,
CONFIG_ARC_HAS_PAE40controls whether 32 or 40 bits are used
- on ARM,CONFIG_LPAEenables 40 bit addressing, without it we never support more than 32 bits, even though supersections in theory allow up to 40 bits as well.
- on MIPS, some MIPS32r1 or later chips support 36 bits, and MIPS32r5 XPA supports up to 60 bits in theory, but 40 bits are more than anyone will ever ship
- On PowerPC, there are three different implementations of 36 bit addressing, but 32-bit is used withoutCONFIG_PTE_64BIT
- On RISC-V, the normal page table format can support 34 bit addressing. There is no highmem support on RISC-V, so anything above 2GB is unused, but it might be useful to eventually supportCONFIG_ZRAMfor high pages.Fixes 61989a80fb3a ("staging: zsmalloc: zsmalloc memory allocation library")Fixes 02390b87a945 ("mm/zsmalloc: Prepare to variable MAX_PHYSMEM_BITS")Cc Stefan Agner <[email protected]>Cc Mike Rapoport <[email protected]>Cc Kirill A. Shutemov <[email protected]>Cc Nitin Gupta <[email protected]>Cc Minchan Kim <[email protected]>Cc Vineet Gupta <[email protected]>Cc Russell King <[email protected]>Cc Thomas Bogendoerfer <[email protected]>Cc Michael Ellerman <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>
Quoted 8 lines
Cc Paul Mackerras <[email protected]>Cc Paul Walmsley <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Albert Ou <[email protected]>Link https://lore.kernel.org/linux-mm/bdfa44bf1c570b05d6c70898e2bbb0acf234ecdf.1604762181.git.stefan@agner.ch/ open hereSigned-off-by Arnd Bergmann <[email protected]>
Quoted 153 lines
---
If everyone is happy with this version, I would suggest merging this as a bugfix through my asm-generic tree for linux-5.10. I originally said I'd send individual patches for each architecture tree, but I now think this is easier and better documents what is going on.--- arch/arc/include/asm/pgtable.h | 2 ++ arch/arm/include/asm/pgtable-2level.h | 2 ++ arch/arm/include/asm/pgtable-3level.h | 2 ++ arch/mips/include/asm/pgtable-32.h | 3 +++ arch/powerpc/include/asm/book3s/32/pgtable.h | 2 ++ arch/powerpc/include/asm/nohash/32/pgtable.h | 2 ++ arch/riscv/include/asm/pgtable-32.h | 2 ++ include/linux/pgtable.h | 13 +++++++++++++ 8 files changed, 28 insertions(+)arch/arc/include/asm/pgtable.h +2
-0@@ -134,8 +134,10 @@#ifdef CONFIG_ARC_HAS_PAE40 #define PTE_BITS_NON_RWX_IN_PD1 (0xff00000000 | PAGE_MASK | _PAGE_CACHEABLE) +#define MAX_POSSIBLE_PHYSMEM_BITS 40#else #define PTE_BITS_NON_RWX_IN_PD1 (PAGE_MASK | _PAGE_CACHEABLE) +#define MAX_POSSIBLE_PHYSMEM_BITS 32#endif /************************************************************************** arch/arm/include/asm/pgtable-2level.h +2
-0@@ -75,6 +75,8 @@#define PTE_HWTABLE_OFF (PTE_HWTABLE_PTRS * sizeof(pte_t))#define PTE_HWTABLE_SIZE (PTRS_PER_PTE * sizeof(u32)) +#define MAX_POSSIBLE_PHYSMEM_BITS 32 +/* * PMD_SHIFT determines the size of the area a second-level page table can map * PGDIR_SHIFT determines what a third-level page table entry can map arch/arm/include/asm/pgtable-3level.h +2
-0@@ -25,6 +25,8 @@#define PTE_HWTABLE_OFF (0)#define PTE_HWTABLE_SIZE (PTRS_PER_PTE * sizeof(u64)) +#define MAX_POSSIBLE_PHYSMEM_BITS 40 +/* * PGDIR_SHIFT determines the size a top-level page table entry can map. */ arch/mips/include/asm/pgtable-32.h +3
-0@@ -154,6 +154,7 @@ static inline void pmd_clear(pmd_t *pmdp)#if defined(CONFIG_XPA ) +#define MAX_POSSIBLE_PHYSMEM_BITS 40#define pte_pfn (x) (((unsigned long)((x).pte_high >> _PFN_SHIFT)) | (unsigned long)((x).pte_low << _PAGE_PRESENT_SHIFT))static inline pte_t pfn_pte (unsigned long pfn,pgprot_t prot)@@ -169,6 +170,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot)#elif defined(CONFIG_PHYS_ADDR_T_64BIT ) && defined(CONFIG_CPU_MIPS32 ) +#define MAX_POSSIBLE_PHYSMEM_BITS 36#define pte_pfn (x) ((unsigned long)((x).pte_high >> 6))static inline pte_t pfn_pte (unsigned long pfn,pgprot_t prot)@@ -183,6 +185,7 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot)#else +#define MAX_POSSIBLE_PHYSMEM_BITS 32#ifdef CONFIG_CPU_VR41XX #define pte_pfn (x) ((unsigned long)((x).pte >> (PAGE_SHIFT + 2)))#define pfn_pte (pfn, prot) __pte(((pfn) << (PAGE_SHIFT + 2)) | pgprot_val(prot))arch/powerpc/include/asm/book3s/32/pgtable.h +2
-0@@ -36,8 +36,10 @@ static inline bool pte_user(pte_t pte)*/ #ifdef CONFIG_PTE_64BIT #define PTE_RPN_MASK (~((1ULL << PTE_RPN_SHIFT) - 1)) +#define MAX_POSSIBLE_PHYSMEM_BITS 36#else #define PTE_RPN_MASK (~((1UL << PTE_RPN_SHIFT) - 1)) +#define MAX_POSSIBLE_PHYSMEM_BITS 32#endif /* arch/powerpc/include/asm/nohash/32/pgtable.h +2
-0@@ -153,8 +153,10 @@ int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot);*/ #if defined(CONFIG_PPC32 ) && defined(CONFIG_PTE_64BIT )#define PTE_RPN_MASK (~((1ULL << PTE_RPN_SHIFT) - 1)) +#define MAX_POSSIBLE_PHYSMEM_BITS 36#else #define PTE_RPN_MASK (~((1UL << PTE_RPN_SHIFT) - 1)) +#define MAX_POSSIBLE_PHYSMEM_BITS 32#endif /* arch/riscv/include/asm/pgtable-32.h +2
-0@@ -14,4 +14,6 @@#define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)#define PGDIR_MASK (~(PGDIR_SIZE - 1)) +#define MAX_POSSIBLE_PHYSMEM_BITS 34 +#endif /* _ASM_RISCV_PGTABLE_32_H */ include/linux/pgtable.h +13
-0@@ -1427,6 +1427,19 @@ typedef unsigned int pgtbl_mod_mask;#endif /* !__ASSEMBLY__ */ +#if !defined(MAX_POSSIBLE_PHYSMEM_BITS ) && !defined(CONFIG_64BIT ) +#ifdef CONFIG_PHYS_ADDR_T_64BIT +/* +* ZSMALLOC needs to know the highest PFN on 32-bit architectures +* with physical address space extension, but falls back to +* BITS_PER_LONG otherwise. +*/ +#error Missing MAX_POSSIBLE_PHYSMEM_BITS definition +#else +#define MAX_POSSIBLE_PHYSMEM_BITS 32 +#endif +#endif +#ifndef has_transparent_hugepage#ifdef CONFIG_TRANSPARENT_HUGEPAGE #define has_transparent_hugepage () 1Signature · 1 line
2.27.0
Signature · 2 lines
Sincerely yours, Mike.