Merge pull request #15785 from adelez/suppressions

Add suppressions to bazel TSAN build (take 2)

6 files changed, 8 insertions, 44 deletions

diff --git a/tools/bazel.rc b/tools/bazel.rc
index 19e7921ca9..39f8071535 100644
--- a/tools/bazel.rc
+++ b/tools/bazel.rc
@@ -11,7 +11,7 @@ build:asan --copt -fno-omit-frame-pointer
 build:asan --copt -DGPR_NO_DIRECT_SYSCALLS
 build:asan --linkopt -fsanitize=address
 build:asan --action_env=ASAN_OPTIONS=detect_leaks=1:color=always
-build:asan --action_env=LSAN_OPTIONS=suppressions=lsan_suppressions.txt:report_objects=1
+build:asan --action_env=LSAN_OPTIONS=suppressions=test/core/util/lsan_suppressions.txt:report_objects=1
 
 build:msan --strip=never
 build:msan --copt -fsanitize-coverage=edge
@@ -32,7 +32,7 @@ build:tsan --copt -fno-omit-frame-pointer
 build:tsan --copt -DGPR_NO_DIRECT_SYSCALLS
 build:tsan --copt -DGRPC_TSAN
 build:tsan --linkopt -fsanitize=thread
-build:tsan --action_env=TSAN_OPTIONS=suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1
+build:tsan --action_env=TSAN_OPTIONS=suppressions=test/core/util/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1
 
 build:ubsan --strip=never
 build:ubsan --copt -fsanitize-coverage=edge
@@ -42,7 +42,7 @@ build:ubsan --copt -DGRPC_UBSAN
 build:ubsan --copt -DNDEBUG
 build:ubsan --copt -fno-sanitize=function,vptr
 build:ubsan --linkopt -fsanitize=undefined
-build:ubsan --action_env=UBSAN_OPTIONS=halt_on_error=1:print_stacktrace=1:suppressions=tools/ubsan_suppressions.txt
+build:ubsan --action_env=UBSAN_OPTIONS=halt_on_error=1:print_stacktrace=1:suppressions=test/core/util/ubsan_suppressions.txt
 
 build:basicprof --strip=never
 build:basicprof --copt -DNDEBUG
diff --git a/tools/internal_ci/linux/grpc_tsan_on_foundry.sh b/tools/internal_ci/linux/grpc_tsan_on_foundry.sh
index fafa1ceecb..1396fc4e42 100644
--- a/tools/internal_ci/linux/grpc_tsan_on_foundry.sh
+++ b/tools/internal_ci/linux/grpc_tsan_on_foundry.sh
@@ -14,5 +14,5 @@
 # limitations under the License.
 
 export UPLOAD_TEST_RESULTS=true
-EXTRA_FLAGS="--copt=-gmlt --strip=never --copt=-fsanitize=thread --linkopt=-fsanitize=thread --test_timeout=3600"
+EXTRA_FLAGS="--copt=-gmlt --strip=never --copt=-fsanitize=thread --linkopt=-fsanitize=thread --test_timeout=3600 --action_env=TSAN_OPTIONS=suppressions=test/core/util/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1"
 github/grpc/tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh "${EXTRA_FLAGS}"
diff --git a/tools/lsan_suppressions.txt b/tools/lsan_suppressions.txt
deleted file mode 100644
index 204ddbef5e..0000000000
--- a/tools/lsan_suppressions.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# this is busted in BoringSSL
-leak:CRYPTO_set_thread_local
-leak:err_get_state
-leak:ERR_add_error_dataf
-leak:err_add_error_vdata
-leak:RAND_bytes_with_additional_data
diff --git a/tools/run_tests/generated/configs.json b/tools/run_tests/generated/configs.json
index a14340cb7b..74c6286240 100644
--- a/tools/run_tests/generated/configs.json
+++ b/tools/run_tests/generated/configs.json
@@ -6,7 +6,7 @@
     "config": "asan-trace-cmp", 
     "environ": {
       "ASAN_OPTIONS": "detect_leaks=1:color=always", 
-      "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1"
+      "LSAN_OPTIONS": "suppressions=test/core/util/lsan_suppressions.txt:report_objects=1"
     }
   }, 
   {
@@ -16,7 +16,7 @@
     "config": "asan", 
     "environ": {
       "ASAN_OPTIONS": "detect_leaks=1:color=always", 
-      "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1"
+      "LSAN_OPTIONS": "suppressions=test/core/util/lsan_suppressions.txt:report_objects=1"
     }
   }, 
   {
@@ -47,13 +47,13 @@
   {
     "config": "ubsan", 
     "environ": {
-      "UBSAN_OPTIONS": "halt_on_error=1:print_stacktrace=1:suppressions=tools/ubsan_suppressions.txt"
+      "UBSAN_OPTIONS": "halt_on_error=1:print_stacktrace=1:suppressions=test/core/util/ubsan_suppressions.txt"
     }
   }, 
   {
     "config": "tsan", 
     "environ": {
-      "TSAN_OPTIONS": "suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1"
+      "TSAN_OPTIONS": "suppressions=test/core/util/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1"
     }
   }, 
   {
diff --git a/tools/tsan_suppressions.txt b/tools/tsan_suppressions.txt
deleted file mode 100644
index e0c7907228..0000000000
--- a/tools/tsan_suppressions.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# OPENSSL_cleanse does racy access to a global
-race:OPENSSL_cleanse
-race:cleanse_ctr
-# these are legitimate races in OpenSSL, and it appears those folks are looking at it
-# https://www.mail-archive.com/openssl-dev@openssl.org/msg09019.html
-race:ssleay_rand_add
-race:ssleay_rand_bytes
-race:__sleep_for
-# protobuf has an idempotent write race in ByteSize/GetCachedSize
-# https://github.com/google/protobuf/issues/2169
-race:ByteSize
-race:ByteSizeLong
-race:GetCachedSize
diff --git a/tools/ubsan_suppressions.txt b/tools/ubsan_suppressions.txt
deleted file mode 100644
index 2268adc169..0000000000
--- a/tools/ubsan_suppressions.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# boringssl stuff
-nonnull-attribute:bn_wexpand
-nonnull-attribute:CBB_add_bytes
-nonnull-attribute:rsa_blinding_get
-nonnull-attribute:ssl_copy_key_material
-alignment:CRYPTO_cbc128_encrypt
-alignment:CRYPTO_gcm128_encrypt
-alignment:poly1305_block_copy
-nonnull-attribute:google::protobuf::*
-alignment:google::protobuf::*
-nonnull-attribute:_tr_stored_block
-# The following 5 suppressors should be removed as part of C++ cleanup
-enum:client_fuzzer_one_entry
-enum:message_compress_test
-enum:transport_security_test
-enum:algorithm_test
-alignment:transport_security_test