5d3805fca3
* ubsan.c (ubsan_expand_null_ifn): Use _v1 suffixed type mismatch builtins, store max (log2 (align), 0) into uchar field instead of align into uptr field. (ubsan_expand_objsize_ifn): Use _v1 suffixed type mismatch builtins, store uchar 0 field instead of uptr 0 field. (instrument_nonnull_return): Use _v1 suffixed nonnull return builtin, instead of passing one address of struct with 2 locations pass two addresses of structs with 1 location each. * sanitizer.def (BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH, BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH_ABORT, BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN, BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN_ABORT): Removed. (BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH_V1, BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH_V1_ABORT, BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN_V1, BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN_V1_ABORT): New builtins. * c-c++-common/ubsan/float-cast-overflow-1.c: Drop value keyword from expected output regexps. * c-c++-common/ubsan/float-cast-overflow-2.c: Likewise. * c-c++-common/ubsan/float-cast-overflow-3.c: Likewise. * c-c++-common/ubsan/float-cast-overflow-4.c: Likewise. * c-c++-common/ubsan/float-cast-overflow-5.c: Likewise. * c-c++-common/ubsan/float-cast-overflow-6.c: Likewise. * c-c++-common/ubsan/float-cast-overflow-8.c: Likewise. * c-c++-common/ubsan/float-cast-overflow-9.c: Likewise. * c-c++-common/ubsan/float-cast-overflow-10.c: Likewise. * g++.dg/ubsan/float-cast-overflow-bf.C: Likewise. * gcc.dg/ubsan/float-cast-overflow-bf.c: Likewise. * g++.dg/asan/default-options-1.C (__asan_default_options): Add used attribute. * g++.dg/asan/asan_test.C: Run with ASAN_OPTIONS=handle_segv=2 in the environment. * All source files: Merge from upstream 315899. * asan/Makefile.am (nodist_saninclude_HEADERS): Add include/sanitizer/tsan_interface.h. * asan/libtool-version: Bump the libasan SONAME. * lsan/Makefile.am (sanitizer_lsan_files): Add lsan_common_mac.cc. (lsan_files): Add lsan_linux.cc, lsan_mac.cc and lsan_malloc_mac.cc. * sanitizer_common/Makefile.am (sanitizer_common_files): Add sancov_flags.cc, sanitizer_allocator_checks.cc, sanitizer_coverage_libcdep_new.cc, sanitizer_errno.cc, sanitizer_file.cc, sanitizer_mac_libcdep.cc and sanitizer_stoptheworld_mac.cc. Remove sanitizer_coverage_libcdep.cc and sanitizer_coverage_mapping_libcdep.cc. * tsan/Makefile.am (tsan_files): Add tsan_external.cc. * ubsan/Makefile.am (DEFS): Add -DUBSAN_CAN_USE_CXXABI=1. (ubsan_files): Add ubsan_init_standalone.cc and ubsan_signals_standalone.cc. * ubsan/libtool-version: Bump the libubsan SONAME. * asan/Makefile.in: Regenerate. * lsan/Makefile.in: Regenerate. * sanitizer_common/Makefile.in: Regenerate. * tsan/Makefile.in: Regenerate. * ubsan/Makefile.in: Regenerate. From-SVN: r253887
307 lines
9.4 KiB
C++
307 lines
9.4 KiB
C++
//===-- sanitizer_quarantine.h ----------------------------------*- C++ -*-===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Memory quarantine for AddressSanitizer and potentially other tools.
|
|
// Quarantine caches some specified amount of memory in per-thread caches,
|
|
// then evicts to global FIFO queue. When the queue reaches specified threshold,
|
|
// oldest memory is recycled.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef SANITIZER_QUARANTINE_H
|
|
#define SANITIZER_QUARANTINE_H
|
|
|
|
#include "sanitizer_internal_defs.h"
|
|
#include "sanitizer_mutex.h"
|
|
#include "sanitizer_list.h"
|
|
|
|
namespace __sanitizer {
|
|
|
|
template<typename Node> class QuarantineCache;
|
|
|
|
struct QuarantineBatch {
|
|
static const uptr kSize = 1021;
|
|
QuarantineBatch *next;
|
|
uptr size;
|
|
uptr count;
|
|
void *batch[kSize];
|
|
|
|
void init(void *ptr, uptr size) {
|
|
count = 1;
|
|
batch[0] = ptr;
|
|
this->size = size + sizeof(QuarantineBatch); // Account for the batch size.
|
|
}
|
|
|
|
// The total size of quarantined nodes recorded in this batch.
|
|
uptr quarantined_size() const {
|
|
return size - sizeof(QuarantineBatch);
|
|
}
|
|
|
|
void push_back(void *ptr, uptr size) {
|
|
CHECK_LT(count, kSize);
|
|
batch[count++] = ptr;
|
|
this->size += size;
|
|
}
|
|
|
|
bool can_merge(const QuarantineBatch* const from) const {
|
|
return count + from->count <= kSize;
|
|
}
|
|
|
|
void merge(QuarantineBatch* const from) {
|
|
CHECK_LE(count + from->count, kSize);
|
|
CHECK_GE(size, sizeof(QuarantineBatch));
|
|
|
|
for (uptr i = 0; i < from->count; ++i)
|
|
batch[count + i] = from->batch[i];
|
|
count += from->count;
|
|
size += from->quarantined_size();
|
|
|
|
from->count = 0;
|
|
from->size = sizeof(QuarantineBatch);
|
|
}
|
|
};
|
|
|
|
COMPILER_CHECK(sizeof(QuarantineBatch) <= (1 << 13)); // 8Kb.
|
|
|
|
// The callback interface is:
|
|
// void Callback::Recycle(Node *ptr);
|
|
// void *cb.Allocate(uptr size);
|
|
// void cb.Deallocate(void *ptr);
|
|
template<typename Callback, typename Node>
|
|
class Quarantine {
|
|
public:
|
|
typedef QuarantineCache<Callback> Cache;
|
|
|
|
explicit Quarantine(LinkerInitialized)
|
|
: cache_(LINKER_INITIALIZED) {
|
|
}
|
|
|
|
void Init(uptr size, uptr cache_size) {
|
|
// Thread local quarantine size can be zero only when global quarantine size
|
|
// is zero (it allows us to perform just one atomic read per Put() call).
|
|
CHECK((size == 0 && cache_size == 0) || cache_size != 0);
|
|
|
|
atomic_store(&max_size_, size, memory_order_relaxed);
|
|
atomic_store(&min_size_, size / 10 * 9,
|
|
memory_order_relaxed); // 90% of max size.
|
|
atomic_store(&max_cache_size_, cache_size, memory_order_relaxed);
|
|
}
|
|
|
|
uptr GetSize() const { return atomic_load(&max_size_, memory_order_relaxed); }
|
|
uptr GetCacheSize() const {
|
|
return atomic_load(&max_cache_size_, memory_order_relaxed);
|
|
}
|
|
|
|
void Put(Cache *c, Callback cb, Node *ptr, uptr size) {
|
|
uptr cache_size = GetCacheSize();
|
|
if (cache_size) {
|
|
c->Enqueue(cb, ptr, size);
|
|
} else {
|
|
// GetCacheSize() == 0 only when GetSize() == 0 (see Init).
|
|
cb.Recycle(ptr);
|
|
}
|
|
// Check cache size anyway to accommodate for runtime cache_size change.
|
|
if (c->Size() > cache_size)
|
|
Drain(c, cb);
|
|
}
|
|
|
|
void NOINLINE Drain(Cache *c, Callback cb) {
|
|
{
|
|
SpinMutexLock l(&cache_mutex_);
|
|
cache_.Transfer(c);
|
|
}
|
|
if (cache_.Size() > GetSize() && recycle_mutex_.TryLock())
|
|
Recycle(cb);
|
|
}
|
|
|
|
void PrintStats() const {
|
|
// It assumes that the world is stopped, just as the allocator's PrintStats.
|
|
Printf("Quarantine limits: global: %zdMb; thread local: %zdKb\n",
|
|
GetSize() >> 20, GetCacheSize() >> 10);
|
|
cache_.PrintStats();
|
|
}
|
|
|
|
private:
|
|
// Read-only data.
|
|
char pad0_[kCacheLineSize];
|
|
atomic_uintptr_t max_size_;
|
|
atomic_uintptr_t min_size_;
|
|
atomic_uintptr_t max_cache_size_;
|
|
char pad1_[kCacheLineSize];
|
|
SpinMutex cache_mutex_;
|
|
SpinMutex recycle_mutex_;
|
|
Cache cache_;
|
|
char pad2_[kCacheLineSize];
|
|
|
|
void NOINLINE Recycle(Callback cb) {
|
|
Cache tmp;
|
|
uptr min_size = atomic_load(&min_size_, memory_order_relaxed);
|
|
{
|
|
SpinMutexLock l(&cache_mutex_);
|
|
// Go over the batches and merge partially filled ones to
|
|
// save some memory, otherwise batches themselves (since the memory used
|
|
// by them is counted against quarantine limit) can overcome the actual
|
|
// user's quarantined chunks, which diminishes the purpose of the
|
|
// quarantine.
|
|
uptr cache_size = cache_.Size();
|
|
uptr overhead_size = cache_.OverheadSize();
|
|
CHECK_GE(cache_size, overhead_size);
|
|
// Do the merge only when overhead exceeds this predefined limit (might
|
|
// require some tuning). It saves us merge attempt when the batch list
|
|
// quarantine is unlikely to contain batches suitable for merge.
|
|
const uptr kOverheadThresholdPercents = 100;
|
|
if (cache_size > overhead_size &&
|
|
overhead_size * (100 + kOverheadThresholdPercents) >
|
|
cache_size * kOverheadThresholdPercents) {
|
|
cache_.MergeBatches(&tmp);
|
|
}
|
|
// Extract enough chunks from the quarantine to get below the max
|
|
// quarantine size and leave some leeway for the newly quarantined chunks.
|
|
while (cache_.Size() > min_size) {
|
|
tmp.EnqueueBatch(cache_.DequeueBatch());
|
|
}
|
|
}
|
|
recycle_mutex_.Unlock();
|
|
DoRecycle(&tmp, cb);
|
|
}
|
|
|
|
void NOINLINE DoRecycle(Cache *c, Callback cb) {
|
|
while (QuarantineBatch *b = c->DequeueBatch()) {
|
|
const uptr kPrefetch = 16;
|
|
CHECK(kPrefetch <= ARRAY_SIZE(b->batch));
|
|
for (uptr i = 0; i < kPrefetch; i++)
|
|
PREFETCH(b->batch[i]);
|
|
for (uptr i = 0, count = b->count; i < count; i++) {
|
|
if (i + kPrefetch < count)
|
|
PREFETCH(b->batch[i + kPrefetch]);
|
|
cb.Recycle((Node*)b->batch[i]);
|
|
}
|
|
cb.Deallocate(b);
|
|
}
|
|
}
|
|
};
|
|
|
|
// Per-thread cache of memory blocks.
|
|
template<typename Callback>
|
|
class QuarantineCache {
|
|
public:
|
|
explicit QuarantineCache(LinkerInitialized) {
|
|
}
|
|
|
|
QuarantineCache()
|
|
: size_() {
|
|
list_.clear();
|
|
}
|
|
|
|
// Total memory used, including internal accounting.
|
|
uptr Size() const {
|
|
return atomic_load(&size_, memory_order_relaxed);
|
|
}
|
|
|
|
// Memory used for internal accounting.
|
|
uptr OverheadSize() const {
|
|
return list_.size() * sizeof(QuarantineBatch);
|
|
}
|
|
|
|
void Enqueue(Callback cb, void *ptr, uptr size) {
|
|
if (list_.empty() || list_.back()->count == QuarantineBatch::kSize) {
|
|
QuarantineBatch *b = (QuarantineBatch *)cb.Allocate(sizeof(*b));
|
|
CHECK(b);
|
|
b->init(ptr, size);
|
|
EnqueueBatch(b);
|
|
} else {
|
|
list_.back()->push_back(ptr, size);
|
|
SizeAdd(size);
|
|
}
|
|
}
|
|
|
|
void Transfer(QuarantineCache *from_cache) {
|
|
list_.append_back(&from_cache->list_);
|
|
SizeAdd(from_cache->Size());
|
|
|
|
atomic_store(&from_cache->size_, 0, memory_order_relaxed);
|
|
}
|
|
|
|
void EnqueueBatch(QuarantineBatch *b) {
|
|
list_.push_back(b);
|
|
SizeAdd(b->size);
|
|
}
|
|
|
|
QuarantineBatch *DequeueBatch() {
|
|
if (list_.empty())
|
|
return nullptr;
|
|
QuarantineBatch *b = list_.front();
|
|
list_.pop_front();
|
|
SizeSub(b->size);
|
|
return b;
|
|
}
|
|
|
|
void MergeBatches(QuarantineCache *to_deallocate) {
|
|
uptr extracted_size = 0;
|
|
QuarantineBatch *current = list_.front();
|
|
while (current && current->next) {
|
|
if (current->can_merge(current->next)) {
|
|
QuarantineBatch *extracted = current->next;
|
|
// Move all the chunks into the current batch.
|
|
current->merge(extracted);
|
|
CHECK_EQ(extracted->count, 0);
|
|
CHECK_EQ(extracted->size, sizeof(QuarantineBatch));
|
|
// Remove the next batch from the list and account for its size.
|
|
list_.extract(current, extracted);
|
|
extracted_size += extracted->size;
|
|
// Add it to deallocation list.
|
|
to_deallocate->EnqueueBatch(extracted);
|
|
} else {
|
|
current = current->next;
|
|
}
|
|
}
|
|
SizeSub(extracted_size);
|
|
}
|
|
|
|
void PrintStats() const {
|
|
uptr batch_count = 0;
|
|
uptr total_overhead_bytes = 0;
|
|
uptr total_bytes = 0;
|
|
uptr total_quarantine_chunks = 0;
|
|
for (List::ConstIterator it = list_.begin(); it != list_.end(); ++it) {
|
|
batch_count++;
|
|
total_bytes += (*it).size;
|
|
total_overhead_bytes += (*it).size - (*it).quarantined_size();
|
|
total_quarantine_chunks += (*it).count;
|
|
}
|
|
uptr quarantine_chunks_capacity = batch_count * QuarantineBatch::kSize;
|
|
int chunks_usage_percent = quarantine_chunks_capacity == 0 ?
|
|
0 : total_quarantine_chunks * 100 / quarantine_chunks_capacity;
|
|
uptr total_quarantined_bytes = total_bytes - total_overhead_bytes;
|
|
int memory_overhead_percent = total_quarantined_bytes == 0 ?
|
|
0 : total_overhead_bytes * 100 / total_quarantined_bytes;
|
|
Printf("Global quarantine stats: batches: %zd; bytes: %zd (user: %zd); "
|
|
"chunks: %zd (capacity: %zd); %d%% chunks used; %d%% memory overhead"
|
|
"\n",
|
|
batch_count, total_bytes, total_quarantined_bytes,
|
|
total_quarantine_chunks, quarantine_chunks_capacity,
|
|
chunks_usage_percent, memory_overhead_percent);
|
|
}
|
|
|
|
private:
|
|
typedef IntrusiveList<QuarantineBatch> List;
|
|
|
|
List list_;
|
|
atomic_uintptr_t size_;
|
|
|
|
void SizeAdd(uptr add) {
|
|
atomic_store(&size_, Size() + add, memory_order_relaxed);
|
|
}
|
|
void SizeSub(uptr sub) {
|
|
atomic_store(&size_, Size() - sub, memory_order_relaxed);
|
|
}
|
|
};
|
|
|
|
} // namespace __sanitizer
|
|
|
|
#endif // SANITIZER_QUARANTINE_H
|