RISC-V: fix virtual address overlapped in FIXADDR_START and VMEMMAP_START (5bf4e52f) · Commits · 戴 / test

This patch fixes the virtual address layout in pgtable.h. The virtual address of FIXADDR_START and VMEMMAP_START should not be overlapped. Fixes: ("RISC-V: Implement sparsemem") Signed-off-by:

Greentime Hu <greentime.hu@sifive.com> Reviewed-by:

Anup Patel <anup@brainfault.org> [paul.walmsley@sifive.com: fixed patch description] Signed-off-by:

Paul Walmsley <paul.walmsley@sifive.com>

arch/riscv/include/asm/pgtable.h

+8 −8

Original line number	Diff line number	Diff line
		@@ -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.

Admin message