From c2dd71552895551529fc822916c1af43e405be34 Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Fri, 11 Oct 2024 16:57:19 -0700 Subject: [PATCH] [lsan] Add debug option to "deflake" leaks (#112037) There are hard to debug leaks which look like false. In general, repeating leak checking should not affect set of leaks significantly, especial `at_exit` leak checking. But if we see significant discrepancy, it may give us a clue for investigation. --- compiler-rt/lib/lsan/lsan_common.cpp | 8 ++++++- compiler-rt/lib/lsan/lsan_flags.inc | 1 + compiler-rt/test/lsan/TestCases/flag_tries.c | 23 ++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 compiler-rt/test/lsan/TestCases/flag_tries.c diff --git a/compiler-rt/lib/lsan/lsan_common.cpp b/compiler-rt/lib/lsan/lsan_common.cpp index 6776598651ae9b8..52d0a8c3c96ae32 100644 --- a/compiler-rt/lib/lsan/lsan_common.cpp +++ b/compiler-rt/lib/lsan/lsan_common.cpp @@ -778,7 +778,7 @@ static bool PrintResults(LeakReport &report) { return false; } -static bool CheckForLeaks() { +static bool CheckForLeaksOnce() { if (&__lsan_is_turned_off && __lsan_is_turned_off()) { VReport(1, "LeakSanitizer is disabled\n"); return false; @@ -830,6 +830,12 @@ static bool CheckForLeaks() { } } +static bool CheckForLeaks() { + int leaking_tries = 0; + for (int i = 0; i < flags()->tries; ++i) leaking_tries += CheckForLeaksOnce(); + return leaking_tries == flags()->tries; +} + static bool has_reported_leaks = false; bool HasReportedLeaks() { return has_reported_leaks; } diff --git a/compiler-rt/lib/lsan/lsan_flags.inc b/compiler-rt/lib/lsan/lsan_flags.inc index b7f28223b8189b7..c97b021ba5c02fc 100644 --- a/compiler-rt/lib/lsan/lsan_flags.inc +++ b/compiler-rt/lib/lsan/lsan_flags.inc @@ -43,6 +43,7 @@ LSAN_FLAG(bool, use_poisoned, false, "Consider pointers found in poisoned memory to be valid.") LSAN_FLAG(bool, log_pointers, false, "Debug logging") LSAN_FLAG(bool, log_threads, false, "Debug logging") +LSAN_FLAG(int, tries, 1, "Debug option to repeat leak checking multiple times") LSAN_FLAG(const char *, suppressions, "", "Suppressions file name.") LSAN_FLAG(int, thread_suspend_fail, 1, "Behaviour if thread suspendion all thread (0 - " diff --git a/compiler-rt/test/lsan/TestCases/flag_tries.c b/compiler-rt/test/lsan/TestCases/flag_tries.c new file mode 100644 index 000000000000000..d6af766d5ef282d --- /dev/null +++ b/compiler-rt/test/lsan/TestCases/flag_tries.c @@ -0,0 +1,23 @@ +// Test retries option of lsan. +// RUN: %clang_lsan %s -o %t +// RUN: %env_lsan_opts=use_stacks=0:use_registers=0:symbolize=0 %run %t foo 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK1 +// RUN: %env_lsan_opts=use_stacks=0:use_registers=0:symbolize=0:tries=12 %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK12 + +#include +#include +#include +#include +#include + +void *p; + +int main(int argc, char *argv[]) { + fprintf(stderr, "Test alloc: %p.\n", malloc(1337)); + // CHECK: Test alloc: + + assert(__lsan_do_recoverable_leak_check() == 1); + // CHECK1-COUNT-1: SUMMARY: {{.*}}Sanitizer: 1337 byte + // CHECK12-COUNT-12: SUMMARY: {{.*}}Sanitizer: 1337 byte + + _exit(0); +}