Revert "[hwasan] Fix Thread reuse."

This reverts commit e1eeb026e66c38add2a1f8f1271e1f618c2f7a72.
Test fails: https://reviews.llvm.org/D91208#2388613

diff --git a/compiler-rt/lib/hwasan/hwasan_thread.h b/compiler-rt/lib/hwasan/hwasan_thread.h
index 88958da..ebcdb79 100644 (file)
--- a/compiler-rt/lib/hwasan/hwasan_thread.h
+++ b/compiler-rt/lib/hwasan/hwasan_thread.h
@@ -74,6 +74,8 @@ class Thread {
   HeapAllocationsRingBuffer *heap_allocations_;
   StackAllocationsRingBuffer *stack_allocations_;
 
+  Thread *next_;  // All live threads form a linked list.
+
   u64 unique_id_;  // counting from zero.
 
   u32 tagging_disabled_;  // if non-zero, malloc uses zero tag in this thread.

diff --git a/compiler-rt/lib/hwasan/hwasan_thread_list.h b/compiler-rt/lib/hwasan/hwasan_thread_list.h
index b1ec368..914b632 100644 (file)
--- a/compiler-rt/lib/hwasan/hwasan_thread_list.h
+++ b/compiler-rt/lib/hwasan/hwasan_thread_list.h
@@ -66,6 +66,40 @@ static uptr RingBufferSize() {
   return 0;
 }
 
+struct ThreadListHead {
+  Thread *list_;
+
+  ThreadListHead() : list_(nullptr) {}
+
+  void Push(Thread *t) {
+    t->next_ = list_;
+    list_ = t;
+  }
+
+  Thread *Pop() {
+    Thread *t = list_;
+    if (t)
+      list_ = t->next_;
+    return t;
+  }
+
+  void Remove(Thread *t) {
+    Thread **cur = &list_;
+    while (*cur != t) cur = &(*cur)->next_;
+    CHECK(*cur && "thread not found");
+    *cur = (*cur)->next_;
+  }
+
+  template <class CB>
+  void ForEach(CB cb) {
+    Thread *t = list_;
+    while (t) {
+      cb(t);
+      t = t->next_;
+    }
+  }
+};
+
 struct ThreadStats {
   uptr n_live_threads;
   uptr total_stack_size;
@@ -89,15 +123,14 @@ class HwasanThreadList {
     Thread *t;
     {
       SpinMutexLock l(&list_mutex_);
-      if (!free_list_.empty()) {
-        t = free_list_.back();
-        free_list_.pop_back();
+      t = free_list_.Pop();
+      if (t) {
         uptr start = (uptr)t - ring_buffer_size_;
         internal_memset((void *)start, 0, ring_buffer_size_ + sizeof(Thread));
       } else {
         t = AllocThread();
       }
-      live_list_.push_back(t);
+      live_list_.Push(t);
     }
     t->Init((uptr)t - ring_buffer_size_, ring_buffer_size_);
     AddThreadStats(t);
@@ -109,21 +142,12 @@ class HwasanThreadList {
     ReleaseMemoryPagesToOS(start, start + thread_alloc_size_);
   }
 
-  void RemoveThreadFromLiveList(Thread *t) {
-    for (Thread *&t2 : live_list_)
-      if (t2 == t) {
-        live_list_.erase(&t2);
-        return;
-      }
-    CHECK(0 && "thread not found in live list");
-  }
-
   void ReleaseThread(Thread *t) {
     RemoveThreadStats(t);
     t->Destroy();
     SpinMutexLock l(&list_mutex_);
-    RemoveThreadFromLiveList(t);
-    free_list_.push_back(t);
+    live_list_.Remove(t);
+    free_list_.Push(t);
     DontNeedThread(t);
   }
 
@@ -142,7 +166,7 @@ class HwasanThreadList {
   template <class CB>
   void VisitAllLiveThreads(CB cb) {
     SpinMutexLock l(&list_mutex_);
-    for (Thread *t : live_list_) cb(t);
+    live_list_.ForEach(cb);
   }
 
   void AddThreadStats(Thread *t) {
@@ -177,8 +201,8 @@ class HwasanThreadList {
   uptr ring_buffer_size_;
   uptr thread_alloc_size_;
 
-  InternalMmapVector<Thread *> free_list_;
-  InternalMmapVector<Thread *> live_list_;
+  ThreadListHead free_list_;
+  ThreadListHead live_list_;
   SpinMutex list_mutex_;
 
   ThreadStats stats_;

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common.h b/compiler-rt/lib/sanitizer_common/sanitizer_common.h
index 88f1290..bce24d6 100644 (file)
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common.h
@@ -543,12 +543,6 @@ class InternalMmapVectorNoCtor {
     Swap(size_, other.size_);
   }
 
-  void erase(T *t) {
-    if (t + 1 < end())
-      internal_memmove(t, t + 1, (end() - t - 1) * sizeof(T));
-    --size_;
-  }
-
  private:
   void Realloc(uptr new_capacity) {
     CHECK_GT(new_capacity, 0);

diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_common_test.cpp b/compiler-rt/lib/sanitizer_common/tests/sanitizer_common_test.cpp
index 422e9d3..259bd99 100644 (file)
--- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_common_test.cpp
+++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_common_test.cpp
@@ -93,7 +93,7 @@ TEST(SanitizerCommon, InternalMmapVectorRoundUpCapacity) {
   CHECK_EQ(v.capacity(), GetPageSizeCached() / sizeof(uptr));
 }
 
-TEST(SanitizerCommon, InternalMmapVectorResize) {
+TEST(SanitizerCommon, InternalMmapVectorReize) {
   InternalMmapVector<uptr> v;
   CHECK_EQ(0U, v.size());
   CHECK_GE(v.capacity(), v.size());
@@ -176,30 +176,6 @@ TEST(SanitizerCommon, InternalMmapVectorSwap) {
   EXPECT_EQ(vector1, vector4);
 }
 
-TEST(SanitizerCommon, InternalMmapVectorErase) {
-  InternalMmapVector<uptr> v;
-  std::vector<uptr> r;
-  for (uptr i = 0; i < 10; i++) {
-    v.push_back(i);
-    r.push_back(i);
-  }
-
-  v.erase(&v[9]);
-  r.erase(r.begin() + 9);
-  EXPECT_EQ(r.size(), v.size());
-  for (uptr i = 0; i < r.size(); i++) EXPECT_EQ(r[i], v[i]);
-
-  v.erase(&v[3]);
-  r.erase(r.begin() + 3);
-  EXPECT_EQ(r.size(), v.size());
-  for (uptr i = 0; i < r.size(); i++) EXPECT_EQ(r[i], v[i]);
-
-  v.erase(&v[0]);
-  r.erase(r.begin());
-  EXPECT_EQ(r.size(), v.size());
-  for (uptr i = 0; i < r.size(); i++) EXPECT_EQ(r[i], v[i]);
-}
-
 void TestThreadInfo(bool main) {
   uptr stk_addr = 0;
   uptr stk_size = 0;

diff --git a/compiler-rt/test/hwasan/TestCases/Linux/reuse-threads.cpp b/compiler-rt/test/hwasan/TestCases/Linux/reuse-threads.cpp
deleted file mode 100644 (file)
index 46e9b86..0000000
--- a/compiler-rt/test/hwasan/TestCases/Linux/reuse-threads.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// Test that Thread objects are reused.
-// RUN: %clangxx_hwasan -mllvm -hwasan-instrument-stack=0 %s -o %t && %env_hwasan_opts=verbose_threads=1 %run %t 2>&1 | FileCheck %s
-
-#include <assert.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <sanitizer/hwasan_interface.h>
-
-#include "../utils.h"
-
-pthread_mutex_t mu = PTHREAD_MUTEX_INITIALIZER;
-
-void *threadfn(void *) {
-  pthread_mutex_lock(UNTAG(&mu));
-  pthread_mutex_unlock(UNTAG(&mu));
-  return nullptr;
-}
-
-void start_stop_threads() {
-  constexpr int N = 4;
-  pthread_t threads[N];
-
-  pthread_mutex_lock(UNTAG(&mu));
-  for (auto &t : threads)
-    pthread_create(&t, nullptr, threadfn, nullptr);
-  pthread_mutex_unlock(UNTAG(&mu));
-
-  for (auto &t : threads)
-    pthread_join(t, nullptr);
-}
-
-int main() {
-  // Cut off initial threads.
-  // CHECK: === test start ===
-  untag_fprintf(stderr, "=== test start ===\n");
-
-  // CHECK: Creating  : T{{[0-9]+}} [[A:0x[0-9a-f]+]] stack:
-  // CHECK: Creating  : T{{[0-9]+}} [[B:0x[0-9a-f]+]] stack:
-  start_stop_threads();
-
-  // CHECK-DAG: Creating  : T{{[0-9]+}} [[A]] stack:
-  // CHECK-DAG: Creating  : T{{[0-9]+}} [[B]] stack:
-  start_stop_threads();
-
-  // CHECK-DAG: Creating  : T{{[0-9]+}} [[A]] stack:
-  // CHECK-DAG: Creating  : T{{[0-9]+}} [[B]] stack:
-  start_stop_threads();
-
-  return 0;
-}

diff --git a/compiler-rt/test/hwasan/TestCases/thread-uaf.c b/compiler-rt/test/hwasan/TestCases/thread-uaf.c
index 7051b26..f091167 100644 (file)
--- a/compiler-rt/test/hwasan/TestCases/thread-uaf.c
+++ b/compiler-rt/test/hwasan/TestCases/thread-uaf.c
@@ -34,8 +34,8 @@ void *Use(void *arg) {
   // CHECK: in Deallocate
   // CHECK: previously allocated here:
   // CHECK: in Allocate
-  // CHECK-DAG: Thread: T2 0x
-  // CHECK-DAG: Thread: T3 0x
+  // CHECK: Thread: T2 0x
+  // CHECK: Thread: T3 0x
   // CHECK-DAG: Thread: T0 0x
   // CHECK-DAG: Thread: T1 0x
   __sync_fetch_and_add(&state, 1);