From afac244b614c1af717da0e0047d4f8d67af17086 Mon Sep 17 00:00:00 2001 From: Tyson Smith Date: Fri, 7 Jul 2023 10:12:54 +0000 Subject: [PATCH] Bug 1824768 - Add TSan suppressions for external libs. r=decoder Differential Revision: https://phabricator.services.mozilla.com/D173791 --- mfbt/TsanOptions.h | 7 ++++++- mozglue/build/TsanOptions.cpp | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mfbt/TsanOptions.h b/mfbt/TsanOptions.h index a26d3e244566..f276251038b8 100644 --- a/mfbt/TsanOptions.h +++ b/mfbt/TsanOptions.h @@ -40,11 +40,14 @@ extern "C" const char* __tsan_default_options() { // every application would want to include if it potentially loads external // libraries like GTK/X and hence their dependencies. # define MOZ_TSAN_DEFAULT_EXTLIB_SUPPRESSIONS \ + "called_from_lib:libappmenu-gtk3-parser\n" \ "called_from_lib:libatk-1\n" \ "called_from_lib:libcairo.so\n" \ "called_from_lib:libcairo-gobject\n" \ - "called_from_lib:libfontconfig1\n" \ "called_from_lib:libdconfsettings\n" \ + "called_from_lib:libEGL_nvidia\n" \ + "called_from_lib:libfontconfig.so\n" \ + "called_from_lib:libfontconfig1\n" \ "called_from_lib:libgdk-3\n" \ "called_from_lib:libgdk_pixbuf\n" \ "called_from_lib:libgdk-x11\n" \ @@ -57,6 +60,8 @@ extern "C" const char* __tsan_default_options() { "called_from_lib:libgvfscommon\n" \ "called_from_lib:libgvfsdbus\n" \ "called_from_lib:libibus-1\n" \ + "called_from_lib:libnvidia-eglcore\n" \ + "called_from_lib:libnvidia-glsi\n" \ "called_from_lib:libogg.so\n" \ "called_from_lib:libpango-1\n" \ "called_from_lib:libpangocairo\n" \ diff --git a/mozglue/build/TsanOptions.cpp b/mozglue/build/TsanOptions.cpp index eab90d435156..6b19aad4576b 100644 --- a/mozglue/build/TsanOptions.cpp +++ b/mozglue/build/TsanOptions.cpp @@ -59,6 +59,9 @@ extern "C" const char* __tsan_default_suppressions() { // Bug 1825171 "mutex:libffi.so\n" "mutex:wl_registry_destroy\n" + // Bug 1824768 + "mutex:libdbus-1\n" + "mutex:swrast_dri.so\n" // Bug 1651446 - permanent (ffmpeg) "race:libavcodec.so*\n" "race:libavutil.so*\n" @@ -80,6 +83,10 @@ extern "C" const char* __tsan_default_suppressions() { // calling into uninstrumented external graphics driver code. // For example: iris_dri.so and swrast_dri.so. "race:fire_glxtest_process\n" + "race:iris_dri\n" + // Bug 1824768 + "race:libLLVM-12\n" + "race:radeonsi_dri\n" // Bug 1722721 - WebRender using uninstrumented Mesa drivers "race:swrast_dri.so\n" // Bug 1825171