<div dir="ltr">Looking... Will revert shortly.</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Oct 5, 2017 at 3:21 PM, Hans Wennborg <span dir="ltr"><<a href="mailto:hans@chromium.org" target="_blank">hans@chromium.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Looks like it broke this one:<br>
<a href="http://lab.llvm.org:8011/builders/clang-ppc64be-linux/builds/11384" rel="noreferrer" target="_blank">http://lab.llvm.org:8011/<wbr>builders/clang-ppc64be-linux/<wbr>builds/11384</a><br>
<div class="HOEnZb"><div class="h5"><br>
On Thu, Oct 5, 2017 at 2:38 PM, Alex Shlyapnikov via llvm-commits<br>
<<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br>
> Author: alekseyshl<br>
> Date: Thu Oct 5 14:38:33 2017<br>
> New Revision: 315024<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=315024&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=315024&view=rev</a><br>
> Log:<br>
> [LSan] Detect dynamic loader by its base address.<br>
><br>
> Summary:<br>
> Relanding D33859, which was reverted because it has "broken LOTS of<br>
> ARM/AArch64 bots for two days".<br>
><br>
> If it breaks something again, please provide some pointers to broken<br>
> bots, not just revert it, otherwise it's very hard to reason what's<br>
> wrong with this commit.<br>
><br>
> Whenever possible (Linux + glibc 2.16+), detect dynamic loader module by<br>
> its base address, not by the module name matching. The current name<br>
> matching approach fails on some configurations.<br>
><br>
> Reviewers: eugenis<br>
><br>
> Subscribers: aemerson, kubamracek, kristof.beyls, llvm-commits<br>
><br>
> Differential Revision: <a href="https://reviews.llvm.org/D38600" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D38600</a><br>
><br>
> Modified:<br>
> compiler-rt/trunk/lib/lsan/<wbr>lsan_common.cc<br>
> compiler-rt/trunk/lib/lsan/<wbr>lsan_common_linux.cc<br>
> compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>linux.cc<br>
> compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>platform.h<br>
><br>
> Modified: compiler-rt/trunk/lib/lsan/<wbr>lsan_common.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/lsan_common.cc?rev=315024&r1=315023&r2=315024&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/compiler-rt/trunk/lib/<wbr>lsan/lsan_common.cc?rev=<wbr>315024&r1=315023&r2=315024&<wbr>view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- compiler-rt/trunk/lib/lsan/<wbr>lsan_common.cc (original)<br>
> +++ compiler-rt/trunk/lib/lsan/<wbr>lsan_common.cc Thu Oct 5 14:38:33 2017<br>
> @@ -411,8 +411,9 @@ static void MarkInvalidPCCb(uptr chunk,<br>
> }<br>
> }<br>
><br>
> -// On Linux, handles dynamically allocated TLS blocks by treating all chunks<br>
> -// allocated from ld-linux.so as reachable.<br>
> +// On Linux, treats all chunks allocated from ld-linux.so as reachable, which<br>
> +// covers dynamically allocated TLS blocks, internal dynamic loader's loaded<br>
> +// modules accounting etc.<br>
> // Dynamic TLS blocks contain the TLS variables of dynamically loaded modules.<br>
> // They are allocated with a __libc_memalign() call in allocate_and_init()<br>
> // (elf/dl-tls.c). Glibc won't tell us the address ranges occupied by those<br>
><br>
> Modified: compiler-rt/trunk/lib/lsan/<wbr>lsan_common_linux.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/lsan_common_linux.cc?rev=315024&r1=315023&r2=315024&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/compiler-rt/trunk/lib/<wbr>lsan/lsan_common_linux.cc?rev=<wbr>315024&r1=315023&r2=315024&<wbr>view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- compiler-rt/trunk/lib/lsan/<wbr>lsan_common_linux.cc (original)<br>
> +++ compiler-rt/trunk/lib/lsan/<wbr>lsan_common_linux.cc Thu Oct 5 14:38:33 2017<br>
> @@ -23,6 +23,10 @@<br>
> #include "sanitizer_common/sanitizer_<wbr>linux.h"<br>
> #include "sanitizer_common/sanitizer_<wbr>stackdepot.h"<br>
><br>
> +#if SANITIZER_USE_GETAUXVAL<br>
> +#include <sys/auxv.h><br>
> +#endif // SANITIZER_USE_GETAUXVAL<br>
> +<br>
> namespace __lsan {<br>
><br>
> static const char kLinkerName[] = "ld";<br>
> @@ -30,8 +34,12 @@ static const char kLinkerName[] = "ld";<br>
> static char linker_placeholder[sizeof(<wbr>LoadedModule)] ALIGNED(64);<br>
> static LoadedModule *linker = nullptr;<br>
><br>
> -static bool IsLinker(const char* full_name) {<br>
> - return LibraryNameIs(full_name, kLinkerName);<br>
> +static bool IsLinker(const LoadedModule& module) {<br>
> +#if SANITIZER_USE_GETAUXVAL<br>
> + return module.base_address() == getauxval(AT_BASE);<br>
> +#else<br>
> + return LibraryNameIs(module.full_<wbr>name(), kLinkerName);<br>
> +#endif // SANITIZER_USE_GETAUXVAL<br>
> }<br>
><br>
> __attribute__((tls_model("<wbr>initial-exec")))<br>
> @@ -49,22 +57,25 @@ void InitializePlatformSpecificModu<wbr>les()<br>
> ListOfModules modules;<br>
> modules.init();<br>
> for (LoadedModule &module : modules) {<br>
> - if (!IsLinker(module.full_name())<wbr>) continue;<br>
> + if (!IsLinker(module))<br>
> + continue;<br>
> if (linker == nullptr) {<br>
> linker = reinterpret_cast<LoadedModule *>(linker_placeholder);<br>
> *linker = module;<br>
> module = LoadedModule();<br>
> } else {<br>
> VReport(1, "LeakSanitizer: Multiple modules match \"%s\". "<br>
> - "TLS will not be handled correctly.\n", kLinkerName);<br>
> + "TLS and other allocations originating from linker might be "<br>
> + "falsely reported as leaks.\n", kLinkerName);<br>
> linker->clear();<br>
> linker = nullptr;<br>
> return;<br>
> }<br>
> }<br>
> if (linker == nullptr) {<br>
> - VReport(1, "LeakSanitizer: Dynamic linker not found. "<br>
> - "TLS will not be handled correctly.\n");<br>
> + VReport(1, "LeakSanitizer: Dynamic linker not found. TLS and other "<br>
> + "allocations originating from linker might be falsely reported "<br>
> + "as leaks.\n");<br>
> }<br>
> }<br>
><br>
><br>
> Modified: compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>linux.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=315024&r1=315023&r2=315024&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>linux.cc?rev=315024&r1=315023&<wbr>r2=315024&view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>linux.cc (original)<br>
> +++ compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>linux.cc Thu Oct 5 14:38:33 2017<br>
> @@ -93,16 +93,6 @@ extern char **environ; // provided by c<br>
> #include <sys/signal.h><br>
> #endif<br>
><br>
> -#ifndef __GLIBC_PREREQ<br>
> -#define __GLIBC_PREREQ(x, y) 0<br>
> -#endif<br>
> -<br>
> -#if SANITIZER_LINUX && __GLIBC_PREREQ(2, 16)<br>
> -# define SANITIZER_USE_GETAUXVAL 1<br>
> -#else<br>
> -# define SANITIZER_USE_GETAUXVAL 0<br>
> -#endif<br>
> -<br>
> #if SANITIZER_USE_GETAUXVAL<br>
> #include <sys/auxv.h><br>
> #endif<br>
><br>
> Modified: compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>platform.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform.h?rev=315024&r1=315023&r2=315024&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>platform.h?rev=315024&r1=<wbr>315023&r2=315024&view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>platform.h (original)<br>
> +++ compiler-rt/trunk/lib/<wbr>sanitizer_common/sanitizer_<wbr>platform.h Thu Oct 5 14:38:33 2017<br>
> @@ -282,5 +282,14 @@<br>
> # define SANITIZER_SUPPRESS_LEAK_ON_<wbr>PTHREAD_EXIT 0<br>
> #endif<br>
><br>
> +#ifndef __GLIBC_PREREQ<br>
> +#define __GLIBC_PREREQ(x, y) 0<br>
> +#endif<br>
> +<br>
> +#if SANITIZER_LINUX && __GLIBC_PREREQ(2, 16)<br>
> +# define SANITIZER_USE_GETAUXVAL 1<br>
> +#else<br>
> +# define SANITIZER_USE_GETAUXVAL 0<br>
> +#endif<br>
><br>
> #endif // SANITIZER_PLATFORM_H<br>
><br>
><br>
> ______________________________<wbr>_________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br></div>