This is an archive of the discontinued LLVM Phabricator instance.

Differential D139494

[safestack] Enable loongarch64
ClosedPublic

Authored by tangyouling on Dec 6 2022, 6:19 PM.

Details

Reviewers
SixWeining
xen0n
xry111
MaskRay
XiaodongLoong
lixing-star
vitalybuka
Group Reviewers
Restricted Project
Commits
rG97f370a0a3dc: [safestack] Enable loongarch64
Summary

Enable safestack on loongarch64.

Some test cases will fail on loongarch, it will be fixed in glibc,
Links: https://sourceware.org/pipermail/libc-alpha/2022-November/143641.html

Diff Detail

Event Timeline

tangyouling created this revision.Dec 6 2022, 6:19 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 6 2022, 6:19 PM
Herald added subscribers: Enna1, StephenFan. · View Herald Transcript
tangyouling requested review of this revision.Dec 6 2022, 6:19 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 6 2022, 6:19 PM
Harbormaster completed remote builds in B201578: Diff 480731.Dec 6 2022, 6:20 PM
tangyouling added a reviewer: lixing-star.Dec 6 2022, 6:21 PM
tangyouling added a comment.Dec 6 2022, 6:24 PM
$ make check-safestack
Testing Time: 1.48s
  Unsupported: 1
  Passed     : 8

2 warning(s) in tests
[100%] Built target check-safestack
vitalybuka added a subscriber: vitalybuka.Dec 6 2022, 7:27 PM
vitalybuka added inline comments.
compiler-rt/lib/safestack/safestack_platform.h
100

I can be too early for libc call, syscall should be used here

tangyouling added inline comments.Dec 7 2022, 12:11 AM
compiler-rt/lib/safestack/safestack_platform.h
100

I can be too early for libc call, syscall should be used here

Under the current glibc, if syscall is used, the test will fail on loongarch.
It is of course possible to wait for the glibc fix patch to be merged in and just enable safestack without making this change.

xen0n added inline comments.Dec 7 2022, 12:34 AM
compiler-rt/lib/safestack/safestack_platform.h
100

I can be too early for libc call, syscall should be used here

Under the current glibc, if syscall is used, the test will fail on loongarch.
It is of course possible to wait for the glibc fix patch to be merged in and just enable safestack without making this change.

Or just patch the glibc in your builder instance so we can continue invoking the raw syscall wrapper here? The glibc change eventually will appear upstream so at that point code here won't need to be changed again.

tangyouling added inline comments.Dec 7 2022, 1:00 AM
compiler-rt/lib/safestack/safestack_platform.h
100

I can be too early for libc call, syscall should be used here

Under the current glibc, if syscall is used, the test will fail on loongarch.
It is of course possible to wait for the glibc fix patch to be merged in and just enable safestack without making this change.

Or just patch the glibc in your builder instance so we can continue invoking the raw syscall wrapper here? The glibc change eventually will appear upstream so at that point code here won't need to be changed again.

Yes, then I will remove this change.

tangyouling updated this revision to Diff 481120.Dec 7 2022, 5:40 PM

Use the syscall method and remove the relevant changes.

tangyouling edited the summary of this revision. (Show Details)Dec 7 2022, 5:44 PM
tangyouling added a reviewer: vitalybuka.
SixWeining accepted this revision.Dec 7 2022, 5:47 PM

LGTM.

This revision is now accepted and ready to land.Dec 7 2022, 5:47 PM
vitalybuka accepted this revision.Dec 7 2022, 5:56 PM
Harbormaster completed remote builds in B201856: Diff 481120.Dec 7 2022, 6:35 PM
This revision was landed with ongoing or failed builds.Dec 9 2022, 7:49 PM
Closed by commit rG97f370a0a3dc: [safestack] Enable loongarch64 (authored by tangyouling, committed by SixWeining). · Explain Why
This revision was automatically updated to reflect the committed changes.
SixWeining added a commit: rG97f370a0a3dc: [safestack] Enable loongarch64.

Revision Contents

PathSize
compiler-rt/
cmake/
Modules/
2 lines
lib/
safestack/
2 lines

Diff 480731

compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake

Show First 20 Lines • Show All 58 Lines • ▼ Show 20 Lines
set(ALL_MEMPROF_SUPPORTED_ARCH ${X86_64}) set(ALL_MEMPROF_SUPPORTED_ARCH ${X86_64})
set(ALL_PROFILE_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${PPC32} ${PPC64} set(ALL_PROFILE_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${PPC32} ${PPC64}
${MIPS32} ${MIPS64} ${S390X} ${SPARC} ${SPARCV9} ${HEXAGON} ${MIPS32} ${MIPS64} ${S390X} ${SPARC} ${SPARCV9} ${HEXAGON}
${RISCV32} ${RISCV64}) ${RISCV32} ${RISCV64})
set(ALL_TSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64} ${PPC64} ${S390X}) set(ALL_TSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64} ${PPC64} ${S390X})
set(ALL_UBSAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV64} set(ALL_UBSAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV64}
${MIPS32} ${MIPS64} ${PPC64} ${S390X} ${SPARC} ${SPARCV9} ${HEXAGON}) ${MIPS32} ${MIPS64} ${PPC64} ${S390X} ${SPARC} ${SPARCV9} ${HEXAGON})
set(ALL_SAFESTACK_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM64} ${MIPS32} ${MIPS64} set(ALL_SAFESTACK_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM64} ${MIPS32} ${MIPS64}
${HEXAGON}) ${HEXAGON} ${LOONGARCH64})
set(ALL_CFI_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${MIPS64} set(ALL_CFI_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${MIPS64}
${HEXAGON}) ${HEXAGON})
set(ALL_SCUDO_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${MIPS32} set(ALL_SCUDO_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${MIPS32}
${MIPS64} ${PPC64} ${HEXAGON} ${LOONGARCH64}) ${MIPS64} ${PPC64} ${HEXAGON} ${LOONGARCH64})
set(ALL_SCUDO_STANDALONE_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} set(ALL_SCUDO_STANDALONE_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64}
${MIPS32} ${MIPS64} ${PPC64} ${HEXAGON} ${LOONGARCH64}) ${MIPS32} ${MIPS64} ${PPC64} ${HEXAGON} ${LOONGARCH64})
if(APPLE) if(APPLE)
set(ALL_XRAY_SUPPORTED_ARCH ${X86_64}) set(ALL_XRAY_SUPPORTED_ARCH ${X86_64})
Show All 13 Lines

compiler-rt/lib/safestack/safestack_platform.h

Show First 20 Lines • Show All 90 Lines • ▼ Show 20 Lines
} }
inline void *Mmap(void *addr, size_t length, int prot, int flags, int fd, inline void *Mmap(void *addr, size_t length, int prot, int flags, int fd,
off_t offset) { off_t offset) {
#if SANITIZER_NETBSD #if SANITIZER_NETBSD
return __mmap(addr, length, prot, flags, fd, 0, offset); return __mmap(addr, length, prot, flags, fd, 0, offset);
#elif SANITIZER_FREEBSD && (defined(__aarch64__) || defined(__x86_64__)) #elif SANITIZER_FREEBSD && (defined(__aarch64__) || defined(__x86_64__))
return (void *)__syscall(SYS_mmap, addr, length, prot, flags, fd, offset); return (void *)__syscall(SYS_mmap, addr, length, prot, flags, fd, offset);
#elif SANITIZER_LOONGARCH64
return mmap(addr, length, prot, flags, fd, offset);
vitalybukaUnsubmitted
Not Done
ReplyInline Actions

I can be too early for libc call, syscall should be used here

vitalybuka: I can be too early for libc call, syscall should be used here
tangyoulingAuthorUnsubmitted
Done
ReplyInline Actions

I can be too early for libc call, syscall should be used here

Under the current glibc, if syscall is used, the test will fail on loongarch.
It is of course possible to wait for the glibc fix patch to be merged in and just enable safestack without making this change.

tangyouling: > I can be too early for libc call, syscall should be used here > Under the current glibc, if…
xen0nUnsubmitted
Not Done
ReplyInline Actions

I can be too early for libc call, syscall should be used here

Under the current glibc, if syscall is used, the test will fail on loongarch.
It is of course possible to wait for the glibc fix patch to be merged in and just enable safestack without making this change.

Or just patch the glibc in your builder instance so we can continue invoking the raw syscall wrapper here? The glibc change eventually will appear upstream so at that point code here won't need to be changed again.

xen0n: > > I can be too early for libc call, syscall should be used here > > > > Under the current…
tangyoulingAuthorUnsubmitted
Done
ReplyInline Actions

I can be too early for libc call, syscall should be used here

Under the current glibc, if syscall is used, the test will fail on loongarch.
It is of course possible to wait for the glibc fix patch to be merged in and just enable safestack without making this change.

Or just patch the glibc in your builder instance so we can continue invoking the raw syscall wrapper here? The glibc change eventually will appear upstream so at that point code here won't need to be changed again.

Yes, then I will remove this change.

tangyouling: > > > I can be too early for libc call, syscall should be used here > > > > > > > Under the…
#else #else
return (void *)syscall(SYS_mmap, addr, length, prot, flags, fd, offset); return (void *)syscall(SYS_mmap, addr, length, prot, flags, fd, offset);
#endif #endif
} }
inline int Munmap(void *addr, size_t length) { inline int Munmap(void *addr, size_t length) {
#if SANITIZER_NETBSD #if SANITIZER_NETBSD
DEFINE__REAL(int, munmap, void *a, size_t b); DEFINE__REAL(int, munmap, void *a, size_t b);
Show All 18 Lines