435eac40de
Not all .S files include asm/assembler.h, however the SYM_FUNC_*
definitions invoke the 'bti' macro. Include asm/assembler.h in
asm/linkage.h.
Bug: 254441685
Fixes: 9be34be87cc8 ("arm64: Add macro version of the BTI instruction")
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit dd73d18e7fc7adc7e70711ff2c92373ce8862c3f)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: Ifa5f046d647a3ede82565436a70def87cf1b7ba2
71 lines
1.6 KiB
C
71 lines
1.6 KiB
C
#ifndef __ASM_LINKAGE_H
|
|
#define __ASM_LINKAGE_H
|
|
|
|
#ifdef __ASSEMBLY__
|
|
#include <asm/assembler.h>
|
|
#endif
|
|
|
|
#define __ALIGN .align 2
|
|
#define __ALIGN_STR ".align 2"
|
|
|
|
#if defined(CONFIG_ARM64_BTI_KERNEL) && defined(__aarch64__)
|
|
|
|
#define BTI_C bti c ;
|
|
|
|
/*
|
|
* When using in-kernel BTI we need to ensure that PCS-conformant assembly
|
|
* functions have suitable annotations. Override SYM_FUNC_START to insert
|
|
* a BTI landing pad at the start of everything.
|
|
*/
|
|
#define SYM_FUNC_START(name) \
|
|
SYM_START(name, SYM_L_GLOBAL, SYM_A_ALIGN) \
|
|
BTI_C
|
|
|
|
#define SYM_FUNC_START_NOALIGN(name) \
|
|
SYM_START(name, SYM_L_GLOBAL, SYM_A_NONE) \
|
|
BTI_C
|
|
|
|
#define SYM_FUNC_START_LOCAL(name) \
|
|
SYM_START(name, SYM_L_LOCAL, SYM_A_ALIGN) \
|
|
BTI_C
|
|
|
|
#define SYM_FUNC_START_LOCAL_NOALIGN(name) \
|
|
SYM_START(name, SYM_L_LOCAL, SYM_A_NONE) \
|
|
BTI_C
|
|
|
|
#define SYM_FUNC_START_WEAK(name) \
|
|
SYM_START(name, SYM_L_WEAK, SYM_A_ALIGN) \
|
|
BTI_C
|
|
|
|
#define SYM_FUNC_START_WEAK_NOALIGN(name) \
|
|
SYM_START(name, SYM_L_WEAK, SYM_A_NONE) \
|
|
BTI_C
|
|
|
|
#endif
|
|
|
|
/*
|
|
* Annotate a function as position independent, i.e., safe to be called before
|
|
* the kernel virtual mapping is activated.
|
|
*/
|
|
#define SYM_FUNC_START_PI(x) \
|
|
SYM_FUNC_START_ALIAS(__pi_##x); \
|
|
SYM_FUNC_START(x)
|
|
|
|
#define SYM_FUNC_START_WEAK_PI(x) \
|
|
SYM_FUNC_START_ALIAS(__pi_##x); \
|
|
SYM_FUNC_START_WEAK(x)
|
|
|
|
#define SYM_FUNC_START_WEAK_ALIAS_PI(x) \
|
|
SYM_FUNC_START_ALIAS(__pi_##x); \
|
|
SYM_START(x, SYM_L_WEAK, SYM_A_ALIGN)
|
|
|
|
#define SYM_FUNC_END_PI(x) \
|
|
SYM_FUNC_END(x); \
|
|
SYM_FUNC_END_ALIAS(__pi_##x)
|
|
|
|
#define SYM_FUNC_END_ALIAS_PI(x) \
|
|
SYM_FUNC_END_ALIAS(x); \
|
|
SYM_FUNC_END_ALIAS(__pi_##x)
|
|
|
|
#endif
|