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
141 lines
3.9 KiB
C++
141 lines
3.9 KiB
C++
//===-- tsan_dense_alloc.h --------------------------------------*- C++ -*-===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This file is a part of ThreadSanitizer (TSan), a race detector.
|
|
//
|
|
// A DenseSlabAlloc is a freelist-based allocator of fixed-size objects.
|
|
// DenseSlabAllocCache is a thread-local cache for DenseSlabAlloc.
|
|
// The only difference with traditional slab allocators is that DenseSlabAlloc
|
|
// allocates/free indices of objects and provide a functionality to map
|
|
// the index onto the real pointer. The index is u32, that is, 2 times smaller
|
|
// than uptr (hense the Dense prefix).
|
|
//===----------------------------------------------------------------------===//
|
|
#ifndef TSAN_DENSE_ALLOC_H
|
|
#define TSAN_DENSE_ALLOC_H
|
|
|
|
#include "sanitizer_common/sanitizer_common.h"
|
|
#include "tsan_defs.h"
|
|
#include "tsan_mutex.h"
|
|
|
|
namespace __tsan {
|
|
|
|
class DenseSlabAllocCache {
|
|
static const uptr kSize = 128;
|
|
typedef u32 IndexT;
|
|
uptr pos;
|
|
IndexT cache[kSize];
|
|
template<typename T, uptr kL1Size, uptr kL2Size> friend class DenseSlabAlloc;
|
|
};
|
|
|
|
template<typename T, uptr kL1Size, uptr kL2Size>
|
|
class DenseSlabAlloc {
|
|
public:
|
|
typedef DenseSlabAllocCache Cache;
|
|
typedef typename Cache::IndexT IndexT;
|
|
|
|
explicit DenseSlabAlloc(const char *name) {
|
|
// Check that kL1Size and kL2Size are sane.
|
|
CHECK_EQ(kL1Size & (kL1Size - 1), 0);
|
|
CHECK_EQ(kL2Size & (kL2Size - 1), 0);
|
|
CHECK_GE(1ull << (sizeof(IndexT) * 8), kL1Size * kL2Size);
|
|
// Check that it makes sense to use the dense alloc.
|
|
CHECK_GE(sizeof(T), sizeof(IndexT));
|
|
internal_memset(map_, 0, sizeof(map_));
|
|
freelist_ = 0;
|
|
fillpos_ = 0;
|
|
name_ = name;
|
|
}
|
|
|
|
~DenseSlabAlloc() {
|
|
for (uptr i = 0; i < kL1Size; i++) {
|
|
if (map_[i] != 0)
|
|
UnmapOrDie(map_[i], kL2Size * sizeof(T));
|
|
}
|
|
}
|
|
|
|
IndexT Alloc(Cache *c) {
|
|
if (c->pos == 0)
|
|
Refill(c);
|
|
return c->cache[--c->pos];
|
|
}
|
|
|
|
void Free(Cache *c, IndexT idx) {
|
|
DCHECK_NE(idx, 0);
|
|
if (c->pos == Cache::kSize)
|
|
Drain(c);
|
|
c->cache[c->pos++] = idx;
|
|
}
|
|
|
|
T *Map(IndexT idx) {
|
|
DCHECK_NE(idx, 0);
|
|
DCHECK_LE(idx, kL1Size * kL2Size);
|
|
return &map_[idx / kL2Size][idx % kL2Size];
|
|
}
|
|
|
|
void FlushCache(Cache *c) {
|
|
SpinMutexLock lock(&mtx_);
|
|
while (c->pos) {
|
|
IndexT idx = c->cache[--c->pos];
|
|
*(IndexT*)Map(idx) = freelist_;
|
|
freelist_ = idx;
|
|
}
|
|
}
|
|
|
|
void InitCache(Cache *c) {
|
|
c->pos = 0;
|
|
internal_memset(c->cache, 0, sizeof(c->cache));
|
|
}
|
|
|
|
private:
|
|
T *map_[kL1Size];
|
|
SpinMutex mtx_;
|
|
IndexT freelist_;
|
|
uptr fillpos_;
|
|
const char *name_;
|
|
|
|
void Refill(Cache *c) {
|
|
SpinMutexLock lock(&mtx_);
|
|
if (freelist_ == 0) {
|
|
if (fillpos_ == kL1Size) {
|
|
Printf("ThreadSanitizer: %s overflow (%zu*%zu). Dying.\n",
|
|
name_, kL1Size, kL2Size);
|
|
Die();
|
|
}
|
|
VPrintf(2, "ThreadSanitizer: growing %s: %zu out of %zu*%zu\n",
|
|
name_, fillpos_, kL1Size, kL2Size);
|
|
T *batch = (T*)MmapOrDie(kL2Size * sizeof(T), name_);
|
|
// Reserve 0 as invalid index.
|
|
IndexT start = fillpos_ == 0 ? 1 : 0;
|
|
for (IndexT i = start; i < kL2Size; i++) {
|
|
new(batch + i) T;
|
|
*(IndexT*)(batch + i) = i + 1 + fillpos_ * kL2Size;
|
|
}
|
|
*(IndexT*)(batch + kL2Size - 1) = 0;
|
|
freelist_ = fillpos_ * kL2Size + start;
|
|
map_[fillpos_++] = batch;
|
|
}
|
|
for (uptr i = 0; i < Cache::kSize / 2 && freelist_ != 0; i++) {
|
|
IndexT idx = freelist_;
|
|
c->cache[c->pos++] = idx;
|
|
freelist_ = *(IndexT*)Map(idx);
|
|
}
|
|
}
|
|
|
|
void Drain(Cache *c) {
|
|
SpinMutexLock lock(&mtx_);
|
|
for (uptr i = 0; i < Cache::kSize / 2; i++) {
|
|
IndexT idx = c->cache[--c->pos];
|
|
*(IndexT*)Map(idx) = freelist_;
|
|
freelist_ = idx;
|
|
}
|
|
}
|
|
};
|
|
|
|
} // namespace __tsan
|
|
|
|
#endif // TSAN_DENSE_ALLOC_H
|