Unverified Commit d4abde52 authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

Merge patch series "riscv: mm: Fixup & Optimize COMPAT code" 

guoren@kernel.org <guoren@kernel.org> says:

From: Guo Ren <guoren@linux.alibaba.com>

When the task is in COMPAT mode, the TASK_SIZE should be 2GB, so
STACK_TOP_MAX and arch_get_mmap_end must be limited to 2 GB. This series
fixes the problem made by commit: add2cc6b ("RISC-V: mm: Restrict
address space for sv39,sv48,sv57") and optimizes the related coding
convention of TASK_SIZE.

* b4-shazam-merge:
  riscv: mm: Fixup compat arch_get_mmap_end
  riscv: mm: Fixup compat mode boot failure

Link: https://lore.kernel.org/r/20231222115703.2404036-1-guoren@kernel.org


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parents adb1f95d 97b7ac69

arch/riscv/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -864,7 +864,7 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) 
#define TASK_SIZE_MIN	(PGDIR_SIZE_L3 * PTRS_PER_PGD / 2)



#ifdef CONFIG_COMPAT

#define TASK_SIZE_32	(_AC(0x80000000, UL) - PAGE_SIZE)

#define TASK_SIZE_32	(_AC(0x80000000, UL))

#define TASK_SIZE	(test_thread_flag(TIF_32BIT) ? \

			 TASK_SIZE_32 : TASK_SIZE_64)

#else

arch/riscv/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#ifdef CONFIG_64BIT

#define DEFAULT_MAP_WINDOW	(UL(1) << (MMAP_VA_BITS - 1))

#define STACK_TOP_MAX		TASK_SIZE_64

#define STACK_TOP_MAX		TASK_SIZE



#define arch_get_mmap_end(addr, len, flags)			\

({								\