riscv: mm: Fix the out of bound issue of vmemmap address
PATCH v3 1/1 riscv: mm: Fix the out of bound issue of vmemmap address
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.
--- arch/riscv/include/asm/page.h | 4 ++++ arch/riscv/include/asm/pgtable.h | 4 +++- arch/riscv/mm/init.c | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-)
arch/riscv/include/asm/page.h +4 -0
@@ -123,6 +123,10 @@ struct kernel_mapping {extern struct kernel_mapping kernel_map;extern phys_addr_t phys_ram_base; +#ifdef CONFIG_SPARSEMEM_VMEMMAP +extern unsigned long vmemmap_start_pfn; +#endif +#define is_kernel_mapping (x) \ ((x) >= kernel_map.virt_addr && (x) < (kernel_map.virt_addr + kernel_map.size))
arch/riscv/include/asm/pgtable.h +3 -1
@@ -87,7 +87,9 @@* Define vmemmap for pfn_to_page & page_to_pfn calls. Needed if kernel * is configured with CONFIG_SPARSEMEM_VMEMMAP enabled. */ -#define vmemmap ((struct page *)VMEMMAP_START - (phys_ram_base >> PAGE_SHIFT)) +#ifdef CONFIG_SPARSEMEM_VMEMMAP +#define vmemmap ((struct page *)VMEMMAP_START - vmemmap_start_pfn) +#endif #define PCI_IO_SIZE SZ_16M#define PCI_IO_END VMEMMAP_START
arch/riscv/mm/init.c +18 -0
@@ -32,6 +32,9 @@#include <asm/numa.h> #include <asm/pgtable.h> #include <asm/sections.h> +#ifdef CONFIG_SPARSEMEM_VMEMMAP +#include <asm/sparsemem.h> +#endif #include <asm/soc.h> #include <asm/tlbflush.h>
@@ -62,6 +65,13 @@ EXPORT_SYMBOL(pgtable_l5_enabled);phys_addr_t phys_ram_base__ro_after_init ;EXPORT_SYMBOL (phys_ram_base); +#ifdef CONFIG_SPARSEMEM_VMEMMAP +#define VMEMMAP_ADDR_ALIGN (1ULL << SECTION_SIZE_BITS) + +unsigned long vmemmap_start_pfn__ro_after_init ; +EXPORT_SYMBOL (vmemmap_start_pfn); +#endif + unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] __page_aligned_bss;EXPORT_SYMBOL (empty_zero_page);
@@ -243,6 +253,11 @@ static void __init setup_bootmem(void)if (!IS_ENABLED (CONFIG_XIP_KERNEL )) phys_ram_base =memblock_start_of_DRAM () &PMD_MASK ; +#ifdef CONFIG_SPARSEMEM_VMEMMAP +if (!IS_ENABLED (CONFIG_XIP_KERNEL )) + vmemmap_start_pfn =round_down (phys_ram_base,VMEMMAP_ADDR_ALIGN ) >>PAGE_SHIFT ; +#endif +/* * In 64-bit, any use of __va/__pa before this point is wrong as we * did not know the start of DRAM before.
@@ -1101,6 +1116,9 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) kernel_map.xiprom_sz = (uintptr_t )(&_exiprom) - (uintptr_t )(&_xiprom); phys_ram_base =CONFIG_PHYS_RAM_BASE ; +#ifdef CONFIG_SPARSEMEM_VMEMMAP + vmemmap_start_pfn =round_down (phys_ram_base,VMEMMAP_ADDR_ALIGN ) >>PAGE_SHIFT ; +#endif kernel_map.phys_addr = (uintptr_t )CONFIG_PHYS_RAM_BASE ; kernel_map.size = (uintptr_t )(&_end) - (uintptr_t )(&_start);
Signature · 1 line
2.20.1
Minor nits below; Too many ifdefs.
Quoted 33 lines · Xu Lu
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_basebelongs to. If the first page's physical address is not (phys_ram_base>>PAGE_SHIFT), then we get an va belowVMEMMAP_STARTwhen calculating va for it's struct page.For example, if
phys_ram_basestarts from0x82000000with pfn0x82000, the first page in the same section is actually pfn0x80000. Duringinit_unavailable_range(), we will initialize struct page for pfn0x80000with virtual address ((struct page *)VMEMMAP_START -0x2000), which is belowVMEMMAP_STARTas well asPCI_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 ofphys_ram_base.Fixes a11dd49dcb93 ("riscv: Sparse-Memory/vmemmap out-of-bounds fix")Signed-off-by Xu Lu <[email protected]>--- arch/riscv/include/asm/page.h | 4 ++++ arch/riscv/include/asm/pgtable.h | 4 +++- arch/riscv/mm/init.c | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-)arch/riscv/include/asm/page.h +0
-0
arch/riscv/include/asm/page.h struct kernel_mapping { · line 126
Quoted 4 lines
arch/riscv/include/asm/page.h +1
-0@@ -123,6 +123,10 @@ struct kernel_mapping {extern struct kernel_mapping kernel_map;extern phys_addr_t phys_ram_base; +#ifdef CONFIG_SPARSEMEM_VMEMMAP
Not needed, and should be removed.
Quoted 11 lines
arch/riscv/include/asm/page.h +3
-0+extern unsigned long vmemmap_start_pfn; +#endif +#define is_kernel_mapping (x) \ ((x) >= kernel_map.virt_addr && (x) < (kernel_map.virt_addr + kernel_map.size))arch/riscv/include/asm/pgtable.h +0
-0
arch/riscv/include/asm/pgtable.h line 90
Quoted 5 lines
arch/riscv/include/asm/pgtable.h +1
-1@@ -87,7 +87,9 @@* Define vmemmap for pfn_to_page & page_to_pfn calls. Needed if kernel * is configured with CONFIG_SPARSEMEM_VMEMMAP enabled. */ -#define vmemmap ((struct page *)VMEMMAP_START - (phys_ram_base >> PAGE_SHIFT)) +#ifdef CONFIG_SPARSEMEM_VMEMMAP
Dito, please remove.
Quoted 10 lines
arch/riscv/include/asm/pgtable.h +2
-0+#define vmemmap ((struct page *)VMEMMAP_START - vmemmap_start_pfn) +#endif #define PCI_IO_SIZE SZ_16M#define PCI_IO_END VMEMMAP_STARTarch/riscv/mm/init.c +0
-0
arch/riscv/mm/init.c line 35
Quoted 4 lines
arch/riscv/mm/init.c +1
-0@@ -32,6 +32,9 @@#include <asm/numa.h> #include <asm/pgtable.h> #include <asm/sections.h> +#ifdef CONFIG_SPARSEMEM_VMEMMAP
Not needed, please remove.
Quoted 20 lines
arch/riscv/mm/init.c +9
-0+#include <asm/sparsemem.h> +#endif #include <asm/soc.h> #include <asm/tlbflush.h> @@ -62,6 +65,13 @@ EXPORT_SYMBOL(pgtable_l5_enabled);phys_addr_t phys_ram_base__ro_after_init ;EXPORT_SYMBOL (phys_ram_base); +#ifdef CONFIG_SPARSEMEM_VMEMMAP +#define VMEMMAP_ADDR_ALIGN (1ULL << SECTION_SIZE_BITS) + +unsigned long vmemmap_start_pfn__ro_after_init ; +EXPORT_SYMBOL (vmemmap_start_pfn); +#endif + unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] __page_aligned_bss;EXPORT_SYMBOL (empty_zero_page);
arch/riscv/mm/init.c static void __init setup_bootmem(void) · line 260
Quoted 8 lines
arch/riscv/mm/init.c +5
-0@@ -243,6 +253,11 @@ static void __init setup_bootmem(void)if (!IS_ENABLED (CONFIG_XIP_KERNEL )) phys_ram_base =memblock_start_of_DRAM () &PMD_MASK ; +#ifdef CONFIG_SPARSEMEM_VMEMMAP +if (!IS_ENABLED (CONFIG_XIP_KERNEL )) + vmemmap_start_pfn =round_down (phys_ram_base,VMEMMAP_ADDR_ALIGN ) >>PAGE_SHIFT ; +#endif +
Please fold this into the if-statement above, e.g.:
| if (!IS_ENABLED(CONFIG_XIP_KERNEL)) {
| phys_ram_base = memblock_start_of_DRAM() & PMD_MASK;
| #if defined(CONFIG_SPARSEMEM_VMEMMAP)
| vmemmap_start_pfn = round_down(phys_ram_base, VMEMMAP_ADDR_ALIGN) >> PAGE_SHIFT;
| #endif
| }Björn
Hi Björn,
Thanks for your comment. Is it OK to introduce the new and unused variable 'vmemmap_start_pfn' when CONFIG_SPARSEMEM_VMEMMAP is disabled?
Quoted 119 lines · Björn Töpel
Minor nits below; Too many ifdefs.
Quoted 33 lines · Xu Lu
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_basebelongs to. If the first page's physical address is not (phys_ram_base>>PAGE_SHIFT), then we get an va belowVMEMMAP_STARTwhen calculating va for it's struct page.For example, if
phys_ram_basestarts from0x82000000with pfn0x82000, the first page in the same section is actually pfn0x80000. Duringinit_unavailable_range(), we will initialize struct page for pfn0x80000with virtual address ((struct page *)VMEMMAP_START -0x2000), which is belowVMEMMAP_STARTas well asPCI_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 ofphys_ram_base.Fixes a11dd49dcb93 ("riscv: Sparse-Memory/vmemmap out-of-bounds fix")Signed-off-by Xu Lu <[email protected]>--- arch/riscv/include/asm/page.h | 4 ++++ arch/riscv/include/asm/pgtable.h | 4 +++- arch/riscv/mm/init.c | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-)arch/riscv/include/asm/page.h +0
-0arch/riscv/include/asm/page.h struct kernel_mapping { · line 126
Quoted 4 lines
arch/riscv/include/asm/page.h +1
-0@@ -123,6 +123,10 @@ struct kernel_mapping {extern struct kernel_mapping kernel_map;extern phys_addr_t phys_ram_base; +#ifdef CONFIG_SPARSEMEM_VMEMMAP Not needed, and should be removed.
Quoted 11 lines
arch/riscv/include/asm/page.h +3
-0+extern unsigned long vmemmap_start_pfn; +#endif +#define is_kernel_mapping (x) \ ((x) >= kernel_map.virt_addr && (x) < (kernel_map.virt_addr + kernel_map.size))arch/riscv/include/asm/pgtable.h +0
-0arch/riscv/include/asm/pgtable.h line 90
Quoted 5 lines
arch/riscv/include/asm/pgtable.h +1
-1@@ -87,7 +87,9 @@* Define vmemmap for pfn_to_page & page_to_pfn calls. Needed if kernel * is configured with CONFIG_SPARSEMEM_VMEMMAP enabled. */ -#define vmemmap ((struct page *)VMEMMAP_START - (phys_ram_base >> PAGE_SHIFT)) +#ifdef CONFIG_SPARSEMEM_VMEMMAP Dito, please remove.
Quoted 10 lines
arch/riscv/include/asm/pgtable.h +2
-0+#define vmemmap ((struct page *)VMEMMAP_START - vmemmap_start_pfn) +#endif #define PCI_IO_SIZE SZ_16M#define PCI_IO_END VMEMMAP_STARTarch/riscv/mm/init.c +0
-0arch/riscv/mm/init.c line 35
Quoted 4 lines
arch/riscv/mm/init.c +1
-0@@ -32,6 +32,9 @@#include <asm/numa.h> #include <asm/pgtable.h> #include <asm/sections.h> +#ifdef CONFIG_SPARSEMEM_VMEMMAP Not needed, please remove.
Quoted 20 lines
arch/riscv/mm/init.c +9
-0+#include <asm/sparsemem.h> +#endif #include <asm/soc.h> #include <asm/tlbflush.h> @@ -62,6 +65,13 @@ EXPORT_SYMBOL(pgtable_l5_enabled);phys_addr_t phys_ram_base__ro_after_init ;EXPORT_SYMBOL (phys_ram_base); +#ifdef CONFIG_SPARSEMEM_VMEMMAP +#define VMEMMAP_ADDR_ALIGN (1ULL << SECTION_SIZE_BITS) + +unsigned long vmemmap_start_pfn__ro_after_init ; +EXPORT_SYMBOL (vmemmap_start_pfn); +#endif + unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] __page_aligned_bss;EXPORT_SYMBOL (empty_zero_page);arch/riscv/mm/init.c static void __init setup_bootmem(void) · line 260
Quoted 8 lines
arch/riscv/mm/init.c +5
-0@@ -243,6 +253,11 @@ static void __init setup_bootmem(void)if (!IS_ENABLED (CONFIG_XIP_KERNEL )) phys_ram_base =memblock_start_of_DRAM () &PMD_MASK ; +#ifdef CONFIG_SPARSEMEM_VMEMMAP +if (!IS_ENABLED (CONFIG_XIP_KERNEL )) + vmemmap_start_pfn =round_down (phys_ram_base,VMEMMAP_ADDR_ALIGN ) >>PAGE_SHIFT ; +#endif +Please fold this into the if-statement above, e.g.:
| if (!IS_ENABLED(CONFIG_XIP_KERNEL)) { | phys_ram_base = memblock_start_of_DRAM() & PMD_MASK; | #if defined(CONFIG_SPARSEMEM_VMEMMAP) | vmemmap_start_pfn = round_down(phys_ram_base, VMEMMAP_ADDR_ALIGN) >> PAGE_SHIFT; | #endif | }
Quoted 1 line
Björn
Best Regards,
Xu Lu
Hi,
Quoted 6 lines · Xu Lu
Hi Björn,
Thanks for your comment. Is it OK to introduce the new and unused variable '
vmemmap_start_pfn' whenCONFIG_SPARSEMEM_VMEMMAPis disabled?
The declaration, yes. Definition, no!
Cheers,
Björn
Quoted 125 lines · Björn Töpel
Quoted 119 lines
Minor nits below; Too many ifdefs.
Quoted 33 lines · Xu Lu
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_basebelongs to. If the first page's physical address is not (phys_ram_base>>PAGE_SHIFT), then we get an va belowVMEMMAP_STARTwhen calculating va for it's struct page.For example, if
phys_ram_basestarts from0x82000000with pfn0x82000, the first page in the same section is actually pfn0x80000. Duringinit_unavailable_range(), we will initialize struct page for pfn0x80000with virtual address ((struct page *)VMEMMAP_START -0x2000), which is belowVMEMMAP_STARTas well asPCI_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 ofphys_ram_base.Fixes a11dd49dcb93 ("riscv: Sparse-Memory/vmemmap out-of-bounds fix")Signed-off-by Xu Lu <[email protected]>--- arch/riscv/include/asm/page.h | 4 ++++ arch/riscv/include/asm/pgtable.h | 4 +++- arch/riscv/mm/init.c | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-)arch/riscv/include/asm/page.h +0
-0arch/riscv/include/asm/page.h struct kernel_mapping { · line 126
Quoted 4 lines
arch/riscv/include/asm/page.h +1
-0@@ -123,6 +123,10 @@ struct kernel_mapping {extern struct kernel_mapping kernel_map;extern phys_addr_t phys_ram_base; +#ifdef CONFIG_SPARSEMEM_VMEMMAP Not needed, and should be removed.
Quoted 11 lines
arch/riscv/include/asm/page.h +3
-0+extern unsigned long vmemmap_start_pfn; +#endif +#define is_kernel_mapping (x) \ ((x) >= kernel_map.virt_addr && (x) < (kernel_map.virt_addr + kernel_map.size))arch/riscv/include/asm/pgtable.h +0
-0arch/riscv/include/asm/pgtable.h line 90
Quoted 5 lines
arch/riscv/include/asm/pgtable.h +1
-1@@ -87,7 +87,9 @@* Define vmemmap for pfn_to_page & page_to_pfn calls. Needed if kernel * is configured with CONFIG_SPARSEMEM_VMEMMAP enabled. */ -#define vmemmap ((struct page *)VMEMMAP_START - (phys_ram_base >> PAGE_SHIFT)) +#ifdef CONFIG_SPARSEMEM_VMEMMAP Dito, please remove.
Quoted 10 lines
arch/riscv/include/asm/pgtable.h +2
-0+#define vmemmap ((struct page *)VMEMMAP_START - vmemmap_start_pfn) +#endif #define PCI_IO_SIZE SZ_16M#define PCI_IO_END VMEMMAP_STARTarch/riscv/mm/init.c +0
-0arch/riscv/mm/init.c line 35
Quoted 4 lines
arch/riscv/mm/init.c +1
-0@@ -32,6 +32,9 @@#include <asm/numa.h> #include <asm/pgtable.h> #include <asm/sections.h> +#ifdef CONFIG_SPARSEMEM_VMEMMAP Not needed, please remove.
Quoted 20 lines
arch/riscv/mm/init.c +9
-0+#include <asm/sparsemem.h> +#endif #include <asm/soc.h> #include <asm/tlbflush.h> @@ -62,6 +65,13 @@ EXPORT_SYMBOL(pgtable_l5_enabled);phys_addr_t phys_ram_base__ro_after_init ;EXPORT_SYMBOL (phys_ram_base); +#ifdef CONFIG_SPARSEMEM_VMEMMAP +#define VMEMMAP_ADDR_ALIGN (1ULL << SECTION_SIZE_BITS) + +unsigned long vmemmap_start_pfn__ro_after_init ; +EXPORT_SYMBOL (vmemmap_start_pfn); +#endif + unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] __page_aligned_bss;EXPORT_SYMBOL (empty_zero_page);arch/riscv/mm/init.c static void __init setup_bootmem(void) · line 260
Quoted 8 lines
arch/riscv/mm/init.c +5
-0@@ -243,6 +253,11 @@ static void __init setup_bootmem(void)if (!IS_ENABLED (CONFIG_XIP_KERNEL )) phys_ram_base =memblock_start_of_DRAM () &PMD_MASK ; +#ifdef CONFIG_SPARSEMEM_VMEMMAP +if (!IS_ENABLED (CONFIG_XIP_KERNEL )) + vmemmap_start_pfn =round_down (phys_ram_base,VMEMMAP_ADDR_ALIGN ) >>PAGE_SHIFT ; +#endif +Please fold this into the if-statement above, e.g.:
| if (!IS_ENABLED(CONFIG_XIP_KERNEL)) { | phys_ram_base = memblock_start_of_DRAM() & PMD_MASK; | #if defined(CONFIG_SPARSEMEM_VMEMMAP) | vmemmap_start_pfn = round_down(phys_ram_base, VMEMMAP_ADDR_ALIGN) >> PAGE_SHIFT; | #endif | }Quoted 1 line
Björn
Best Regards,
Xu Lu