Skip to content

Commit 92f0867

Browse files
Xu Lugregkh
authored andcommitted
riscv: mm: Fix the out of bound issue of vmemmap address
commit f754f27e98f88428aaf6be6e00f5cbce97f62d4b upstream. In sparse vmemmap model, the virtual address of vmemmap is calculated as: ((struct page *)VMEMMAP_START - (phys_ram_base >> PAGE_SHIFT)). And the struct page's va can be calculated with an offset: (vmemmap + (pfn)). However, when initializing struct pages, kernel actually starts from the first page from the same section that phys_ram_base belongs to. If the first page's physical address is not (phys_ram_base >> PAGE_SHIFT), then we get an va below VMEMMAP_START when calculating va for it's struct page. For example, if phys_ram_base starts from 0x82000000 with pfn 0x82000, the first page in the same section is actually pfn 0x80000. During init_unavailable_range(), we will initialize struct page for pfn 0x80000 with virtual address ((struct page *)VMEMMAP_START - 0x2000), which is below VMEMMAP_START as well as PCI_IO_END. This commit fixes this bug by introducing a new variable 'vmemmap_start_pfn' which is aligned with memory section size and using it to calculate vmemmap address instead of phys_ram_base. Fixes: a11dd49dcb93 ("riscv: Sparse-Memory/vmemmap out-of-bounds fix") Signed-off-by: Xu Lu <[email protected]> Reviewed-by: Alexandre Ghiti <[email protected]> Tested-by: Björn Töpel <[email protected]> Reviewed-by: Björn Töpel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Palmer Dabbelt <[email protected]> Signed-off-by: Zhaoyang Li <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent e5ec1c2 commit 92f0867

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

arch/riscv/include/asm/page.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ struct kernel_mapping {
115115

116116
extern struct kernel_mapping kernel_map;
117117
extern phys_addr_t phys_ram_base;
118+
extern unsigned long vmemmap_start_pfn;
118119

119120
#define is_kernel_mapping(x) \
120121
((x) >= kernel_map.virt_addr && (x) < (kernel_map.virt_addr + kernel_map.size))

arch/riscv/include/asm/pgtable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
* Define vmemmap for pfn_to_page & page_to_pfn calls. Needed if kernel
8080
* is configured with CONFIG_SPARSEMEM_VMEMMAP enabled.
8181
*/
82-
#define vmemmap ((struct page *)VMEMMAP_START - (phys_ram_base >> PAGE_SHIFT))
82+
#define vmemmap ((struct page *)VMEMMAP_START - vmemmap_start_pfn)
8383

8484
#define PCI_IO_SIZE SZ_16M
8585
#define PCI_IO_END VMEMMAP_START

arch/riscv/mm/init.c

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <linux/hugetlb.h>
2323

2424
#include <asm/fixmap.h>
25+
#include <asm/sparsemem.h>
2526
#include <asm/tlbflush.h>
2627
#include <asm/sections.h>
2728
#include <asm/soc.h>
@@ -52,6 +53,13 @@ EXPORT_SYMBOL(pgtable_l5_enabled);
5253
phys_addr_t phys_ram_base __ro_after_init;
5354
EXPORT_SYMBOL(phys_ram_base);
5455

56+
#ifdef CONFIG_SPARSEMEM_VMEMMAP
57+
#define VMEMMAP_ADDR_ALIGN (1ULL << SECTION_SIZE_BITS)
58+
59+
unsigned long vmemmap_start_pfn __ro_after_init;
60+
EXPORT_SYMBOL(vmemmap_start_pfn);
61+
#endif
62+
5563
unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]
5664
__page_aligned_bss;
5765
EXPORT_SYMBOL(empty_zero_page);
@@ -210,8 +218,12 @@ static void __init setup_bootmem(void)
210218
memblock_reserve(vmlinux_start, vmlinux_end - vmlinux_start);
211219

212220
phys_ram_end = memblock_end_of_DRAM();
213-
if (!IS_ENABLED(CONFIG_XIP_KERNEL))
221+
if (!IS_ENABLED(CONFIG_XIP_KERNEL)) {
214222
phys_ram_base = memblock_start_of_DRAM();
223+
#ifdef CONFIG_SPARSEMEM_VMEMMAP
224+
vmemmap_start_pfn = round_down(phys_ram_base, VMEMMAP_ADDR_ALIGN) >> PAGE_SHIFT;
225+
#endif
226+
}
215227
/*
216228
* Reserve physical address space that would be mapped to virtual
217229
* addresses greater than (void *)(-PAGE_SIZE) because:
@@ -946,6 +958,9 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa)
946958
kernel_map.xiprom_sz = (uintptr_t)(&_exiprom) - (uintptr_t)(&_xiprom);
947959

948960
phys_ram_base = CONFIG_PHYS_RAM_BASE;
961+
#ifdef CONFIG_SPARSEMEM_VMEMMAP
962+
vmemmap_start_pfn = round_down(phys_ram_base, VMEMMAP_ADDR_ALIGN) >> PAGE_SHIFT;
963+
#endif
949964
kernel_map.phys_addr = (uintptr_t)CONFIG_PHYS_RAM_BASE;
950965
kernel_map.size = (uintptr_t)(&_end) - (uintptr_t)(&_start);
951966

0 commit comments

Comments
 (0)