mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-09 15:24:32 +08:00
de1702f65f
Now that we use XPACLRI to strip PACs within the kernel, the ptrauth_user_pac_mask() and ptrauth_kernel_pac_mask() definitions no longer need to live in <asm/compiler.h>. Move them to <asm/pointer_auth.h>, and ensure that this header is included where they are used. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Amit Daniel Kachhap <amit.kachhap@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: James Morse <james.morse@arm.com> Cc: Kristina Martsenko <kristina.martsenko@arm.com> Cc: Will Deacon <will@kernel.org> Link: https://lore.kernel.org/r/20230412160134.306148-4-mark.rutland@arm.com Signed-off-by: Will Deacon <will@kernel.org>
41 lines
979 B
C
41 lines
979 B
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __ASM_COMPILER_H
|
|
#define __ASM_COMPILER_H
|
|
|
|
#ifdef ARM64_ASM_ARCH
|
|
#define ARM64_ASM_PREAMBLE ".arch " ARM64_ASM_ARCH "\n"
|
|
#else
|
|
#define ARM64_ASM_PREAMBLE
|
|
#endif
|
|
|
|
#define xpaclri(ptr) \
|
|
({ \
|
|
register unsigned long __xpaclri_ptr asm("x30") = (ptr); \
|
|
\
|
|
asm( \
|
|
ARM64_ASM_PREAMBLE \
|
|
" hint #7\n" \
|
|
: "+r" (__xpaclri_ptr)); \
|
|
\
|
|
__xpaclri_ptr; \
|
|
})
|
|
|
|
#ifdef CONFIG_ARM64_PTR_AUTH_KERNEL
|
|
#define ptrauth_strip_kernel_insn_pac(ptr) xpaclri(ptr)
|
|
#else
|
|
#define ptrauth_strip_kernel_insn_pac(ptr) (ptr)
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARM64_PTR_AUTH
|
|
#define ptrauth_strip_user_insn_pac(ptr) xpaclri(ptr)
|
|
#else
|
|
#define ptrauth_strip_user_insn_pac(ptr) (ptr)
|
|
#endif
|
|
|
|
#if !defined(CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC)
|
|
#define __builtin_return_address(val) \
|
|
(void *)(ptrauth_strip_kernel_insn_pac((unsigned long)__builtin_return_address(val)))
|
|
#endif
|
|
|
|
#endif /* __ASM_COMPILER_H */
|