[PATCH] D48142: [Sanitizers] Make sanitizer allocator linker-initialize compliant.
Aleksey Shlyapnikov via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Jun 13 12:31:27 PDT 2018
alekseyshl created this revision.
alekseyshl added reviewers: morehouse, eugenis, cryptoad.
Herald added subscribers: Sanitizers, delcypher, kubamracek.
These four SpinMutex ctors was the only code executed in the ctor for
the static __asan::Allocator instance (same for the other sanitizers
allocators), which is supposed to be fully linker-initialized.
Also, when the global ctor for this allocator instance is executed,
this instance might already be initialized by __asan_init called from
.preinit_array.
Issue: https://github.com/google/sanitizers/issues/194
Repository:
rCRT Compiler Runtime
https://reviews.llvm.org/D48142
Files:
lib/sanitizer_common/sanitizer_allocator_secondary.h
lib/sanitizer_common/sanitizer_allocator_stats.h
lib/sanitizer_common/sanitizer_quarantine.h
Index: lib/sanitizer_common/sanitizer_quarantine.h
===================================================================
--- lib/sanitizer_common/sanitizer_quarantine.h
+++ lib/sanitizer_common/sanitizer_quarantine.h
@@ -90,6 +90,9 @@
atomic_store_relaxed(&max_size_, size);
atomic_store_relaxed(&min_size_, size / 10 * 9); // 90% of max size.
atomic_store_relaxed(&max_cache_size_, cache_size);
+
+ cache_mutex_.Init();
+ recycle_mutex_.Init();
}
uptr GetSize() const { return atomic_load_relaxed(&max_size_); }
@@ -142,8 +145,8 @@
atomic_uintptr_t min_size_;
atomic_uintptr_t max_cache_size_;
char pad1_[kCacheLineSize];
- SpinMutex cache_mutex_;
- SpinMutex recycle_mutex_;
+ StaticSpinMutex cache_mutex_;
+ StaticSpinMutex recycle_mutex_;
Cache cache_;
char pad2_[kCacheLineSize];
Index: lib/sanitizer_common/sanitizer_allocator_stats.h
===================================================================
--- lib/sanitizer_common/sanitizer_allocator_stats.h
+++ lib/sanitizer_common/sanitizer_allocator_stats.h
@@ -101,7 +101,7 @@
}
private:
- mutable SpinMutex mu_;
+ mutable StaticSpinMutex mu_;
};
Index: lib/sanitizer_common/sanitizer_allocator_secondary.h
===================================================================
--- lib/sanitizer_common/sanitizer_allocator_secondary.h
+++ lib/sanitizer_common/sanitizer_allocator_secondary.h
@@ -314,6 +314,6 @@
struct Stats {
uptr n_allocs, n_frees, currently_allocated, max_allocated, by_size_log[64];
} stats;
- SpinMutex mutex_;
+ StaticSpinMutex mutex_;
};
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D48142.151228.patch
Type: text/x-patch
Size: 1596 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180613/d54aa5d2/attachment.bin>
More information about the llvm-commits
mailing list