Skip to content

Commit 303d278

Browse files
committed
[tsan] Fix pthread_once() on Mac OS X
Change 636428c enabled BlockingRegion hooks for pthread_once(). Unfortunately this seems to cause crashes on Mac OS X which uses pthread_once() from locations that seem to result in crashes: | ThreadSanitizer:DEADLYSIGNAL | ==31465==ERROR: ThreadSanitizer: stack-overflow on address 0x7ffee73fffd8 (pc 0x00010807fd2a bp 0x7ffee7400050 sp 0x7ffee73fffb0 T93815) | #0 __tsan::MetaMap::GetSync(__tsan::ThreadState*, unsigned long, unsigned long, bool, bool) tsan_sync.cpp:195 (libclang_rt.tsan_osx_dynamic.dylib:x86_64+0x78d2a) | #1 __tsan::MutexPreLock(__tsan::ThreadState*, unsigned long, unsigned long, unsigned int) tsan_rtl_mutex.cpp:143 (libclang_rt.tsan_osx_dynamic.dylib:x86_64+0x6cefc) | #2 wrap_pthread_mutex_lock sanitizer_common_interceptors.inc:4240 (libclang_rt.tsan_osx_dynamic.dylib:x86_64+0x3dae0) | #3 flockfile <null>:2 (libsystem_c.dylib:x86_64+0x38a69) | #4 puts <null>:2 (libsystem_c.dylib:x86_64+0x3f69b) | #5 wrap_puts sanitizer_common_interceptors.inc (libclang_rt.tsan_osx_dynamic.dylib:x86_64+0x34d83) | #6 __tsan::OnPotentiallyBlockingRegionBegin() cxa_guard_acquire.cpp:8 (foo:x86_64+0x100000e48) | #7 wrap_pthread_once tsan_interceptors_posix.cpp:1512 (libclang_rt.tsan_osx_dynamic.dylib:x86_64+0x2f6e6) From the stack trace it can be seen that the caller is unknown, and the resulting stack-overflow seems to indicate that whoever the caller is does not have enough stack space or otherwise is running in a limited environment not yet ready for full instrumentation. Fix it by reverting behaviour on Mac OS X to not call BlockingRegion hooks from pthread_once(). Reported-by: azharudd Reviewed By: glider Differential Revision: https://reviews.llvm.org/D108305
1 parent c20cb55 commit 303d278

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

compiler-rt/lib/tsan/rtl/tsan_interceptors_posix.cpp

+12-4
Original file line numberDiff line numberDiff line change
@@ -855,9 +855,15 @@ constexpr u32 kGuardDone = 1;
855855
constexpr u32 kGuardRunning = 1 << 16;
856856
constexpr u32 kGuardWaiter = 1 << 17;
857857

858-
static int guard_acquire(ThreadState *thr, uptr pc, atomic_uint32_t *g) {
859-
OnPotentiallyBlockingRegionBegin();
860-
auto on_exit = at_scope_exit(&OnPotentiallyBlockingRegionEnd);
858+
static int guard_acquire(ThreadState *thr, uptr pc, atomic_uint32_t *g,
859+
bool blocking_hooks = true) {
860+
if (blocking_hooks)
861+
OnPotentiallyBlockingRegionBegin();
862+
auto on_exit = at_scope_exit([blocking_hooks] {
863+
if (blocking_hooks)
864+
OnPotentiallyBlockingRegionEnd();
865+
});
866+
861867
for (;;) {
862868
u32 cmp = atomic_load(g, memory_order_acquire);
863869
if (cmp == kGuardInit) {
@@ -1509,7 +1515,9 @@ TSAN_INTERCEPTOR(int, pthread_once, void *o, void (*f)()) {
15091515
else
15101516
a = static_cast<atomic_uint32_t*>(o);
15111517

1512-
if (guard_acquire(thr, pc, a)) {
1518+
// Mac OS X appears to use pthread_once() where calling BlockingRegion hooks
1519+
// result in crashes due to too little stack space.
1520+
if (guard_acquire(thr, pc, a, !SANITIZER_MAC)) {
15131521
(*f)();
15141522
guard_release(thr, pc, a);
15151523
}

0 commit comments

Comments
 (0)