ro created this revision.
ro added reviewers: vitalybuka, MaskRay.
ro added a project: Sanitizers.
Herald added subscribers: Sanitizers, pengfei, fedor.sergeev, mgorny, jyknight.
Herald added a project: clang.
ro requested review of this revision.
In the initial Solaris ASan port, `GetTls` was left unimplemented. This patch
corrects that. There are a couple of caveats, unfortunately:
While current Solaris 11.4 supports the `dlpi_tls_modid` field of `struct
dl_phdr_info`, this was only added in SRU 10 and isn't present in either
Solaris 11.3 or Illumos. Instead, this uses a method used in GCC's D runtime
library libphobos dlpi_tls_modid workaround
<https://gcc.gnu.org/legacy-ml/gcc-patches/2019-04/msg00552.html> which works
even on Solaris 10.
However, the direct call to `__tls_get_address` triggers a Solaris `ld` bug on
amd64, which needs to be worked around the same way as in `libphobos`: ld
workaround <https://gcc.gnu.org/legacy-ml/gcc-patches/2019-04/msg00356.html>.
Together, they allow the `sanitizer_common` TLS tests to `PASS` on both sparc
and x86.
I've also verified that the patch doesn't break the Illumos build; however
`compiler-rt` test results continue to be horrible there.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D91605
Files:
clang/include/clang/Config/config.h.cmake
clang/lib/Driver/ToolChains/Solaris.cpp
clang/tools/driver/CMakeLists.txt
compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
Index: compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
+++ compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
@@ -57,6 +57,7 @@
#endif
#if SANITIZER_SOLARIS
+#include <stddef.h>
#include <stdlib.h>
#include <thread.h>
#endif
@@ -451,6 +452,73 @@
void **);
#endif
+#if SANITIZER_SOLARIS
+// dlpi_tls_modid is only available since Solaris 11.4 SRU 10. Use
+// dlinfo(RTLD_DI_LINKMAP) instead which works on both Solaris 11.3 and Illumos.
+
+// Beginning of declaration from OpenSolaris/Illumos
+// $SRC/cmd/sgs/include/rtld.h.
+typedef struct {
+ Link_map rt_public;
+ const char *rt_pathname;
+ ulong_t rt_padstart;
+ ulong_t rt_padimlen;
+ ulong_t rt_msize;
+ uint_t rt_flags;
+ uint_t rt_flags1;
+ ulong_t rt_tlsmodid;
+} Rt_map;
+
+// Structure matching the Solaris 11.4 struct dl_phdr_info used to determine
+// presence of dlpi_tls_modid field at runtime. Cf. Solaris 11.4
+// dl_iterate_phdr(3C), Example 2.
+typedef struct dl_phdr_info_test {
+ ElfW(Addr) dlpi_addr;
+ const char *dlpi_name;
+ const ElfW(Phdr) * dlpi_phdr;
+ ElfW(Half) dlpi_phnum;
+ u_longlong_t dlpi_adds;
+ u_longlong_t dlpi_subs;
+ size_t dlpi_tls_modid;
+ void *dlpi_tls_data;
+} dl_phdr_info_test;
+
+typedef struct {
+ unsigned long ti_moduleid;
+ unsigned long ti_tlsoffset;
+} TLS_index;
+
+extern "C" void *__tls_get_addr(TLS_index *);
+
+static size_t main_tls_modid;
+
+int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
+ const ElfW(Phdr) *hdr = info->dlpi_phdr;
+ const ElfW(Phdr) *last_hdr = hdr + info->dlpi_phnum;
+
+ // With the introduction of dlpi_tls_modid, the tlsmodid of the executable
+ // was changed to 1 to match other implementations.
+ if (size >= offsetof(dl_phdr_info_test, dlpi_tls_modid))
+ main_tls_modid = 1;
+ else
+ main_tls_modid = 0;
+
+ for (; hdr != last_hdr; ++hdr) {
+ if (hdr->p_type == PT_TLS) {
+ Rt_map *map;
+
+ dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &map);
+
+ if (map->rt_tlsmodid == main_tls_modid) {
+ *(uptr *)data = hdr->p_memsz;
+ return -1;
+ }
+ }
+ }
+ return 0;
+}
+#endif // SANITIZER_SOLARIS
+
#if !SANITIZER_GO
static void GetTls(uptr *addr, uptr *size) {
#if SANITIZER_ANDROID
@@ -507,9 +575,15 @@
}
}
#elif SANITIZER_SOLARIS
- // FIXME
*addr = 0;
*size = 0;
+ // Find size (p_memsz) of TLS block of the main program.
+ dl_iterate_phdr(GetSizeFromHdr, size);
+
+ if (*size != 0) {
+ TLS_index ti = {(unsigned long)main_tls_modid, 0};
+ *addr = (uptr)__tls_get_addr(&ti);
+ }
#else
#error "Unknown OS"
#endif
Index: clang/tools/driver/CMakeLists.txt
===================================================================
--- clang/tools/driver/CMakeLists.txt
+++ clang/tools/driver/CMakeLists.txt
@@ -91,9 +91,10 @@
set(TOOL_INFO_BUILD_VERSION)
endif()
+include(CheckLinkerFlag)
+
if(CLANG_ORDER_FILE AND
- (LLVM_LINKER_IS_LD64 OR LLVM_LINKER_IS_GOLD OR LLVM_LINKER_IS_LLD))
- include(CheckLinkerFlag)
+ (LLVM_LINKER_IS_LD64 OR LLVM_LINKER_IS_GOLD OR LLVM_LINKER_IS_LLD))
if (LLVM_LINKER_IS_LD64)
set(LINKER_ORDER_FILE_OPTION "-Wl,-order_file,${CLANG_ORDER_FILE}")
@@ -118,3 +119,5 @@
set_target_properties(clang PROPERTIES LINK_DEPENDS ${CLANG_ORDER_FILE})
endif()
endif()
+
+check_linker_flag("-Wl,-z,relax=transtls" LINKER_SUPPORTS_Z_RELAX_TRANSTLS)
Index: clang/lib/Driver/ToolChains/Solaris.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Solaris.cpp
+++ clang/lib/Driver/ToolChains/Solaris.cpp
@@ -14,6 +14,8 @@
#include "clang/Driver/Driver.h"
#include "clang/Driver/DriverDiagnostic.h"
#include "clang/Driver/Options.h"
+#include "clang/Driver/SanitizerArgs.h"
+#include "clang/Driver/ToolChain.h"
#include "llvm/Option/ArgList.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"
@@ -138,8 +140,19 @@
CmdArgs.push_back("-lgcc");
CmdArgs.push_back("-lm");
}
- if (NeedsSanitizerDeps)
+ if (NeedsSanitizerDeps) {
linkSanitizerRuntimeDeps(getToolChain(), CmdArgs);
+
+ // Work around Solaris/amd64 ld bug when calling __tls_get_addr directly.
+ // However, ld -z relax=transtls is available since Solaris 11.2, but not
+ // in Illumos.
+ const SanitizerArgs &SA = getToolChain().getSanitizerArgs();
+ if (LINKER_SUPPORTS_Z_RELAX_TRANSTLS &&
+ getToolChain().getTriple().getArch() == llvm::Triple::x86_64 &&
+ (SA.needsAsanRt() || SA.needsStatsRt() ||
+ (SA.needsUbsanRt() && !SA.requiresMinimalRuntime())))
+ CmdArgs.push_back("-zrelax=transtls");
+ }
}
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
Index: clang/include/clang/Config/config.h.cmake
===================================================================
--- clang/include/clang/Config/config.h.cmake
+++ clang/include/clang/Config/config.h.cmake
@@ -69,6 +69,9 @@
/* Linker version detected at compile time. */
#cmakedefine HOST_LINK_VERSION "${HOST_LINK_VERSION}"
+/* Linker supports -z relax=transtls option. */
+#cmakedefine01 LINKER_SUPPORTS_Z_RELAX_TRANSTLS
+
/* pass --build-id to ld */
#cmakedefine ENABLE_LINKER_BUILD_ID
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
