Commit de1702f6 authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

arm64: move PAC masks to <asm/pointer_auth.h> 



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: default avatarMark 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: default avatarWill Deacon <will@kernel.org>
parent ca708599

arch/arm64/include/asm/compiler.h

+0 −7
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ 
#define ARM64_ASM_PREAMBLE

#endif



/*

 * The EL0/EL1 pointer bits used by a pointer authentication code.

 * This is dependent on TBI0/TBI1 being enabled, or bits 63:56 would also apply.

 */

#define ptrauth_user_pac_mask()		GENMASK_ULL(54, vabits_actual)

#define ptrauth_kernel_pac_mask()	GENMASK_ULL(63, vabits_actual)



#define xpaclri(ptr)							\

({									\

	register unsigned long __xpaclri_ptr asm("x30") = (ptr);	\

arch/arm64/include/asm/pointer_auth.h

+7 −0
Original line number Diff line number Diff line
@@ -10,6 +10,13 @@ 
#include <asm/memory.h>

#include <asm/sysreg.h>



/*

 * The EL0/EL1 pointer bits used by a pointer authentication code.

 * This is dependent on TBI0/TBI1 being enabled, or bits 63:56 would also apply.

 */

#define ptrauth_user_pac_mask()		GENMASK_ULL(54, vabits_actual)

#define ptrauth_kernel_pac_mask()	GENMASK_ULL(63, vabits_actual)



#define PR_PAC_ENABLED_KEYS_MASK                                               \

	(PR_PAC_APIAKEY | PR_PAC_APIBKEY | PR_PAC_APDAKEY | PR_PAC_APDBKEY)

arch/arm64/kernel/crash_core.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <asm/cpufeature.h>

#include <asm/memory.h>

#include <asm/pgtable-hwdef.h>

#include <asm/pointer_auth.h>



static inline u64 get_tcr_el1_t1sz(void);