This is an archive of the discontinued LLVM Phabricator instance.

Differential D151217

[HWASan] Use ASM_WRAPPER_NAME instead of __interceptor_*
ClosedPublic

Authored by melver on May 23 2023, 7:54 AM.

Details

Reviewers
dvyukov
vitalybuka
Commits
rG2f1e2a6b1ca2: [HWASan] Use ASM_WRAPPER_NAME instead of __interceptor_*
Summary

Use ASM_WRAPPER_NAME to produce the name of the __interceptor_*
functions.

NFC.

Diff Detail

Event Timeline

melver created this revision.May 23 2023, 7:54 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 23 2023, 7:54 AM
Herald added subscribers: luke, Enna1, frasercrmck and 20 others. · View Herald Transcript
melver requested review of this revision.May 23 2023, 7:54 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 23 2023, 7:54 AM
Herald added subscribers: Restricted Project, • pcwang-thead. · View Herald Transcript
dvyukov accepted this revision.May 23 2023, 7:59 AM

Nice! Should simplify changing these names.

This revision is now accepted and ready to land.May 23 2023, 7:59 AM
Harbormaster completed remote builds in B233876: Diff 524722.May 23 2023, 8:41 AM
Closed by commit rG2f1e2a6b1ca2: [HWASan] Use ASM_WRAPPER_NAME instead of __interceptor_* (authored by melver). · Explain WhyMay 24 2023, 2:58 AM
This revision was automatically updated to reflect the committed changes.
melver added a commit: rG2f1e2a6b1ca2: [HWASan] Use ASM_WRAPPER_NAME instead of __interceptor_*.
RamNalamothu added a subscriber: RamNalamothu.May 24 2023, 9:20 AM
RamNalamothu added inline comments.
compiler-rt/lib/hwasan/hwasan_setjmp_riscv64.S
44

Typo at line 44:

ASN_WRAPPER_NAME --> ASM_WRAPPER_NAME
melver marked an inline comment as done.May 24 2023, 9:27 AM
melver added inline comments.
compiler-rt/lib/hwasan/hwasan_setjmp_riscv64.S
44

Fixed, thanks for the report!

Revision Contents

PathSize
compiler-rt/
lib/
hwasan/
36 lines
22 lines
20 lines

Diff 524722

compiler-rt/lib/hwasan/hwasan_setjmp_aarch64.S

Show All 25 Lines
// //
// There's essentially no way to ensure that the compiler will not modify the // There's essentially no way to ensure that the compiler will not modify the
// stack pointer when compiling a C function. // stack pointer when compiling a C function.
// Hence we have to write this function in assembly. // Hence we have to write this function in assembly.
.section .text .section .text
.file "hwasan_setjmp_aarch64.S" .file "hwasan_setjmp_aarch64.S"
.global __interceptor_setjmp .global ASM_WRAPPER_NAME(setjmp)
ASM_TYPE_FUNCTION(__interceptor_setjmp) ASM_TYPE_FUNCTION(ASM_WRAPPER_NAME(setjmp))
__interceptor_setjmp: ASM_WRAPPER_NAME(setjmp):
CFI_STARTPROC CFI_STARTPROC
BTI_C BTI_C
mov x1, #0 mov x1, #0
b __interceptor_sigsetjmp b ASM_WRAPPER_NAME(sigsetjmp)
CFI_ENDPROC CFI_ENDPROC
ASM_SIZE(__interceptor_setjmp) ASM_SIZE(ASM_WRAPPER_NAME(setjmp))
#if SANITIZER_ANDROID #if SANITIZER_ANDROID
// Bionic also defines a function `setjmp` that calls `sigsetjmp` saving the // Bionic also defines a function `setjmp` that calls `sigsetjmp` saving the
// current signal. // current signal.
.global __interceptor_setjmp_bionic .global ASM_WRAPPER_NAME(setjmp_bionic)
ASM_TYPE_FUNCTION(__interceptor_setjmp_bionic) ASM_TYPE_FUNCTION(ASM_WRAPPER_NAME(setjmp_bionic))
__interceptor_setjmp_bionic: ASM_WRAPPER_NAME(setjmp_bionic):
CFI_STARTPROC CFI_STARTPROC
BTI_C BTI_C
mov x1, #1 mov x1, #1
b __interceptor_sigsetjmp b ASM_WRAPPER_NAME(sigsetjmp)
CFI_ENDPROC CFI_ENDPROC
ASM_SIZE(__interceptor_setjmp_bionic) ASM_SIZE(ASM_WRAPPER_NAME(setjmp_bionic))
#endif #endif
.global __interceptor_sigsetjmp .global ASM_WRAPPER_NAME(sigsetjmp)
ASM_TYPE_FUNCTION(__interceptor_sigsetjmp) ASM_TYPE_FUNCTION(ASM_WRAPPER_NAME(sigsetjmp))
__interceptor_sigsetjmp: ASM_WRAPPER_NAME(sigsetjmp):
CFI_STARTPROC CFI_STARTPROC
BTI_C BTI_C
stp x19, x20, [x0, #0<<3] stp x19, x20, [x0, #0<<3]
stp x21, x22, [x0, #2<<3] stp x21, x22, [x0, #2<<3]
stp x23, x24, [x0, #4<<3] stp x23, x24, [x0, #4<<3]
stp x25, x26, [x0, #6<<3] stp x25, x26, [x0, #6<<3]
stp x27, x28, [x0, #8<<3] stp x27, x28, [x0, #8<<3]
stp x29, x30, [x0, #10<<3] stp x29, x30, [x0, #10<<3]
stp d8, d9, [x0, #14<<3] stp d8, d9, [x0, #14<<3]
stp d10, d11, [x0, #16<<3] stp d10, d11, [x0, #16<<3]
stp d12, d13, [x0, #18<<3] stp d12, d13, [x0, #18<<3]
stp d14, d15, [x0, #20<<3] stp d14, d15, [x0, #20<<3]
mov x2, sp mov x2, sp
str x2, [x0, #13<<3] str x2, [x0, #13<<3]
// We always have the second argument to __sigjmp_save (savemask) set, since // We always have the second argument to __sigjmp_save (savemask) set, since
// the _setjmp function above has set it for us as `false`. // the _setjmp function above has set it for us as `false`.
// This function is defined in hwasan_interceptors.cc // This function is defined in hwasan_interceptors.cc
b __sigjmp_save b __sigjmp_save
CFI_ENDPROC CFI_ENDPROC
ASM_SIZE(__interceptor_sigsetjmp) ASM_SIZE(ASM_WRAPPER_NAME(sigsetjmp))
.macro WEAK_ALIAS first second .macro WEAK_ALIAS first second
.weak \second .weak \second
.equ \second\(), \first .equ \second\(), \first
.endm .endm
#if SANITIZER_ANDROID #if SANITIZER_ANDROID
WEAK_ALIAS __interceptor_sigsetjmp, sigsetjmp WEAK_ALIAS ASM_WRAPPER_NAME(sigsetjmp), sigsetjmp
WEAK_ALIAS __interceptor_setjmp_bionic, setjmp WEAK_ALIAS ASM_WRAPPER_NAME(setjmp_bionic), setjmp
#else #else
WEAK_ALIAS __interceptor_sigsetjmp, __sigsetjmp WEAK_ALIAS ASM_WRAPPER_NAME(sigsetjmp), __sigsetjmp
#endif #endif
WEAK_ALIAS __interceptor_setjmp, _setjmp WEAK_ALIAS ASM_WRAPPER_NAME(setjmp), _setjmp
#endif #endif
// We do not need executable stack. // We do not need executable stack.
NO_EXEC_STACK_DIRECTIVE NO_EXEC_STACK_DIRECTIVE
GNU_PROPERTY_BTI_PAC GNU_PROPERTY_BTI_PAC

compiler-rt/lib/hwasan/hwasan_setjmp_riscv64.S

Show All 25 Lines
// //
// There's essentially no way to ensure that the compiler will not modify the // There's essentially no way to ensure that the compiler will not modify the
// stack pointer when compiling a C function. // stack pointer when compiling a C function.
// Hence we have to write this function in assembly. // Hence we have to write this function in assembly.
.section .text .section .text
.file "hwasan_setjmp_riscv64.S" .file "hwasan_setjmp_riscv64.S"
.global __interceptor_setjmp .global ASM_WRAPPER_NAME(setjmp)
ASM_TYPE_FUNCTION(__interceptor_setjmp) ASM_TYPE_FUNCTION(ASM_WRAPPER_NAME(setjmp))
__interceptor_setjmp: ASM_WRAPPER_NAME(setjmp):
CFI_STARTPROC CFI_STARTPROC
addi x11, x0, 0 addi x11, x0, 0
tail __interceptor_sigsetjmp tail ASM_WRAPPER_NAME(sigsetjmp)
CFI_ENDPROC CFI_ENDPROC
ASM_SIZE(__interceptor_setjmp) ASM_SIZE(ASM_WRAPPER_NAME(setjmp))
.global __interceptor_sigsetjmp .global ASM_WRAPPER_NAME(sigsetjmp)
ASM_TYPE_FUNCTION(__interceptor_sigsetjmp) ASM_TYPE_FUNCTION(ASN_WRAPPER_NAME(sigsetjmp))
RamNalamothuUnsubmitted
Not Done
ReplyInline Actions

Typo at line 44:

ASN_WRAPPER_NAME --> ASM_WRAPPER_NAME
RamNalamothu: Typo at line 44: ASN_WRAPPER_NAME --> ASM_WRAPPER_NAME
melverAuthorUnsubmitted
Done
ReplyInline Actions

Fixed, thanks for the report!

melver: Fixed, thanks for the report!
__interceptor_sigsetjmp: ASM_WRAPPER_NAME(sigsetjmp):
CFI_STARTPROC CFI_STARTPROC
sd ra, 0<<3(x10) sd ra, 0<<3(x10)
sd s0, 1<<3(x10) sd s0, 1<<3(x10)
sd s1, 2<<3(x10) sd s1, 2<<3(x10)
sd s2, 3<<3(x10) sd s2, 3<<3(x10)
sd s3, 4<<3(x10) sd s3, 4<<3(x10)
sd s4, 5<<3(x10) sd s4, 5<<3(x10)
sd s5, 6<<3(x10) sd s5, 6<<3(x10)
Show All 21 Lines
#else #else
# error "Unsupported case" # error "Unsupported case"
#endif #endif
// We always have the second argument to __sigjmp_save (savemask) set, since // We always have the second argument to __sigjmp_save (savemask) set, since
// the _setjmp function above has set it for us as `false`. // the _setjmp function above has set it for us as `false`.
// This function is defined in hwasan_interceptors.cc // This function is defined in hwasan_interceptors.cc
tail __sigjmp_save tail __sigjmp_save
CFI_ENDPROC CFI_ENDPROC
ASM_SIZE(__interceptor_sigsetjmp) ASM_SIZE(ASM_WRAPPER_NAME(sigsetjmp))
.macro WEAK_ALIAS first second .macro WEAK_ALIAS first second
.weak \second .weak \second
.equ \second\(), \first .equ \second\(), \first
.endm .endm
WEAK_ALIAS __interceptor_sigsetjmp, __sigsetjmp WEAK_ALIAS ASM_WRAPPER_NAME(sigsetjmp), __sigsetjmp
WEAK_ALIAS __interceptor_setjmp, _setjmp WEAK_ALIAS ASM_WRAPPER_NAME(setjmp), _setjmp
#endif #endif
// We do not need executable stack. // We do not need executable stack.
NO_EXEC_STACK_DIRECTIVE NO_EXEC_STACK_DIRECTIVE

compiler-rt/lib/hwasan/hwasan_setjmp_x86_64.S

Show All 25 Lines
// stack pointer when compiling a C function. // stack pointer when compiling a C function.
// Hence we have to write this function in assembly. // Hence we have to write this function in assembly.
// //
// TODO: Handle Intel CET. // TODO: Handle Intel CET.
.section .text .section .text
.file "hwasan_setjmp_x86_64.S" .file "hwasan_setjmp_x86_64.S"
.global __interceptor_setjmp .global ASM_WRAPPER_NAME(setjmp)
ASM_TYPE_FUNCTION(__interceptor_setjmp) ASM_TYPE_FUNCTION(ASM_WRAPPER_NAME(setjmp))
__interceptor_setjmp: ASM_WRAPPER_NAME(setjmp):
CFI_STARTPROC CFI_STARTPROC
_CET_ENDBR _CET_ENDBR
xorl %esi, %esi xorl %esi, %esi
jmp .Linterceptor_sigsetjmp jmp .Linterceptor_sigsetjmp
CFI_ENDPROC CFI_ENDPROC
ASM_SIZE(__interceptor_setjmp) ASM_SIZE(ASM_WRAPPER_NAME(setjmp))
.global __interceptor_sigsetjmp .global ASM_WRAPPER_NAME(sigsetjmp)
ASM_TYPE_FUNCTION(__interceptor_sigsetjmp) ASM_TYPE_FUNCTION(ASM_WRAPPER_NAME(sigsetjmp))
__interceptor_sigsetjmp: ASM_WRAPPER_NAME(sigsetjmp):
.Linterceptor_sigsetjmp: .Linterceptor_sigsetjmp:
CFI_STARTPROC CFI_STARTPROC
_CET_ENDBR _CET_ENDBR
// Save callee save registers. // Save callee save registers.
mov %rbx, (0*8)(%rdi) mov %rbx, (0*8)(%rdi)
mov %rbp, (1*8)(%rdi) mov %rbp, (1*8)(%rdi)
mov %r12, (2*8)(%rdi) mov %r12, (2*8)(%rdi)
mov %r13, (3*8)(%rdi) mov %r13, (3*8)(%rdi)
mov %r14, (4*8)(%rdi) mov %r14, (4*8)(%rdi)
mov %r15, (5*8)(%rdi) mov %r15, (5*8)(%rdi)
// Save SP as it was in caller's frame. // Save SP as it was in caller's frame.
lea 8(%rsp), %rdx lea 8(%rsp), %rdx
mov %rdx, (6*8)(%rdi) mov %rdx, (6*8)(%rdi)
// Save return address. // Save return address.
mov (%rsp), %rax mov (%rsp), %rax
mov %rax, (7*8)(%rdi) mov %rax, (7*8)(%rdi)
jmp __sigjmp_save jmp __sigjmp_save
CFI_ENDPROC CFI_ENDPROC
ASM_SIZE(__interceptor_sigsetjmp) ASM_SIZE(ASM_WRAPPER_NAME(sigsetjmp))
.macro WEAK_ALIAS first second .macro WEAK_ALIAS first second
.weak \second .weak \second
.equ \second\(), \first .equ \second\(), \first
.endm .endm
WEAK_ALIAS __interceptor_sigsetjmp, __sigsetjmp WEAK_ALIAS ASM_WRAPPER_NAME(sigsetjmp), __sigsetjmp
WEAK_ALIAS __interceptor_setjmp, _setjmp WEAK_ALIAS ASM_WRAPPER_NAME(setjmp), _setjmp
#endif #endif
// We do not need executable stack. // We do not need executable stack.
NO_EXEC_STACK_DIRECTIVE NO_EXEC_STACK_DIRECTIVE