diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2016-12-21 00:18:10 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2016-12-21 00:18:10 +0000 |
| commit | 5a5898470eb5ec5b45fd6ab12ef0650918d759dd (patch) | |
| tree | d10e4d4b9e1466a597b81df31deca5b9bd31d8db | |
| parent | e06bbf7210912d1d9fdeb8d1f35f4ed20c0059c5 (diff) | |
| download | compiler-rt-5a5898470eb5ec5b45fd6ab12ef0650918d759dd.tar.gz | |
Reduce the size of quarantine cache in ASAN_LOW_MEMORY configuration.
Summary:
Experiments show that on Android the current values result in too much
of the memory consumption for all quarantined chunks.
Reviewers: kcc, eugenis
Subscribers: mgorny, danalbert, srhines, llvm-commits, kubabrecka
Patch by Aleksey Shlyapnikov.
Differential Revision: https://reviews.llvm.org/D27873
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@290218 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/asan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/asan/asan_allocator.cc | 7 | ||||
| -rw-r--r-- | lib/asan/asan_flags.cc | 2 | ||||
| -rw-r--r-- | lib/asan/asan_internal.h | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/lib/asan/CMakeLists.txt b/lib/asan/CMakeLists.txt index e89d8bdab..1258ef616 100644 --- a/lib/asan/CMakeLists.txt +++ b/lib/asan/CMakeLists.txt @@ -41,8 +41,6 @@ append_rtti_flag(OFF ASAN_CFLAGS) set(ASAN_DYNAMIC_LINK_FLAGS) if(ANDROID) - list(APPEND ASAN_COMMON_DEFINITIONS - ASAN_LOW_MEMORY=1) # On Android, -z global does not do what it is documented to do. # On Android, -z global moves the library ahead in the lookup order, # placing it right after the LD_PRELOADs. This is used to compensate for the fact diff --git a/lib/asan/asan_allocator.cc b/lib/asan/asan_allocator.cc index baba5374d..1055a8dca 100644 --- a/lib/asan/asan_allocator.cc +++ b/lib/asan/asan_allocator.cc @@ -227,7 +227,12 @@ struct Allocator { static const uptr kMaxAllowedMallocSize = FIRST_32_SECOND_64(3UL << 30, 1ULL << 40); static const uptr kMaxThreadLocalQuarantine = - FIRST_32_SECOND_64(1 << 18, 1 << 20); + // It is not advised to go lower than 64Kb, otherwise quarantine batches + // pushed from thread local quarantine to global one will create too much + // overhead. One quarantine batch size is 8Kb and it holds up to 1021 + // chunk, which amounts to 1/8 memory overhead per batch when thread local + // quarantine is set to 64Kb. + (ASAN_LOW_MEMORY) ? 1 << 16 : FIRST_32_SECOND_64(1 << 18, 1 << 20); AsanAllocator allocator; AsanQuarantine quarantine; diff --git a/lib/asan/asan_flags.cc b/lib/asan/asan_flags.cc index 345a35ce3..369ef0a70 100644 --- a/lib/asan/asan_flags.cc +++ b/lib/asan/asan_flags.cc @@ -156,7 +156,7 @@ void InitializeFlags() { f->quarantine_size_mb = f->quarantine_size >> 20; if (f->quarantine_size_mb < 0) { const int kDefaultQuarantineSizeMb = - (ASAN_LOW_MEMORY) ? 1UL << 6 : 1UL << 8; + (ASAN_LOW_MEMORY) ? 1UL << 4 : 1UL << 8; f->quarantine_size_mb = kDefaultQuarantineSizeMb; } if (!f->replace_str && common_flags()->intercept_strlen) { diff --git a/lib/asan/asan_internal.h b/lib/asan/asan_internal.h index 84d7f0861..a3fe062f7 100644 --- a/lib/asan/asan_internal.h +++ b/lib/asan/asan_internal.h @@ -36,7 +36,7 @@ // If set, values like allocator chunk size, as well as defaults for some flags // will be changed towards less memory overhead. #ifndef ASAN_LOW_MEMORY -# if SANITIZER_IOS || (SANITIZER_WORDSIZE == 32) +# if SANITIZER_IOS || SANITIZER_ANDROID # define ASAN_LOW_MEMORY 1 # else # define ASAN_LOW_MEMORY 0 |