RISC-V: Implement sparsemem
PATCH v6 1/1 RISC-V: Implement sparsemem
Implement sparsemem support for Risc-v which helps pave the way for memory hotplug and eventually P2P support.
Introduce Kconfig options for virtual and physical address bits which are used to calculate the size of the vmemmap and set the MAX_PHYSMEM_BITS.
The vmemmap is located directly before the VMALLOC region and sized such that we can allocate enough pages to populate all the virtual address space in the system (similar to the way it's done in arm64).
During initialization, call memblocks_present() and sparse_init(), and provide a stub for vmemmap_populate() (all of which is similar to arm64).
[[email protected]:
fixed pfn_valid, FIXADDR_TOP and fixed a bug rebasing onto v5.3]
--- arch/riscv/Kconfig | 21 +++++++++++++++++++++ arch/riscv/include/asm/fixmap.h | 2 +- arch/riscv/include/asm/page.h | 2 ++ arch/riscv/include/asm/pgtable.h | 21 +++++++++++++++++---- arch/riscv/include/asm/sparsemem.h | 11 +++++++++++ arch/riscv/mm/init.c | 10 ++++++++++ 6 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 arch/riscv/include/asm/sparsemem.h
Changes in v6:
* Rebased onto v5.3-rc6 (no changes)
* Fixed up commit message wording (per Mike's feedback)
* Set SPARSEMEM_STATIC for 32BIT builds (per Mike)
Changes in v5:
* Rebased onto v5.3-rc5 (required moving the initialization to after setup_vm_final() in paging_init())
* Fixed FIXADDR_TOP value (per Greentime)
* Use generic pfn_valid() function for sparsemem to fix a bug with having holes in memory (also Greentime)
Changes in v4:
* Rebased onto v5.0-rc1
* Changed the SECTION_SIZE_BITS to 27, per Nick Kossifidis
Changes in v3 (only sent the common patches):
* Rebased on v4.20-rc1
* Minor fixups
* Collected Ack from Will Deacon
Changes in v2:
* Rebase on v4.19-rc8
* Move the STRUCT_PAGE_MAX_SHIFT define into a common header (near the definition of struct page). As suggested by Christoph.
* Clean up the unnecessary nid variable in the memblocks_present() function, per Christoph.
* Collected tags from Palmer and Catalin.
arch/riscv/Kconfig +21 -0
@@ -54,6 +54,7 @@ config RISCV select EDAC_SUPPORT select ARCH_HAS_GIGANTIC_PAGE select ARCH_WANT_HUGE_PMD_SHARE if 64BIT + select SPARSEMEM_STATIC if 32BIT config MMU def_bool y
@@ -62,12 +63,32 @@ config ZONE_DMA32 bool default y if 64BIT +config VA_BITS + int + default 32 if 32BIT + default 39 if 64BIT + +config PA_BITS + int + default 34 if 32BIT + default 56 if 64BIT + config PAGE_OFFSET hex default 0xC0000000 if 32BIT && MAXPHYSMEM_2GB default 0xffffffff80000000 if 64BIT && MAXPHYSMEM_2GB default 0xffffffe000000000 if 64BIT && MAXPHYSMEM_128GB +config ARCH_FLATMEM_ENABLE + def_bool y + +config ARCH_SPARSEMEM_ENABLE + def_bool y + select SPARSEMEM_VMEMMAP_ENABLE + +config ARCH_SELECT_MEMORY_MODEL + def_bool ARCH_SPARSEMEM_ENABLE + config ARCH_WANT_GENERAL_HUGETLB def_bool y
arch/riscv/include/asm/fixmap.h +1 -1
@@ -31,7 +31,7 @@ enum fixed_addresses { };#define FIXADDR_SIZE (__end_of_fixed_addresses * PAGE_SIZE) -#define FIXADDR_TOP (VMALLOC_START) +#define FIXADDR_TOP (VMEMMAP_START)#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)#define FIXMAP_PAGE_IO PAGE_KERNEL
arch/riscv/include/asm/page.h +2 -0
@@ -110,8 +110,10 @@ extern unsigned long min_low_pfn;#define page_to_bus (page) (page_to_phys(page))#define phys_to_page (paddr) (pfn_to_page(phys_to_pfn(paddr))) +#ifdef CONFIG_FLATMEM #define pfn_valid (pfn) \ (((pfn) >= pfn_base) && (((pfn)-pfn_base) < max_mapnr)) +#endif #define ARCH_PFN_OFFSET (pfn_base)
arch/riscv/include/asm/pgtable.h +17 -4
@@ -83,6 +83,23 @@ extern pgd_t swapper_pg_dir[];#define __S110 PAGE_SHARED_EXEC#define __S111 PAGE_SHARED_EXEC +#define VMALLOC_SIZE (KERN_VIRT_SIZE >> 1) +#define VMALLOC_END (PAGE_OFFSET - 1) +#define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE) + +/* +* Roughly size the vmemmap space to be large enough to fit enough +* struct pages to map half the virtual address space. Then +* position vmemmap directly below the VMALLOC region. +*/ +#define VMEMMAP_SHIFT \ + (CONFIG_VA_BITS - PAGE_SHIFT - 1 + STRUCT_PAGE_MAX_SHIFT) +#define VMEMMAP_SIZE (1UL << VMEMMAP_SHIFT) +#define VMEMMAP_END (VMALLOC_START - 1) +#define VMEMMAP_START (VMALLOC_START - VMEMMAP_SIZE) + +#define vmemmap ((struct page *)VMEMMAP_START) +/* * ZERO_PAGE is a global shared page that is always zero, * used for zero-mapped memory areas, etc.
@@ -416,10 +433,6 @@ static inline void pgtable_cache_init(void)/* No page table caches to initialize */ } -#define VMALLOC_SIZE (KERN_VIRT_SIZE >> 1) -#define VMALLOC_END (PAGE_OFFSET - 1) -#define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE) -/* * Task size is 0x4000000000 for RV64 or 0xb800000 for RV32. * Note that PGDIR_SIZE must evenly divide TASK_SIZE.
arch/riscv/include/asm/sparsemem.h new file +11 -0
@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_SPARSEMEM_H +#define __ASM_SPARSEMEM_H + +#ifdef CONFIG_SPARSEMEM +#define MAX_PHYSMEM_BITS CONFIG_PA_BITS +#define SECTION_SIZE_BITS 27 +#endif /* CONFIG_SPARSEMEM */ + +#endif /* __ASM_SPARSEMEM_H */
arch/riscv/mm/init.c +10 -0
@@ -442,6 +442,16 @@ static void __init setup_vm_final(void)void __init paging_init (void ) {setup_vm_final (); +memblocks_present (); +sparse_init ();setup_zero_page ();zone_sizes_init (); } + +#ifdef CONFIG_SPARSEMEM +int __meminit vmemmap_populate (unsigned long start,unsigned long end,int node, +struct vmem_altmap *altmap) +{ +return vmemmap_populate_basepages (start, end, node); +} +#endif
--
2.20.1
Quoted 17 lines · Logan Gunthorpe
Implement sparsemem support for Risc-v which helps pave the way for memory hotplug and eventually P2P support.
Introduce
Kconfigoptions for virtual and physical address bits which are used to calculate the size of the vmemmap and set theMAX_PHYSMEM_BITS.The vmemmap is located directly before the VMALLOC region and sized such that we can allocate enough pages to populate all the virtual address space in the system (similar to the way it's done in arm64).
During initialization, call
memblocks_present()andsparse_init(), and provide a stub forvmemmap_populate()(all of which is similar to arm64).[[email protected]:
fixedpfn_valid,FIXADDR_TOPand fixed a bug rebasing onto v5.3]
Quoted 10 lines
Signed-off-by Greentime Hu <[email protected]>Signed-off-by Logan Gunthorpe <[email protected]>Reviewed-by Palmer Dabbelt <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Cc Albert Ou <[email protected]>Cc Andrew Waterman <[email protected]>Cc Olof Johansson <[email protected]>Cc Michael Clark <[email protected]>Cc Rob Herring <[email protected]>Cc Zong Li <[email protected]>
Quoted 196 lines
--- arch/riscv/Kconfig | 21 +++++++++++++++++++++ arch/riscv/include/asm/fixmap.h | 2 +- arch/riscv/include/asm/page.h | 2 ++ arch/riscv/include/asm/pgtable.h | 21 +++++++++++++++++---- arch/riscv/include/asm/sparsemem.h | 11 +++++++++++ arch/riscv/mm/init.c | 10 ++++++++++ 6 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 arch/riscv/include/asm/sparsemem.hChanges in v6:
* Rebased onto v5.3-rc6 (no changes)
* Fixed up commit message wording (per Mike's feedback)
* SetSPARSEMEM_STATICfor 32BIT builds (per Mike)Changes in v5:
* Rebased onto v5.3-rc5 (required moving the initialization to aftersetup_vm_final()inpaging_init())
* FixedFIXADDR_TOPvalue (per Greentime)
* Use genericpfn_valid()function for sparsemem to fix a bug with having holes in memory (also Greentime)Changes in v4:
* Rebased onto v5.0-rc1
* Changed theSECTION_SIZE_BITSto 27, per Nick KossifidisChanges in v3 (only sent the common patches):
* Rebased on v4.20-rc1
* Minor fixups
* Collected Ack from Will DeaconChanges in v2:
* Rebase on v4.19-rc8
* Move theSTRUCT_PAGE_MAX_SHIFTdefine into a common header (near the definition of struct page). As suggested by Christoph.
* Clean up the unnecessary nid variable in thememblocks_present()function, per Christoph.
* Collected tags from Palmer and Catalin.arch/riscv/Kconfig +21
-0@@ -54,6 +54,7 @@ config RISCV select EDAC_SUPPORT select ARCH_HAS_GIGANTIC_PAGE select ARCH_WANT_HUGE_PMD_SHARE if 64BIT + select SPARSEMEM_STATIC if 32BIT config MMU def_bool y@@ -62,12 +63,32 @@ config ZONE_DMA32 bool default y if 64BIT +config VA_BITS + int + default 32 if 32BIT + default 39 if 64BIT + +config PA_BITS + int + default 34 if 32BIT + default 56 if 64BIT + config PAGE_OFFSET hex default 0xC0000000 if 32BIT && MAXPHYSMEM_2GB default 0xffffffff80000000 if 64BIT && MAXPHYSMEM_2GB default 0xffffffe000000000 if 64BIT && MAXPHYSMEM_128GB +config ARCH_FLATMEM_ENABLE + def_bool y + +config ARCH_SPARSEMEM_ENABLE + def_bool y + select SPARSEMEM_VMEMMAP_ENABLE + +config ARCH_SELECT_MEMORY_MODEL + def_bool ARCH_SPARSEMEM_ENABLE + config ARCH_WANT_GENERAL_HUGETLB def_bool yarch/riscv/include/asm/fixmap.h +1
-1@@ -31,7 +31,7 @@ enum fixed_addresses { };#define FIXADDR_SIZE (__end_of_fixed_addresses * PAGE_SIZE) -#define FIXADDR_TOP (VMALLOC_START) +#define FIXADDR_TOP (VMEMMAP_START)#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)#define FIXMAP_PAGE_IO PAGE_KERNELarch/riscv/include/asm/page.h +2
-0@@ -110,8 +110,10 @@ extern unsigned long min_low_pfn;#define page_to_bus (page) (page_to_phys(page))#define phys_to_page (paddr) (pfn_to_page(phys_to_pfn(paddr))) +#ifdef CONFIG_FLATMEM #define pfn_valid (pfn) \ (((pfn) >= pfn_base) && (((pfn)-pfn_base) < max_mapnr)) +#endif #define ARCH_PFN_OFFSET (pfn_base)arch/riscv/include/asm/pgtable.h +17
-4@@ -83,6 +83,23 @@ extern pgd_t swapper_pg_dir[];#define __S110 PAGE_SHARED_EXEC#define __S111 PAGE_SHARED_EXEC +#define VMALLOC_SIZE (KERN_VIRT_SIZE >> 1) +#define VMALLOC_END (PAGE_OFFSET - 1) +#define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE) + +/* +* Roughly size the vmemmap space to be large enough to fit enough +* struct pages to map half the virtual address space. Then +* position vmemmap directly below the VMALLOC region. +*/ +#define VMEMMAP_SHIFT \ + (CONFIG_VA_BITS - PAGE_SHIFT - 1 + STRUCT_PAGE_MAX_SHIFT) +#define VMEMMAP_SIZE (1UL << VMEMMAP_SHIFT) +#define VMEMMAP_END (VMALLOC_START - 1) +#define VMEMMAP_START (VMALLOC_START - VMEMMAP_SIZE) + +#define vmemmap ((struct page *)VMEMMAP_START) +/* * ZERO_PAGE is a global shared page that is always zero, * used for zero-mapped memory areas, etc. @@ -416,10 +433,6 @@ static inline void pgtable_cache_init(void)/* No page table caches to initialize */ } -#define VMALLOC_SIZE (KERN_VIRT_SIZE >> 1) -#define VMALLOC_END (PAGE_OFFSET - 1) -#define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE) -/* * Task size is 0x4000000000 for RV64 or 0xb800000 for RV32. * Note that PGDIR_SIZE must evenly divide TASK_SIZE. arch/riscv/include/asm/sparsemem.h new file +11
-0@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_SPARSEMEM_H +#define __ASM_SPARSEMEM_H + +#ifdef CONFIG_SPARSEMEM +#define MAX_PHYSMEM_BITS CONFIG_PA_BITS +#define SECTION_SIZE_BITS 27 +#endif /* CONFIG_SPARSEMEM */ + +#endif /* __ASM_SPARSEMEM_H */ arch/riscv/mm/init.c +10
-1@@ -442,6 +442,16 @@ static void __init setup_vm_final(void)void __init paging_init (void ) {setup_vm_final (); +memblocks_present (); +sparse_init ();setup_zero_page ();zone_sizes_init (); } + +#ifdef CONFIG_SPARSEMEM +int __meminit vmemmap_populate (unsigned long start,unsigned long end,int node, +struct vmem_altmap *altmap) +{ +return vmemmap_populate_basepages (start, end, node); +} +#endif --2.20.1
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Signature · 2 lines
Sincerely yours, Mike.
Quoted 29 lines · Mike Rapoport
Quoted 17 lines · Logan Gunthorpe
Implement sparsemem support for Risc-v which helps pave the way for memory hotplug and eventually P2P support.
Introduce
Kconfigoptions for virtual and physical address bits which are used to calculate the size of the vmemmap and set theMAX_PHYSMEM_BITS.The vmemmap is located directly before the VMALLOC region and sized such that we can allocate enough pages to populate all the virtual address space in the system (similar to the way it's done in arm64).
During initialization, call
memblocks_present()andsparse_init(), and provide a stub forvmemmap_populate()(all of which is similar to arm64).[[email protected]:
fixedpfn_valid,FIXADDR_TOPand fixed a bug rebasing onto v5.3]Quoted 10 lines
Signed-off-by Greentime Hu <[email protected]>Signed-off-by Logan Gunthorpe <[email protected]>Reviewed-by Palmer Dabbelt <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Cc Albert Ou <[email protected]>Cc Andrew Waterman <[email protected]>Cc Olof Johansson <[email protected]>Cc Michael Clark <[email protected]>Cc Rob Herring <[email protected]>Cc Zong Li <[email protected]>
Quoted 1 line
Reviewed-by Mike Rapoport <[email protected]>
Thanks!
Logan
arch/riscv/include/asm/fixmap.h enum fixed_addresses { · line 35
Quoted 11 lines
arch/riscv/include/asm/fixmap.h +1
-1@@ -31,7 +31,7 @@ enum fixed_addresses { };#define FIXADDR_SIZE (__end_of_fixed_addresses * PAGE_SIZE) -#define FIXADDR_TOP (VMALLOC_START) +#define FIXADDR_TOP (VMEMMAP_START)#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)
Note that this actually changes again in the fixes branch that is targeted for 5.3. Not actually conflicting your functionality, but the FIXADDR_TOP definition moves to pgtable.h.
Otherwise this still looks fine.
Paul Walmsley
Reviewed-by Palmer Dabbelt Reviewed-by Christoph Hellwig Reviewed-by Mike Rapoport on v6 1/1Hi Logan,
Quoted 2 lines · Logan Gunthorpe
Implement sparsemem support for Risc-v which helps pave the way for memory hotplug and eventually P2P support.
Thanks very much for following up on this patch set.
One question:
Quoted 6 lines
arch/riscv/include/asm/sparsemem.h new file +0
-0
arch/riscv/include/asm/sparsemem.h line 8
Quoted 8 lines
arch/riscv/include/asm/sparsemem.h new file +8
-0@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_SPARSEMEM_H +#define __ASM_SPARSEMEM_H + +#ifdef CONFIG_SPARSEMEM +#define MAX_PHYSMEM_BITS CONFIG_PA_BITS +#define SECTION_SIZE_BITS 27
Do you have a specific rationale behind this selection, or is this simply a reasonable starting point?
arch/riscv/include/asm/sparsemem.h line 11
Quoted 3 lines
arch/riscv/include/asm/sparsemem.h new file +3
-0+#endif /* CONFIG_SPARSEMEM */ + +#endif /* __ASM_SPARSEMEM_H */
The following is what I'm getting ready to queue.
- Paul
From: Logan Gunthorpe <[email protected]>
Date: Wed, 28 Aug 2019 15:40:54 -0600
Subject: [PATCH] RISC-V: Implement sparsemem
Implement sparsemem support for Risc-v which helps pave the way for memory hotplug and eventually P2P support.
Introduce Kconfig options for virtual and physical address bits which are used to calculate the size of the vmemmap and set the MAX_PHYSMEM_BITS.
The vmemmap is located directly before the VMALLOC region and sized such that we can allocate enough pages to populate all the virtual address space in the system (similar to the way it's done in arm64).
During initialization, call memblocks_present() and sparse_init(), and provide a stub for vmemmap_populate() (all of which is similar to arm64).
[[email protected]: fixed pfn_valid, FIXADDR_TOP and fixed a bug
rebasing onto v5.3]
[[email protected]: updated to apply; minor commit message
reformat]
--- arch/riscv/Kconfig | 21 +++++++++++++++++++++ arch/riscv/include/asm/page.h | 2 ++ arch/riscv/include/asm/pgtable.h | 13 +++++++++++++ arch/riscv/include/asm/sparsemem.h | 11 +++++++++++ arch/riscv/mm/init.c | 10 ++++++++++ 5 files changed, 57 insertions(+) create mode 100644 arch/riscv/include/asm/sparsemem.h
arch/riscv/Kconfig +21 -0
@@ -54,6 +54,7 @@ config RISCV select EDAC_SUPPORT select ARCH_HAS_GIGANTIC_PAGE select ARCH_WANT_HUGE_PMD_SHARE if 64BIT + select SPARSEMEM_STATIC if 32BIT config MMU def_bool y
@@ -62,12 +63,32 @@ config ZONE_DMA32 bool default y if 64BIT +config VA_BITS + int + default 32 if 32BIT + default 39 if 64BIT + +config PA_BITS + int + default 34 if 32BIT + default 56 if 64BIT + config PAGE_OFFSET hex default 0xC0000000 if 32BIT && MAXPHYSMEM_2GB default 0xffffffff80000000 if 64BIT && MAXPHYSMEM_2GB default 0xffffffe000000000 if 64BIT && MAXPHYSMEM_128GB +config ARCH_FLATMEM_ENABLE + def_bool y + +config ARCH_SPARSEMEM_ENABLE + def_bool y + select SPARSEMEM_VMEMMAP_ENABLE + +config ARCH_SELECT_MEMORY_MODEL + def_bool ARCH_SPARSEMEM_ENABLE + config ARCH_WANT_GENERAL_HUGETLB def_bool y
arch/riscv/include/asm/page.h +2 -0
@@ -110,8 +110,10 @@ extern unsigned long min_low_pfn;#define page_to_bus (page) (page_to_phys(page))#define phys_to_page (paddr) (pfn_to_page(phys_to_pfn(paddr))) +#ifdef CONFIG_FLATMEM #define pfn_valid (pfn) \ (((pfn) >= pfn_base) && (((pfn)-pfn_base) < max_mapnr)) +#endif #define ARCH_PFN_OFFSET (pfn_base)
arch/riscv/include/asm/pgtable.h +13 -0
@@ -83,6 +83,19 @@ extern pgd_t swapper_pg_dir[];#define __S110 PAGE_SHARED_EXEC#define __S111 PAGE_SHARED_EXEC +/* +* Roughly size the vmemmap space to be large enough to fit enough +* struct pages to map half the virtual address space. Then +* position vmemmap directly below the VMALLOC region. +*/ +#define VMEMMAP_SHIFT \ + (CONFIG_VA_BITS - PAGE_SHIFT - 1 + STRUCT_PAGE_MAX_SHIFT) +#define VMEMMAP_SIZE BIT(VMEMMAP_SHIFT) +#define VMEMMAP_END (VMALLOC_START - 1) +#define VMEMMAP_START (VMALLOC_START - VMEMMAP_SIZE) + +#define vmemmap ((struct page *)VMEMMAP_START) +/* * ZERO_PAGE is a global shared page that is always zero, * used for zero-mapped memory areas, etc.
arch/riscv/include/asm/sparsemem.h new file +11 -0
@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_SPARSEMEM_H +#define __ASM_SPARSEMEM_H + +#ifdef CONFIG_SPARSEMEM +#define MAX_PHYSMEM_BITS CONFIG_PA_BITS +#define SECTION_SIZE_BITS 27 +#endif /* CONFIG_SPARSEMEM */ + +#endif /* __ASM_SPARSEMEM_H */
arch/riscv/mm/init.c +10 -0
@@ -442,6 +442,16 @@ static void __init setup_vm_final(void)void __init paging_init (void ) {setup_vm_final (); +memblocks_present (); +sparse_init ();setup_zero_page ();zone_sizes_init (); } + +#ifdef CONFIG_SPARSEMEM +int __meminit vmemmap_populate (unsigned long start,unsigned long end,int node, +struct vmem_altmap *altmap) +{ +return vmemmap_populate_basepages (start, end, node); +} +#endif
Signature · 1 line
2.23.0
Quoted 6 lines · Paul Walmsley
arch/riscv/include/asm/sparsemem.h line 8
Quoted 3 lines
arch/riscv/include/asm/sparsemem.h new file +3
-0+#ifdef CONFIG_SPARSEMEM +#define MAX_PHYSMEM_BITS CONFIG_PA_BITS +#define SECTION_SIZE_BITS 27Do you have a specific rationale behind this selection, or is this simply a reasonable starting point?
It's inline with what other platforms are doing. So in some ways it's a reasonable starting point but I don't see any reason to change it in the near term.
Quoted 5 lines
arch/riscv/include/asm/sparsemem.h line 11
Quoted 3 lines
arch/riscv/include/asm/sparsemem.h new file +3
-0+#endif /* CONFIG_SPARSEMEM */ + +#endif /* __ASM_SPARSEMEM_H */ The following is what I'm getting ready to queue.
Great, thanks!
Logan