Unverified Commit 7cc8c75b authored by Alexandre Ghiti's avatar Alexandre Ghiti Committed by Palmer Dabbelt
Browse files

riscv: Make vmalloc/vmemmap end equal to the start of the next region 



We used to define VMALLOC_END equal to the start of the next region
*minus one* which is inconsistent with the use of this define in the
core code (for example, see the definitions of VMALLOC_TOTAL and
is_vmalloc_addr).

And then make the definition of VMEMMAP_END consistent with VMALLOC_END
and all other regions actually.

Signed-off-by: default avatarAlexandre Ghiti <alexandre.ghiti@canonical.com>
Reviewed-by: default avatarJisheng Zhang <jszhang@kernel.org>
Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 1f77ed94

arch/riscv/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#endif



#define VMALLOC_SIZE     (KERN_VIRT_SIZE >> 1)

#define VMALLOC_END      (PAGE_OFFSET - 1)

#define VMALLOC_END      PAGE_OFFSET

#define VMALLOC_START    (PAGE_OFFSET - VMALLOC_SIZE)



#define BPF_JIT_REGION_SIZE	(SZ_128M)
@@ -51,7 +51,7 @@ 
#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_END	VMALLOC_START

#define VMEMMAP_START	(VMALLOC_START - VMEMMAP_SIZE)



/*

arch/riscv/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs) 
	 * only copy the information from the master page table,

	 * nothing more.

	 */

	if (unlikely((addr >= VMALLOC_START) && (addr <= VMALLOC_END))) {

	if (unlikely((addr >= VMALLOC_START) && (addr < VMALLOC_END))) {

		vmalloc_fault(regs, code, addr);

		return;

	}