[PATCH] D38854: [scudo] Allow for non-Android Shared TSD platforms, part 2
Kostya Kortchinsky via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Fri Oct 13 12:27:56 PDT 2017
cryptoad updated this revision to Diff 118956.
cryptoad marked 5 inline comments as done.
cryptoad added a comment.
Safeguarding the use of the exclusive TSD model against misuse (eg: using it
on a platform that doesn't support it).
https://reviews.llvm.org/D38854
Files:
lib/scudo/scudo_platform.h
lib/scudo/scudo_tsd_shared.cpp
lib/scudo/scudo_tsd_shared.inc
Index: lib/scudo/scudo_tsd_shared.inc
===================================================================
--- lib/scudo/scudo_tsd_shared.inc
+++ lib/scudo/scudo_tsd_shared.inc
@@ -17,8 +17,14 @@
#if !SCUDO_TSD_EXCLUSIVE
+extern pthread_key_t PThreadKey;
+
ALWAYS_INLINE ScudoTSD* getCurrentTSD() {
+#if SANITIZER_ANDROID
return reinterpret_cast<ScudoTSD *>(*get_android_tls_ptr());
+#else
+ return reinterpret_cast<ScudoTSD *>(pthread_getspecific(PThreadKey));
+#endif // SANITIZER_ANDROID
}
ALWAYS_INLINE void initThreadMaybe(bool MinimalInit = false) {
Index: lib/scudo/scudo_tsd_shared.cpp
===================================================================
--- lib/scudo/scudo_tsd_shared.cpp
+++ lib/scudo/scudo_tsd_shared.cpp
@@ -18,7 +18,7 @@
namespace __scudo {
static pthread_once_t GlobalInitialized = PTHREAD_ONCE_INIT;
-static pthread_key_t PThreadKey;
+pthread_key_t PThreadKey;
static atomic_uint32_t CurrentIndex;
static ScudoTSD *TSDs;
@@ -32,10 +32,6 @@
}
static void initOnce() {
- // Hack: TLS_SLOT_TSAN was introduced in N. To be able to use it on M for
- // testing, we create an unused key. Since the key_data array follows the tls
- // array, it basically gives us the extra entry we need.
- // TODO(kostyak): remove and restrict to N and above.
CHECK_EQ(pthread_key_create(&PThreadKey, NULL), 0);
initScudo();
NumberOfTSDs = getNumberOfCPUs();
@@ -50,7 +46,11 @@
}
ALWAYS_INLINE void setCurrentTSD(ScudoTSD *TSD) {
+#if SANITIZER_ANDROID
*get_android_tls_ptr() = reinterpret_cast<uptr>(TSD);
+#else
+ CHECK_EQ(pthread_setspecific(PThreadKey, reinterpret_cast<void *>(TSD)), 0);
+#endif // SANITIZER_ANDROID
}
void initThread(bool MinimalInit) {
Index: lib/scudo/scudo_platform.h
===================================================================
--- lib/scudo/scudo_platform.h
+++ lib/scudo/scudo_platform.h
@@ -20,15 +20,25 @@
# error "The Scudo hardened allocator is not supported on this platform."
#endif
-#if SANITIZER_ANDROID || SANITIZER_FUCHSIA
+#define SCUDO_TSD_EXCLUSIVE_SUPPORTED (!SANITIZER_ANDROID && !SANITIZER_FUCHSIA)
+
+#ifndef SCUDO_TSD_EXCLUSIVE
+// SCUDO_TSD_EXCLUSIVE wasn't defined, use a default TSD model for the platform.
+# if SANITIZER_ANDROID || SANITIZER_FUCHSIA
// Android and Fuchsia use a pool of TSDs shared between threads.
-# define SCUDO_TSD_EXCLUSIVE 0
-#elif SANITIZER_LINUX && !SANITIZER_ANDROID
+# define SCUDO_TSD_EXCLUSIVE 0
+# elif SANITIZER_LINUX && !SANITIZER_ANDROID
// Non-Android Linux use an exclusive TSD per thread.
-# define SCUDO_TSD_EXCLUSIVE 1
+# define SCUDO_TSD_EXCLUSIVE 1
+# else
+# error "No default TSD model defined for this platform."
+# endif // SANITIZER_ANDROID || SANITIZER_FUCHSIA
#else
-# error "No default TSD model defined for this platform."
-#endif // SANITIZER_ANDROID || SANITIZER_FUCHSIA
+// SCUDO_TSD_EXCLUSIVE was defined, make sure the platform supports it.
+# if SCUDO_TSD_EXCLUSIVE && !SCUDO_TSD_EXCLUSIVE_SUPPORTED
+# error "The exclusive TSD model is not supported on this platform."
+# endif
+#endif // SCUDO_TSD_EXCLUSIVE
namespace __scudo {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D38854.118956.patch
Type: text/x-patch
Size: 3124 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171013/32bb1008/attachment.bin>
More information about the llvm-commits
mailing list