tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdePkg/BaseLib AARCH64: Make asm files BTI compatible 

Add the BTI instructions and the associated note to make the AArch64 asm
objects compatible with BTI enforcement.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
Reviewed-by: Oliver Smith-Denny <osd@smith-denny.com>
This commit is contained in:
Ard Biesheuvel 2023-03-25 17:37:10 +01:00 committed by mergify[bot]
parent e504b3917e
commit c4c7fb2174
8 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MdePkg/Library/BaseLib/AArch64/CpuBreakpoint.S
View File

@ -27,5 +27,6 @@ GCC_ASM_EXPORT(CpuBreakpoint)
# ); # );
# #
ASM_PFX(CpuBreakpoint): ASM_PFX(CpuBreakpoint):
AARCH64_BTI(c)
svc 0xdbdb // Superviser exception. Takes 16bit arg -> Armv7 had 'swi' here. svc 0xdbdb // Superviser exception. Takes 16bit arg -> Armv7 had 'swi' here.
ret ret

1
MdePkg/Library/BaseLib/AArch64/DisableInterrupts.S
View File

@ -26,5 +26,6 @@ GCC_ASM_EXPORT(DisableInterrupts)
# ); # );
# #
ASM_PFX(DisableInterrupts): ASM_PFX(DisableInterrupts):
AARCH64_BTI(c)
msr daifset, #DAIF_WR_IRQ_BIT msr daifset, #DAIF_WR_IRQ_BIT
ret ret

1
MdePkg/Library/BaseLib/AArch64/EnableInterrupts.S
View File

@ -26,5 +26,6 @@ GCC_ASM_EXPORT(EnableInterrupts)
# ); # );
# #
ASM_PFX(EnableInterrupts): ASM_PFX(EnableInterrupts):
AARCH64_BTI(c)
msr daifclr, #DAIF_WR_IRQ_BIT msr daifclr, #DAIF_WR_IRQ_BIT
ret ret

1
MdePkg/Library/BaseLib/AArch64/GetInterruptsState.S
View File

@ -33,6 +33,7 @@ GCC_ASM_EXPORT(GetInterruptState)
# ); # );
# #
ASM_PFX(GetInterruptState): ASM_PFX(GetInterruptState):
AARCH64_BTI(c)
mrs x0, daif mrs x0, daif
tst x0, #DAIF_RD_IRQ_BIT // Check IRQ mask; set Z=1 if clear/unmasked tst x0, #DAIF_RD_IRQ_BIT // Check IRQ mask; set Z=1 if clear/unmasked
cset w0, eq // if Z=1 (eq) return 1, else 0 cset w0, eq // if Z=1 (eq) return 1, else 0

1
MdePkg/Library/BaseLib/AArch64/MemoryFence.S
View File

@ -28,6 +28,7 @@ GCC_ASM_EXPORT(MemoryFence)
# ); # );
# #
ASM_PFX(MemoryFence): ASM_PFX(MemoryFence):
AARCH64_BTI(c)
// System wide Data Memory Barrier. // System wide Data Memory Barrier.
dmb sy dmb sy
ret ret

2
MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S
View File

@ -46,6 +46,7 @@ GCC_ASM_EXPORT(InternalLongJump)
# ); # );
# #
ASM_PFX(SetJump): ASM_PFX(SetJump):
AARCH64_BTI(c)
mov x16, sp // use IP0 so save SP mov x16, sp // use IP0 so save SP
#define REG_PAIR(REG1, REG2, OFFS) stp REG1, REG2, [x0, OFFS] #define REG_PAIR(REG1, REG2, OFFS) stp REG1, REG2, [x0, OFFS]
#define REG_ONE(REG1, OFFS) str REG1, [x0, OFFS] #define REG_ONE(REG1, OFFS) str REG1, [x0, OFFS]
@ -75,6 +76,7 @@ ASM_PFX(SetJump):
# ); # );
# #
ASM_PFX(InternalLongJump): ASM_PFX(InternalLongJump):
AARCH64_BTI(c)
#define REG_PAIR(REG1, REG2, OFFS) ldp REG1, REG2, [x0, OFFS] #define REG_PAIR(REG1, REG2, OFFS) ldp REG1, REG2, [x0, OFFS]
#define REG_ONE(REG1, OFFS) ldr REG1, [x0, OFFS] #define REG_ONE(REG1, OFFS) ldr REG1, [x0, OFFS]
GPR_LAYOUT GPR_LAYOUT

1
MdePkg/Library/BaseLib/AArch64/SpeculationBarrier.S
View File

@ -28,6 +28,7 @@ GCC_ASM_EXPORT(SpeculationBarrier)
# ); # );
# #
ASM_PFX(SpeculationBarrier): ASM_PFX(SpeculationBarrier):
AARCH64_BTI(c)
dsb sy dsb sy
isb isb
ret ret

2
MdePkg/Library/BaseLib/AArch64/SwitchStack.S
View File

@ -35,6 +35,7 @@ GCC_ASM_EXPORT(CpuPause)
# ); # );
# #
ASM_PFX(InternalSwitchStackAsm): ASM_PFX(InternalSwitchStackAsm):
AARCH64_BTI(c)
mov x29, #0 mov x29, #0
mov x30, x0 mov x30, x0
mov sp, x3 mov sp, x3
@ -57,6 +58,7 @@ ASM_PFX(InternalSwitchStackAsm):
# ) # )
# #
ASM_PFX(CpuPause): ASM_PFX(CpuPause):
AARCH64_BTI(c)
nop nop
nop nop
nop nop