ASAN activate/deactive controls thread_local_quarantine_size_kb option.

[alekseyshl]

Summary

Also, bypass quarantine altogether when quarantine size is set ot zero.

[eugenis]

LGTM

lib/sanitizer_common/sanitizer_quarantine.h

221 ↗

(On Diff #83690)

extra line

[alekseyshl]

lib/sanitizer_common/sanitizer_quarantine.h

221 ↗

(On Diff #83690)

It's intentional. Most files do separate closing namespace bracket with an empty line and I like it that way.

[eugenis]

lib/sanitizer_common/sanitizer_quarantine.h

221 ↗

(On Diff #83690)

ok

compiler-rt/trunk/lib/asan/asan_flags.cc

const u32 kDefaultThreadLocalQuarantineSizeKb =
         // 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 << 6 : FIRST_32_SECOND_64(1 << 8, 1 << 10);
     f->thread_local_quarantine_size_kb = kDefaultThreadLocalQuarantineSizeKb;
   }
+  if (f->thread_local_quarantine_size_kb == 0 && f->quarantine_size_mb > 0) {
+    Report("%s: thread_local_quarantine_size_kb can be set to 0 only when "
+           "quarantine_size_mb is set to 0\n", SanitizerToolName);
+    Die();
+  }
   if (!f->replace_str && common_flags()->intercept_strlen) {
     Report("WARNING: strlen interceptor is enabled even though replace_str=0. "
            "Use intercept_strlen=0 to disable it.");
   }
   if (!f->replace_str && common_flags()->intercept_strchr) {
     Report("WARNING: strchr* interceptors are enabled even though "
            "replace_str=0. Use intercept_strchr=0 to disable them.");
   }

compiler-rt/trunk/test/asan/TestCases/Linux/thread_local_quarantine_size_kb.cc

 // Test thread_local_quarantine_size_kb
 
 // RUN: %clangxx_asan  %s -o %t
 // RUN: %env_asan_opts=thread_local_quarantine_size_kb=256:verbosity=1 %run %t 2>&1 | \
 // RUN:   FileCheck %s --check-prefix=CHECK-VALUE
 // RUN: %env_asan_opts=thread_local_quarantine_size_kb=64:quarantine_size_mb=64 %run %t 2>&1 | \
 // RUN:   FileCheck %s --allow-empty --check-prefix=CHECK-SMALL-LOCAL-CACHE-SMALL-OVERHEAD
-// RUN: %env_asan_opts=thread_local_quarantine_size_kb=0:quarantine_size_mb=64 %run %t 2>&1 | \
-// RUN:   FileCheck %s --check-prefix=CHECK-NO-LOCAL-CACHE-HUGE-OVERHEAD
+// RUN: %env_asan_opts=thread_local_quarantine_size_kb=0:quarantine_size_mb=0 %run %t 2>&1 | \
+// RUN:   FileCheck %s --check-prefix=CHECK-QUARANTINE-DISABLED
+// RUN: %env_asan_opts=thread_local_quarantine_size_kb=0:quarantine_size_mb=64 not %run %t 2>&1 | \
+// RUN:   FileCheck %s --check-prefix=CHECK-FOR-PARAMETER-ERROR
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sanitizer/allocator_interface.h>
 
 // The idea is allocate a lot of small blocks, totaling 5Mb of user memory
 // total, and verify that quarantine does not incur too much memory overhead.
int main() {
   fprintf(stderr, "heap size: new: %zd old: %zd\n", new_heap_size,
           old_heap_size);
   if (new_heap_size - old_heap_size > kHeapSizeLimit)
     fprintf(stderr, "Heap size limit exceeded");
 }
 
 // CHECK-VALUE: thread_local_quarantine_size_kb=256K
 // CHECK-SMALL-LOCAL-CACHE-SMALL-OVERHEAD-NOT: Heap size limit exceeded
-// CHECK-NO-LOCAL-CACHE-HUGE-OVERHEAD: Heap size limit exceeded
+// CHECK-QUARANTINE-DISABLED-NOT: Heap size limit exceeded
+// CHECK-FOR-PARAMETER-ERROR: thread_local_quarantine_size_kb can be set to 0 only when quarantine_size_mb is set to 0