[PATCH] D27873: Reduce the size of quarantine cache in ASAN_LOW_MEMORY configuration.

[Aleksey Shlyapnikov via Phabricator via llvm-commits]

alekseyshl updated this revision to Diff 82169.
alekseyshl added a comment.
Herald added a subscriber: mgorny.

- Define ASAN_LOW_MEMORY based on the target platform, not bitness.


https://reviews.llvm.org/D27873

Files:
  lib/asan/CMakeLists.txt
  lib/asan/asan_allocator.cc
  lib/asan/asan_flags.cc
  lib/asan/asan_internal.h


Index: lib/asan/asan_internal.h
===================================================================
--- lib/asan/asan_internal.h
+++ 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
Index: lib/asan/asan_flags.cc
===================================================================
--- lib/asan/asan_flags.cc
+++ lib/asan/asan_flags.cc
@@ -156,7 +156,7 @@
     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) {
Index: lib/asan/asan_allocator.cc
===================================================================
--- lib/asan/asan_allocator.cc
+++ lib/asan/asan_allocator.cc
@@ -227,7 +227,12 @@
   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) ? 64 << 10 : FIRST_32_SECOND_64(1 << 18, 1 << 20);
 
   AsanAllocator allocator;
   AsanQuarantine quarantine;
Index: lib/asan/CMakeLists.txt
===================================================================
--- lib/asan/CMakeLists.txt
+++ lib/asan/CMakeLists.txt
@@ -41,8 +41,6 @@
 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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D27873.82169.patch
Type: text/x-patch
Size: 2384 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20161220/b33a4ab0/attachment.bin>