RISC-V: fix virtual address overlapped in FIXADDR_START and VMEMMAP_START
PATCH 1/1 RISC-V: fix virtual address overlapped in FIXADDR_START and VMEMMAP_START
From: Greentime Hu <[email protected]>
This patch fixes the virtual address layout in pgtable.h.
The virtual address of FIXADDR_START and VMEMMAP_START should not be overlapped. These addresses will be existed at the same time in Linux kernel that they can't be overlapped.
--- arch/riscv/include/asm/pgtable.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
arch/riscv/include/asm/pgtable.h +8 -8
@@ -87,14 +87,6 @@ extern pgd_t swapper_pg_dir[];#define VMALLOC_END (PAGE_OFFSET - 1)#define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE) -#define FIXADDR_TOP VMALLOC_START -#ifdef CONFIG_64BIT -#define FIXADDR_SIZE PMD_SIZE -#else -#define FIXADDR_SIZE PGDIR_SIZE -#endif -#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) -/* * Roughly size the vmemmap space to be large enough to fit enough * struct pages to map half the virtual address space. Then
@@ -108,6 +100,14 @@ extern pgd_t swapper_pg_dir[];#define vmemmap ((struct page *)VMEMMAP_START) +#define FIXADDR_TOP (VMEMMAP_START) +#ifdef CONFIG_64BIT +#define FIXADDR_SIZE PMD_SIZE +#else +#define FIXADDR_SIZE PGDIR_SIZE +#endif +#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) +/* * ZERO_PAGE is a global shared page that is always zero, * used for zero-mapped memory areas, etc.
Signature · 1 line
2.17.1
Quoted 49 lines · On Wed, Oct 16, 2019 at 1:04 PM <[email protected]> wrote:
From: Greentime Hu <[email protected]>
This patch fixes the virtual address layout in
pgtable.h.
The virtual address ofFIXADDR_STARTandVMEMMAP_STARTshould not be overlapped. These addresses will be existed at the same time in Linux kernel that they can't be overlapped.Fixes d95f1a542c3d ("RISC-V: Implement sparsemem")Signed-off-by Greentime Hu <[email protected]>--- arch/riscv/include/asm/pgtable.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)arch/riscv/include/asm/pgtable.h +8
-9@@ -87,14 +87,6 @@ extern pgd_t swapper_pg_dir[];#define VMALLOC_END (PAGE_OFFSET - 1)#define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE) -#define FIXADDR_TOP VMALLOC_START -#ifdef CONFIG_64BIT -#define FIXADDR_SIZE PMD_SIZE -#else -#define FIXADDR_SIZE PGDIR_SIZE -#endif -#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) -/* * Roughly size the vmemmap space to be large enough to fit enough * struct pages to map half the virtual address space. Then @@ -108,6 +100,14 @@ extern pgd_t swapper_pg_dir[];#define vmemmap ((struct page *)VMEMMAP_START) +#define FIXADDR_TOP (VMEMMAP_START) +#ifdef CONFIG_64BIT +#define FIXADDR_SIZE PMD_SIZE +#else +#define FIXADDR_SIZE PGDIR_SIZE +#endif +#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) +/* * ZERO_PAGE is a global shared page that is always zero, * used for zero-mapped memory areas, etc. --
Quoted 2 lines
2.17.1
Looks good to me.
Regards,
Anup
Quoted 6 lines · On Okt 16 2019, [email protected] wrote:
From: Greentime Hu <[email protected]>
This patch fixes the virtual address layout in
pgtable.h.
The virtual address ofFIXADDR_STARTandVMEMMAP_STARTshould not be overlapped. These addresses will be existed at the same time in Linux kernel that they can't be overlapped.
s/be existed/exist/
s/be overlapped/overlap/
Andreas.
Signature · 3 lines
Andreas Schwab, SUSE Labs, [email protected] GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."
Quoted 9 lines · On Wed, 16 Oct 2019, [email protected] wrote:
From: Greentime Hu <[email protected]>
This patch fixes the virtual address layout in
pgtable.h.
The virtual address ofFIXADDR_STARTandVMEMMAP_STARTshould not be overlapped. These addresses will be existed at the same time in Linux kernel that they can't be overlapped.Fixes d95f1a542c3d ("RISC-V: Implement sparsemem")Signed-off-by Greentime Hu <[email protected]>
Thanks, here's what's been queued for v5.4-rc.
- Paul
From: Greentime Hu <[email protected]>
Date: Tue, 8 Oct 2019 14:45:24 +0800
Subject: [PATCH] RISC-V: fix virtual address overlapped in FIXADDR_START and
VMEMMAP_START
This patch fixes the virtual address layout in pgtable.h. The virtual address of FIXADDR_START and VMEMMAP_START should not be overlapped.
--- arch/riscv/include/asm/pgtable.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
arch/riscv/include/asm/pgtable.h +8 -8
@@ -87,14 +87,6 @@ extern pgd_t swapper_pg_dir[];#define VMALLOC_END (PAGE_OFFSET - 1)#define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE) -#define FIXADDR_TOP VMALLOC_START -#ifdef CONFIG_64BIT -#define FIXADDR_SIZE PMD_SIZE -#else -#define FIXADDR_SIZE PGDIR_SIZE -#endif -#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) -/* * Roughly size the vmemmap space to be large enough to fit enough * struct pages to map half the virtual address space. Then
@@ -108,6 +100,14 @@ extern pgd_t swapper_pg_dir[];#define vmemmap ((struct page *)VMEMMAP_START) +#define FIXADDR_TOP (VMEMMAP_START) +#ifdef CONFIG_64BIT +#define FIXADDR_SIZE PMD_SIZE +#else +#define FIXADDR_SIZE PGDIR_SIZE +#endif +#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) +/* * ZERO_PAGE is a global shared page that is always zero, * used for zero-mapped memory areas, etc.
Signature · 1 line
2.23.0