[asan] initialize fake_stack lazily and increase its maximal size. This makes -fsanitize=address,use-after-return more robust: all SPEC tests pass now. In the default mode thread stacks become a bit smaller.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@184934 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/asan/asan_fake_stack.cc b/lib/asan/asan_fake_stack.cc
index 2fe8ef4..55eddb6 100644
--- a/lib/asan/asan_fake_stack.cc
+++ b/lib/asan/asan_fake_stack.cc
@@ -17,11 +17,6 @@
namespace __asan {
-FakeStack::FakeStack() {
- CHECK(REAL(memset));
- REAL(memset)(this, 0, sizeof(*this));
-}
-
bool FakeStack::AddrIsInSizeClass(uptr addr, uptr size_class) {
uptr mem = allocated_size_classes_[size_class];
uptr size = ClassMmapSize(size_class);
@@ -170,7 +165,8 @@
// TSD is gone, use the real stack.
return real_stack;
}
- uptr ptr = t->fake_stack().AllocateStack(size, real_stack);
+ t->LazyInitFakeStack();
+ uptr ptr = t->fake_stack()->AllocateStack(size, real_stack);
// Printf("__asan_stack_malloc %p %zu %p\n", ptr, size, real_stack);
return ptr;
}
diff --git a/lib/asan/asan_fake_stack.h b/lib/asan/asan_fake_stack.h
index a11a3db..6a5e5f6 100644
--- a/lib/asan/asan_fake_stack.h
+++ b/lib/asan/asan_fake_stack.h
@@ -71,8 +71,6 @@
// call to __asan_stack_malloc.
class FakeStack {
public:
- FakeStack();
- explicit FakeStack(LinkerInitialized x) : call_stack_(x) {}
void Init(uptr stack_size);
void StopUsingFakeStack() { alive_ = false; }
void Cleanup();
@@ -88,7 +86,7 @@
static const uptr kMaxStackMallocSize = 1 << kMaxStackFrameSizeLog;
static const uptr kNumberOfSizeClasses =
kMaxStackFrameSizeLog - kMinStackFrameSizeLog + 1;
- static const uptr kMaxRecursionDepth = 1023;
+ static const uptr kMaxRecursionDepth = 15000;
bool AddrIsInSizeClass(uptr addr, uptr size_class);
@@ -112,6 +110,8 @@
FakeFrameLifo<kMaxRecursionDepth> call_stack_;
};
+COMPILER_CHECK(sizeof(FakeStack) <= (1 << 17));
+
} // namespace __asan
#endif // ASAN_FAKE_STACK_H
diff --git a/lib/asan/asan_report.cc b/lib/asan/asan_report.cc
index f8cc906..9c46b49 100644
--- a/lib/asan/asan_report.cc
+++ b/lib/asan/asan_report.cc
@@ -481,7 +481,8 @@
// in case we call an instrumented function from a symbolizer.
AsanThread *curr_thread = GetCurrentThread();
CHECK(curr_thread);
- curr_thread->fake_stack().StopUsingFakeStack();
+ if (curr_thread->fake_stack())
+ curr_thread->fake_stack()->StopUsingFakeStack();
}
}
// Destructor is NORETURN, as functions that report errors are.
diff --git a/lib/asan/asan_thread.cc b/lib/asan/asan_thread.cc
index ef43eb6..39153bf 100644
--- a/lib/asan/asan_thread.cc
+++ b/lib/asan/asan_thread.cc
@@ -102,7 +102,7 @@
// some code may still be executing in later TSD destructors
// and we don't want it to have any poisoned stack.
ClearShadowForThreadStackAndTLS();
- fake_stack().Cleanup();
+ DeleteFakeStack();
uptr size = RoundUpTo(sizeof(AsanThread), GetPageSizeCached());
UnmapOrDie(this, size);
}
@@ -118,7 +118,7 @@
tid(), (void*)stack_bottom_, (void*)stack_top_,
stack_top_ - stack_bottom_, &local);
}
- fake_stack_.Init(stack_size());
+ fake_stack_ = 0; // Will be initialized lazily if needed.
AsanPlatformThreadInit();
}
@@ -166,8 +166,8 @@
uptr bottom = 0;
if (AddrIsInStack(addr)) {
bottom = stack_bottom();
- } else {
- bottom = fake_stack().AddrIsInFakeStack(addr);
+ } else if (fake_stack()) {
+ bottom = fake_stack()->AddrIsInFakeStack(addr);
CHECK(bottom);
*offset = addr - bottom;
*frame_pc = ((uptr*)bottom)[2];
@@ -203,9 +203,11 @@
void *addr) {
AsanThreadContext *tctx = static_cast<AsanThreadContext*>(tctx_base);
AsanThread *t = tctx->thread;
- return (t && t->fake_stack().StackSize() &&
- (t->fake_stack().AddrIsInFakeStack((uptr)addr) ||
- t->AddrIsInStack((uptr)addr)));
+ if (!t) return false;
+ if (t->AddrIsInStack((uptr)addr)) return true;
+ if (t->fake_stack() && t->fake_stack()->AddrIsInFakeStack((uptr)addr))
+ return true;
+ return false;
}
AsanThread *GetCurrentThread() {
diff --git a/lib/asan/asan_thread.h b/lib/asan/asan_thread.h
index bf08818..8aac202 100644
--- a/lib/asan/asan_thread.h
+++ b/lib/asan/asan_thread.h
@@ -75,7 +75,18 @@
return addr >= stack_bottom_ && addr < stack_top_;
}
- FakeStack &fake_stack() { return fake_stack_; }
+ void LazyInitFakeStack() {
+ if (fake_stack_) return;
+ fake_stack_ = (FakeStack*)MmapOrDie(sizeof(FakeStack), "FakeStack");
+ fake_stack_->Init(stack_size());
+ }
+ void DeleteFakeStack() {
+ if (!fake_stack_) return;
+ fake_stack_->Cleanup();
+ UnmapOrDie(fake_stack_, sizeof(FakeStack));
+ }
+ FakeStack *fake_stack() { return fake_stack_; }
+
AsanThreadLocalMallocStorage &malloc_storage() { return malloc_storage_; }
AsanStats &stats() { return stats_; }
@@ -91,7 +102,7 @@
uptr tls_begin_;
uptr tls_end_;
- FakeStack fake_stack_;
+ FakeStack *fake_stack_;
AsanThreadLocalMallocStorage malloc_storage_;
AsanStats stats_;
};