shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[OpenMP][AArch64] Fix branch protection in microtasks (#102317)

Browse Source 
Start __kmp_invoke_microtask with PACBTI in order to identify the
function as a valid branch target. Before returning, SP is
authenticated.
Also add the BTI and PAC markers to z_Linux_asm.S.

With this patch, libomp.so can now be generated with DT_AARCH64_BTI_PLT
when built with -mbranch-protection=standard.

The implementation is based on the code available in compiler-rt.

(cherry picked from commit 0aa22dcd2f6ec5f46b8ef18fee88066463734935)
This commit is contained in:
Tulio Magno Quites Machado Filho 2024-08-13 15:34:41 -03:00 committed by Tobias Hieta
parent 6e3026883d
commit 38a591de66
1 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
openmp/runtime/src/z_Linux_asm.S
View File

@ -176,6 +176,53 @@ KMP_PREFIX_UNDERSCORE(\proc):
.endm
# endif // KMP_OS_DARWIN
# if KMP_OS_LINUX
// BTI and PAC gnu property note
# define NT_GNU_PROPERTY_TYPE_0 5
# define GNU_PROPERTY_AARCH64_FEATURE_1_AND 0xc0000000
# define GNU_PROPERTY_AARCH64_FEATURE_1_BTI 1
# define GNU_PROPERTY_AARCH64_FEATURE_1_PAC 2
# define GNU_PROPERTY(type, value) \
.pushsection .note.gnu.property, "a"; \
.p2align 3; \
.word 4; \
.word 16; \
.word NT_GNU_PROPERTY_TYPE_0; \
.asciz "GNU"; \
.word type; \
.word 4; \
.word value; \
.word 0; \
.popsection
# endif
# if defined(__ARM_FEATURE_BTI_DEFAULT)
# define BTI_FLAG GNU_PROPERTY_AARCH64_FEATURE_1_BTI
# else
# define BTI_FLAG 0
# endif
# if __ARM_FEATURE_PAC_DEFAULT & 3
# define PAC_FLAG GNU_PROPERTY_AARCH64_FEATURE_1_PAC
# else
# define PAC_FLAG 0
# endif
# if (BTI_FLAG | PAC_FLAG) != 0
# if PAC_FLAG != 0
# define PACBTI_C hint #25
# define PACBTI_RET hint #29
# else
# define PACBTI_C hint #34
# define PACBTI_RET
# endif
# define GNU_PROPERTY_BTI_PAC \
GNU_PROPERTY(GNU_PROPERTY_AARCH64_FEATURE_1_AND, BTI_FLAG | PAC_FLAG)
# else
# define PACBTI_C
# define PACBTI_RET
# define GNU_PROPERTY_BTI_PAC
# endif
#endif // (KMP_OS_LINUX || KMP_OS_DARWIN || KMP_OS_WINDOWS) && (KMP_ARCH_AARCH64 || KMP_ARCH_AARCH64_32 || KMP_ARCH_ARM)
.macro COMMON name, size, align_power
@ -1296,6 +1343,7 @@ __tid = 8
// mark_begin;
.text
PROC __kmp_invoke_microtask
PACBTI_C
stp x29, x30, [sp, #-16]!
# if OMPT_SUPPORT
@ -1359,6 +1407,7 @@ KMP_LABEL(kmp_1):
ldp x19, x20, [sp], #16
# endif
ldp x29, x30, [sp], #16
PACBTI_RET
ret
DEBUG_INFO __kmp_invoke_microtask
@ -2472,3 +2521,7 @@ __kmp_unnamed_critical_addr:
.4byte .gomp_critical_user_
.size __kmp_unnamed_critical_addr, 4
#endif
#if KMP_OS_LINUX && (KMP_ARCH_AARCH64 || KMP_ARCH_AARCH64_32)
GNU_PROPERTY_BTI_PAC
#endif