[PATCH] D111465: [scudo] Skip AllocAfterFork test on machines with low max_map_count
Kostya Kortchinsky via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Fri Oct 8 14:16:10 PDT 2021
cryptoad created this revision.
cryptoad added reviewers: hctim, vitalybuka, leonardchan, cferris.
cryptoad requested review of this revision.
Herald added a project: Sanitizers.
Herald added a subscriber: Sanitizers.
Reducing the number of iterations in that test with D111342 <https://reviews.llvm.org/D111342> helped,
but the failure still occured flakily when the test is ran as part
of a large test suite.
Reducing further the number of iterations might not be good enough,
so we will skip the test if the `max_map_count` variable can be
read, and if lower than a given threshold.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D111465
Files:
compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp
Index: compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp
===================================================================
--- compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp
+++ compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp
@@ -11,6 +11,7 @@
#include <atomic>
#include <condition_variable>
+#include <fstream>
#include <memory>
#include <mutex>
#include <thread>
@@ -131,6 +132,22 @@
#if !SCUDO_FUCHSIA
TEST(ScudoWrappersCppTest, AllocAfterFork) {
+ // This test can fail flakily when ran as a part of large number of
+ // other tests if the maxmimum number of mappings allowed is low.
+ // We tried to reduce the number of iterations of the loops with
+ // moderate success, so we will now skip this test under those
+ // circumstances.
+ if (SCUDO_LINUX) {
+ long MaxMapCount = 0;
+ // If the file can't be accessed, we proceed with the test.
+ std::ifstream Stream("/proc/sys/vm/max_map_count");
+ if (Stream.good()) {
+ Stream >> MaxMapCount;
+ if (MaxMapCount < 200000)
+ return;
+ }
+ }
+
std::atomic_bool Stop;
// Create threads that simply allocate and free different sizes.
@@ -172,6 +189,7 @@
EXPECT_FALSE(WIFSIGNALED(Status));
EXPECT_EQ(10, WEXITSTATUS(Status));
}
+ EXPECT_EQ(0, 1);
printf("Waiting for threads to complete\n");
Stop = true;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D111465.378358.patch
Type: text/x-patch
Size: 1375 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20211008/3e0410a1/attachment.bin>
More information about the llvm-commits
mailing list