[LSAN][Fuchsia] Added ForEachExtraThreadStackRange to support Fuchsia code.

[vitalybuka]

compiler-rt/lib/lsan/lsan_common.h

106–108

why do we both?

[kstoimenov]

compiler-rt/lib/lsan/lsan_common.h

106–108

Because code in lsan_common_fuchsia.cpp should not depend on LSAN specific function like GetLsanThreadRegistryLocked. That is the reason why we were getting unresolved external for ASAN builds.

[kstoimenov]

Removed callback.

[vitalybuka]

compiler-rt/lib/asan/asan_thread.cpp

529

void* to actual type

compiler-rt/lib/lsan/lsan_thread.cpp

80

remove ForEachExtraStackRange and use GetExtraThreadStackRanges instead

80

GetExtraThreadStackRanges(os_id, vector<>...)

[vitalybuka]

compiler-rt/lib/asan/asan_thread.cpp

518

compiler-rt/lib/lsan/lsan_common_fuchsia.cpp

154

P1, ingore other comment if this one works

I guess the only problem that we have empty SuspendedThreadsListFuchsia

instead of stuff on line 149
maybe introduce lsan::GetAllThreads() and use it
for params->callback(lsan::GetAllThreads(), params->argument)

[kstoimenov]

Removed callbacks.

[kstoimenov]

I've removed callbacks from the interface. PTAL.

[vitalybuka]

compiler-rt/lib/lsan/lsan_common_fuchsia.cpp

154

P1, ingore other comment if this one works

I guess the only problem that we have empty SuspendedThreadsListFuchsia

instead of stuff on line 149
maybe introduce lsan::GetAllThreads() and use it
for params->callback(lsan::GetAllThreads(), params->argument)

what about this? seems easy and will make fuchsia loop consistent with the rest

[kstoimenov]

compiler-rt/lib/lsan/lsan_common_fuchsia.cpp

154

Could you please elaborate or provide sample code?

[kstoimenov]

Added ScanExtraStackRanges.

[kstoimenov]

I think this should work. I added ScanExtraStackRanges helper which is used both by lsan_common.cpp and lsan_common_fuchsia.cpp.

[vitalybuka]

compiler-rt/lib/lsan/lsan_common_fuchsia.cpp

148–154

[vitalybuka]

compiler-rt/lib/lsan/lsan_common_fuchsia.cpp

148–154

I see, this does not work :(
Please upload your favorite snapshot.

[kstoimenov]

Fixed fuchsia.

[kstoimenov]

Fixed compilation on Fuchsia.

[kstoimenov]

compiler-rt/lib/lsan/lsan_common_fuchsia.cpp

148–154

This shapshot compiles on Fuchsia.

[vitalybuka]

remove GetAllThreads

compiler-rt/lib/asan/asan_thread.cpp

bool GetThreadRangesLocked(tid_t os_id, uptr *stack_begin, uptr *stack_end,
   *cache_begin = 0;
   *cache_end = 0;
   *dtls = t->dtls();
   return true;
 }
 
 void GetAllThreadAllocatorCachesLocked(InternalMmapVector<uptr> *caches) {}
 
+void ForEachExtraThreadStackRange(RangeIteratorCallback callback, void *arg) {
+  GetAsanThreadRegistryLocked()->RunCallbackForEachThreadLocked(
+      [](ThreadContextBase *tctx, void *arg) {
+        ForEachExtraStackRange(tctx->os_id, ForEachExtraStackRangeCb, arg);
+      },
+      arg);
+}
+
 void ForEachExtraStackRange(tid_t os_id, RangeIteratorCallback callback,
                             void *arg) {
   __asan::AsanThread *t = __asan::GetAsanThreadByOsIDLocked(os_id);
   if (!t)
     return;
   __asan::FakeStack *fake_stack = t->get_fake_stack();
   if (!fake_stack)
     return;
   fake_stack->ForEachFakeFrame(callback, arg);
 }
 
 void GetAdditionalThreadContextPtrsLocked(InternalMmapVector<uptr> *ptrs) {
   GetAsanThreadRegistryLocked()->RunCallbackForEachThreadLocked(
       [](ThreadContextBase *tctx, void *ptrs) {
         // Look for the arg pointer of threads that have been created or are
         // running. This is necessary to prevent false positive leaks due to the
         // AsanThread holding the only live reference to a heap object.  This
         // can happen because the `pthread_create()` interceptor doesn't wait
         // for the child thread to start before returning and thus loosing the
         // the only live reference to the heap object on the stack.

compiler-rt/lib/hwasan/hwasan_thread.cpp

bool GetThreadRangesLocked(tid_t os_id, uptr *stack_begin, uptr *stack_end,
   *cache_begin = 0;
   *cache_end = 0;
   *dtls = t->dtls();
   return true;
 }
 
 void GetAllThreadAllocatorCachesLocked(InternalMmapVector<uptr> *caches) {}
 
+void ForEachExtraThreadStackRange(RangeIteratorCallback callback, void *arg) {}
 void ForEachExtraStackRange(tid_t os_id, RangeIteratorCallback callback,
                             void *arg) {}
 
 void GetAdditionalThreadContextPtrsLocked(InternalMmapVector<uptr> *ptrs) {}
 void GetRunningThreadsLocked(InternalMmapVector<tid_t> *threads) {}
 
 }  // namespace __lsan

compiler-rt/lib/lsan/lsan_common.h

 // leak checking and also before every call to pthread_create() (to handle cases
 // where leak checking is initiated from a non-main thread).
 void EnsureMainThreadIDIsCorrect();
 
 bool GetThreadRangesLocked(tid_t os_id, uptr *stack_begin, uptr *stack_end,
                            uptr *tls_begin, uptr *tls_end, uptr *cache_begin,
                            uptr *cache_end, DTLS **dtls);
 void GetAllThreadAllocatorCachesLocked(InternalMmapVector<uptr> *caches);
 void ForEachExtraStackRange(tid_t os_id, RangeIteratorCallback callback,
                             void *arg);
+void ForEachExtraThreadStackRange(RangeIteratorCallback callback, void *arg);
 void GetAdditionalThreadContextPtrsLocked(InternalMmapVector<uptr> *ptrs);
 void GetRunningThreadsLocked(InternalMmapVector<tid_t> *threads);
 
 //// --------------------------------------------------------------------------
 //// Allocator prototypes.
 //// --------------------------------------------------------------------------
 
 // Wrappers for allocator's ForceLock()/ForceUnlock().

compiler-rt/lib/lsan/lsan_common_fuchsia.cpp

__sanitizer_memory_snapshot(
       flags()->use_registers ? registers : nullptr,
       flags()->use_tls ? tls : nullptr,
       [](zx_status_t, void *data) {
         auto params = static_cast<const Params *>(data);
 
         // We don't use the thread registry at all for enumerating the threads
         // and their stacks, registers, and TLS regions.  So use it separately
         // just for the allocator cache, and to call ForEachExtraStackRange,
         // which ASan needs.
         if (flags()->use_stacks) {
-          GetLsanThreadRegistryLocked()->RunCallbackForEachThreadLocked(
-              [](ThreadContextBase *tctx, void *arg) {
-                ForEachExtraStackRange(tctx->os_id, ForEachExtraStackRangeCb,
-                                       arg);
-              },
+          ForEachExtraThreadStackRange(ForEachExtraStackRangeCb,
                                        &params->argument->frontier);
         }
 
         params->callback(SuspendedThreadsListFuchsia(), params->argument);
       },
       &params);
 }
 
 }  // namespace __lsan
 
 // This is declared (in extern "C") by <zircon/sanitizer.h>.
 // _Exit calls this directly to intercept and change the status value.
 int __sanitizer_process_exit_hook(int status) {
   return __lsan::ExitHook(status);
 }
 
 #endif

compiler-rt/lib/lsan/lsan_thread.cpp

 
 void EnsureMainThreadIDIsCorrect() {
   if (GetCurrentThread() == kMainTid)
     CurrentThreadContext()->os_id = GetTid();
 }
 
 ///// Interface to the common LSan module. /////
 
+void ForEachExtraThreadStackRange(tid_t os_id, RangeIteratorCallback callback,
+                                  void *arg) {}
 void ForEachExtraStackRange(tid_t os_id, RangeIteratorCallback callback,
                             void *arg) {}
 
 void LockThreadRegistry() { thread_registry->Lock(); }
 
 void UnlockThreadRegistry() { thread_registry->Unlock(); }
 
 ThreadRegistry *GetLsanThreadRegistryLocked() {
   thread_registry->CheckLocked();