Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mman: Add map_shadow_stack() flags

In preparation for adding arm64 GCS support make the map_shadow_stack()
SHADOW_STACK_SET_TOKEN flag generic and add _SET_MARKER. The existing
flag indicates that a token usable for stack switch should be added to
the top of the newly mapped GCS region while the new flag indicates that
a top of stack marker suitable for use by unwinders should be added
above that.

For arm64 the top of stack marker is all bits 0.

Reviewed-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Yury Khrustalev <yury.khrustalev@arm.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20241001-arm64-gcs-v13-5-222b78d87eee@kernel.org
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

authored by

Mark Brown and committed by
Catalin Marinas
3630e82a 91e102e7

+4 -3
-3
arch/x86/include/uapi/asm/mman.h
··· 5 5 #define MAP_32BIT 0x40 /* only give out 32bit addresses */ 6 6 #define MAP_ABOVE4G 0x80 /* only map above 4GB */ 7 7 8 - /* Flags for map_shadow_stack(2) */ 9 - #define SHADOW_STACK_SET_TOKEN (1ULL << 0) /* Set up a restore token in the shadow stack */ 10 - 11 8 #include <asm-generic/mman.h> 12 9 13 10 #endif /* _ASM_X86_MMAN_H */
+4
include/uapi/asm-generic/mman.h
··· 19 19 #define MCL_FUTURE 2 /* lock all future mappings */ 20 20 #define MCL_ONFAULT 4 /* lock all pages that are faulted in */ 21 21 22 + #define SHADOW_STACK_SET_TOKEN (1ULL << 0) /* Set up a restore token in the shadow stack */ 23 + #define SHADOW_STACK_SET_MARKER (1ULL << 1) /* Set up a top of stack marker in the shadow stack */ 24 + 25 + 22 26 #endif /* __ASM_GENERIC_MMAN_H */