Commit 98036587 authored by Deepak Gupta's avatar Deepak Gupta Committed by Paul Walmsley
Browse files

mm: add VM_SHADOW_STACK definition for riscv 



VM_HIGH_ARCH_5 is used for riscv.

Reviewed-by: default avatarZong Li <zong.li@sifive.com>
Reviewed-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarDeepak Gupta <debug@rivosinc.com>
Tested-by: Andreas Korb <andreas.korb@aisec.fraunhofer.de> # QEMU, custom CVA6
Tested-by: default avatarValentin Haudiquet <valentin.haudiquet@canonical.com>
Link: https://patch.msgid.link/20251112-v5_user_cfi_series-v23-1-b55691eacf4f@rivosinc.com


[pjw@kernel.org: clarify subject; update to apply]
Signed-off-by: default avatarPaul Walmsley <pjw@kernel.org>
parent 3127718a

include/linux/mm.h

+3 −2
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ enum { 
	DECLARE_VMA_BIT_ALIAS(PKEY_BIT2, HIGH_ARCH_2),

	DECLARE_VMA_BIT_ALIAS(PKEY_BIT3, HIGH_ARCH_3),

	DECLARE_VMA_BIT_ALIAS(PKEY_BIT4, HIGH_ARCH_4),

#if defined(CONFIG_X86_USER_SHADOW_STACK)

#if defined(CONFIG_X86_USER_SHADOW_STACK) || defined(CONFIG_RISCV_USER_CFI)

	/*

	 * VM_SHADOW_STACK should not be set with VM_SHARED because of lack of

	 * support core mm.
@@ -460,7 +460,8 @@ enum { 
#define VM_PKEY_BIT4  VM_NONE

#endif /* CONFIG_ARCH_PKEY_BITS > 4 */

#endif /* CONFIG_ARCH_HAS_PKEYS */

#if defined(CONFIG_X86_USER_SHADOW_STACK) || defined(CONFIG_ARM64_GCS)

#if defined(CONFIG_X86_USER_SHADOW_STACK) || defined(CONFIG_ARM64_GCS) || \

	defined(CONFIG_RISCV_USER_CFI)

#define VM_SHADOW_STACK	INIT_VM_FLAG(SHADOW_STACK)

#else

#define VM_SHADOW_STACK	VM_NONE