[llvm] r312303 - Fix check-llvm on kernel 4.9+ with asan or msan

Vitaly Buka via llvm-commits llvm-commits at lists.llvm.org
Thu Aug 31 18:47:34 PDT 2017


Author: vitalybuka
Date: Thu Aug 31 18:47:34 2017
New Revision: 312303

URL: http://llvm.org/viewvc/llvm-project?rev=312303&view=rev
Log:
Fix check-llvm on kernel 4.9+ with asan or msan

Summary:
Before https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=v4.9.46&id=84638335900f1995495838fe1bd4870c43ec1f67
test worked because memory allocated with mmap was not counted against RLIMIT_DATA.

Reviewers: eugenis

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D37366

Modified:
    llvm/trunk/tools/bugpoint/bugpoint.cpp

Modified: llvm/trunk/tools/bugpoint/bugpoint.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/bugpoint.cpp?rev=312303&r1=312302&r2=312303&view=diff
==============================================================================
--- llvm/trunk/tools/bugpoint/bugpoint.cpp (original)
+++ llvm/trunk/tools/bugpoint/bugpoint.cpp Thu Aug 31 18:47:34 2017
@@ -50,10 +50,10 @@ static cl::opt<unsigned> TimeoutValue(
     cl::desc("Number of seconds program is allowed to run before it "
              "is killed (default is 300s), 0 disables timeout"));
 
-static cl::opt<int>
-    MemoryLimit("mlimit", cl::init(-1), cl::value_desc("MBytes"),
-                cl::desc("Maximum amount of memory to use. 0 disables check."
-                         " Defaults to 400MB (800MB under valgrind)."));
+static cl::opt<int> MemoryLimit(
+    "mlimit", cl::init(-1), cl::value_desc("MBytes"),
+    cl::desc("Maximum amount of memory to use. 0 disables check. Defaults to "
+             "400MB (800MB under valgrind, 0 with sanitizers)."));
 
 static cl::opt<bool>
     UseValgrind("enable-valgrind",
@@ -169,6 +169,12 @@ int main(int argc, char **argv) {
       MemoryLimit = 800;
     else
       MemoryLimit = 400;
+#if (LLVM_ADDRESS_SANITIZER_BUILD || LLVM_MEMORY_SANITIZER_BUILD ||            \
+     LLVM_THREAD_SANITIZER_BUILD)
+    // Starting from kernel 4.9 memory allocated with mmap is counted against
+    // RLIMIT_DATA. Sanitizers need to allocate tens of terabytes for shadow.
+    MemoryLimit = 0;
+#endif
   }
 
   BugDriver D(argv[0], FindBugs, TimeoutValue, MemoryLimit, UseValgrind,




More information about the llvm-commits mailing list