This is an archive of the discontinued LLVM Phabricator instance.

Differential D19594

[sanitizers] [SystemZ] Enable TLS functionality.
ClosedPublic

Authored by • koriakin on Apr 27 2016, 7:24 AM.

Details

Reviewers
kcc
eugenis
Commits
rG655db0fd3a82: [sanitizer] [SystemZ] Enable TLS functionality.
rCRT273040: [sanitizer] [SystemZ] Enable TLS functionality.
rL273040: [sanitizer] [SystemZ] Enable TLS functionality.
Summary

This enables TLS knowledge for s390 in sanitizers.

Diff Detail

Repository
rL LLVM

Event Timeline

• koriakin updated this revision to Diff 55221.Apr 27 2016, 7:24 AM
• koriakin retitled this revision from to [sanitizers] [SystemZ] Enable TLS functionality..
• koriakin updated this object.
• koriakin added reviewers: kcc, eugenis.
• koriakin set the repository for this revision to rL LLVM.
• koriakin added a project: Restricted Project.
• koriakin added a subscriber: llvm-commits.
Herald added a subscriber: kubamracek. · View Herald TranscriptApr 27 2016, 7:24 AM
• koriakin mentioned this in D18894: [sanitizer] [SystemZ] Enable TLS functionality..Apr 27 2016, 7:25 AM
• koriakin added a parent revision: D19589: [clang] [Builtin] Make __builtin_thread_pointer target-independent..
kcc accepted this revision.Apr 27 2016, 10:20 AM
kcc edited edge metadata.

LGTM

This revision is now accepted and ready to land.Apr 27 2016, 10:20 AM
Closed by commit rL273040: [sanitizer] [SystemZ] Enable TLS functionality. (authored by • koriakin). · Explain WhyJun 17 2016, 1:31 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
sanitizer_common/
9 lines

Diff 55221

lib/sanitizer_common/sanitizer_linux_libcdep.cc

Show First 20 Lines • Show All 181 Lines • ▼ Show 20 Lines if (tls_align < kStackAlign)
tls_align = kStackAlign; tls_align = kStackAlign;
g_tls_size = RoundUpTo(tls_size, tls_align); g_tls_size = RoundUpTo(tls_size, tls_align);
} }
#else #else
void InitTlsSize() { } void InitTlsSize() { }
#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO #endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO
#if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \ #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \
|| defined(__aarch64__) || defined(__powerpc64__)) \ || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__)) \
&& SANITIZER_LINUX && !SANITIZER_ANDROID && SANITIZER_LINUX && !SANITIZER_ANDROID
// sizeof(struct pthread) from glibc. // sizeof(struct pthread) from glibc.
static atomic_uintptr_t kThreadDescriptorSize; static atomic_uintptr_t kThreadDescriptorSize;
uptr ThreadDescriptorSize() { uptr ThreadDescriptorSize() {
uptr val = atomic_load(&kThreadDescriptorSize, memory_order_relaxed); uptr val = atomic_load(&kThreadDescriptorSize, memory_order_relaxed);
if (val) if (val)
return val; return val;
▲ Show 20 Lines • Show All 45 Lines • ▼ Show 20 Lines#elif defined(__aarch64__)
// The sizeof (struct pthread) is the same from GLIBC 2.17 to 2.22. // The sizeof (struct pthread) is the same from GLIBC 2.17 to 2.22.
val = 1776; val = 1776;
atomic_store(&kThreadDescriptorSize, val, memory_order_relaxed); atomic_store(&kThreadDescriptorSize, val, memory_order_relaxed);
return val; return val;
#elif defined(__powerpc64__) #elif defined(__powerpc64__)
val = 1776; // from glibc.ppc64le 2.20-8.fc21 val = 1776; // from glibc.ppc64le 2.20-8.fc21
atomic_store(&kThreadDescriptorSize, val, memory_order_relaxed); atomic_store(&kThreadDescriptorSize, val, memory_order_relaxed);
return val; return val;
#elif defined(__s390__)
val = FIRST_32_SECOND_64(1152, 1776); // valid for glibc 2.22
atomic_store(&kThreadDescriptorSize, val, memory_order_relaxed);
#endif #endif
return 0; return 0;
} }
// The offset at which pointer to self is located in the thread descriptor. // The offset at which pointer to self is located in the thread descriptor.
const uptr kThreadSelfOffset = FIRST_32_SECOND_64(8, 16); const uptr kThreadSelfOffset = FIRST_32_SECOND_64(8, 16);
uptr ThreadSelfOffset() { uptr ThreadSelfOffset() {
Show All 31 Lines# elif defined(__mips__)
// TCB and the size of pthread_descr. // TCB and the size of pthread_descr.
const uptr kTlsTcbOffset = 0x7000; const uptr kTlsTcbOffset = 0x7000;
uptr thread_pointer; uptr thread_pointer;
asm volatile(".set push;\ asm volatile(".set push;\
.set mips64r2;\ .set mips64r2;\
rdhwr %0,$29;\ rdhwr %0,$29;\
.set pop" : "=r" (thread_pointer)); .set pop" : "=r" (thread_pointer));
descr_addr = thread_pointer - kTlsTcbOffset - TlsPreTcbSize(); descr_addr = thread_pointer - kTlsTcbOffset - TlsPreTcbSize();
# elif defined(__aarch64__) # elif defined(__aarch64__) || defined(__s390__)
descr_addr = reinterpret_cast<uptr>(__builtin_thread_pointer()); descr_addr = reinterpret_cast<uptr>(__builtin_thread_pointer());
# elif defined(__powerpc64__) # elif defined(__powerpc64__)
// PPC64LE uses TLS variant I. The thread pointer (in GPR 13) // PPC64LE uses TLS variant I. The thread pointer (in GPR 13)
// points to the end of the TCB + 0x7000. The pthread_descr structure is // points to the end of the TCB + 0x7000. The pthread_descr structure is
// immediately in front of the TCB. TlsPreTcbSize() includes the size of the // immediately in front of the TCB. TlsPreTcbSize() includes the size of the
// TCB and the size of pthread_descr. // TCB and the size of pthread_descr.
const uptr kTlsTcbOffset = 0x7000; const uptr kTlsTcbOffset = 0x7000;
uptr thread_pointer; uptr thread_pointer;
Show All 24 Lines
uptr ThreadSelf() { uptr ThreadSelf() {
return (uptr)ThreadSelfSegbase()[2]; return (uptr)ThreadSelfSegbase()[2];
} }
#endif // SANITIZER_FREEBSD #endif // SANITIZER_FREEBSD
#if !SANITIZER_GO #if !SANITIZER_GO
static void GetTls(uptr *addr, uptr *size) { static void GetTls(uptr *addr, uptr *size) {
#if SANITIZER_LINUX && !SANITIZER_ANDROID #if SANITIZER_LINUX && !SANITIZER_ANDROID
# if defined(__x86_64__) || defined(__i386__) # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
*addr = ThreadSelf(); *addr = ThreadSelf();
*size = GetTlsSize(); *size = GetTlsSize();
*addr -= *size; *addr -= *size;
*addr += ThreadDescriptorSize(); *addr += ThreadDescriptorSize();
# elif defined(__mips__) || defined(__aarch64__) || defined(__powerpc64__) # elif defined(__mips__) || defined(__aarch64__) || defined(__powerpc64__)
*addr = ThreadSelf(); *addr = ThreadSelf();
*size = GetTlsSize(); *size = GetTlsSize();
# else # else
▲ Show 20 Lines • Show All 202 Lines • Show Last 20 Lines