<div dir="ltr">On Tue, Mar 19, 2013 at 1:30 PM, Evgeniy Stepanov <span dir="ltr"><<a href="mailto:eugeni.stepanov@gmail.com" target="_blank">eugeni.stepanov@gmail.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: eugenis<br>
Date: Tue Mar 19 04:30:52 2013<br>
New Revision: 177383<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=177383&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=177383&view=rev</a><br>
Log:<br>
[sanitizer] Don't adjust the size of the user-allocated stack.<br>
<br>
Moved this code to sanitizer_common.<br>
<br>
Modified:<br>
compiler-rt/trunk/lib/msan/msan_interceptors.cc<br>
compiler-rt/trunk/lib/msan/tests/msan_test.cc<br>
compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc<br>
compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.h<br>
compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc<br>
<br>
Modified: compiler-rt/trunk/lib/msan/msan_interceptors.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/msan_interceptors.cc?rev=177383&r1=177382&r2=177383&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/msan_interceptors.cc?rev=177383&r1=177382&r2=177383&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/msan/msan_interceptors.cc (original)<br>
+++ compiler-rt/trunk/lib/msan/msan_interceptors.cc Tue Mar 19 04:30:52 2013<br>
@@ -22,6 +22,7 @@<br>
#include "sanitizer_common/sanitizer_common.h"<br>
#include "sanitizer_common/sanitizer_stackdepot.h"<br>
#include "sanitizer_common/sanitizer_libc.h"<br>
+#include "sanitizer_common/sanitizer_linux.h"<br>
<br>
#include <stdarg.h><br>
// ACHTUNG! No other system header includes in this file.<br>
@@ -826,7 +827,7 @@ INTERCEPTOR(int, getrusage, int who, voi<br>
extern "C" int pthread_attr_init(void *attr);<br>
extern "C" int pthread_attr_destroy(void *attr);<br>
extern "C" int pthread_attr_setstacksize(void *attr, uptr stacksize);<br>
-extern "C" int pthread_attr_getstacksize(void *attr, uptr *stacksize);<br>
+extern "C" int pthread_attr_getstack(void *attr, uptr *stack, uptr *stacksize);<br>
<br>
INTERCEPTOR(int, pthread_create, void *th, void *attr, void *(*callback)(void*),<br>
void * param) {<br>
@@ -836,16 +837,8 @@ INTERCEPTOR(int, pthread_create, void *t<br>
pthread_attr_init(&myattr);<br>
attr = &myattr;<br>
}<br>
- uptr stacksize = 0;<br>
- pthread_attr_getstacksize(attr, &stacksize);<br>
- // We place the huge ThreadState object into TLS, account for that.<br>
- const uptr minstacksize = GetTlsSize() + 128*1024;<br>
- if (stacksize < minstacksize) {<br>
- if (flags()->verbosity)<br>
- Printf("MemorySanitizer: increasing stacksize %zu->%zu\n", stacksize,<br>
- minstacksize);<br>
- pthread_attr_setstacksize(attr, minstacksize);<br>
- }<br>
+<br>
+ AdjustStackSizeLinux(attr, flags()->verbosity);<br>
<br>
int res = REAL(pthread_create)(th, attr, callback, param);<br>
if (attr == &myattr)<br>
<br>
Modified: compiler-rt/trunk/lib/msan/tests/msan_test.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/tests/msan_test.cc?rev=177383&r1=177382&r2=177383&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/tests/msan_test.cc?rev=177383&r1=177382&r2=177383&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/msan/tests/msan_test.cc (original)<br>
+++ compiler-rt/trunk/lib/msan/tests/msan_test.cc Tue Mar 19 04:30:52 2013<br>
@@ -1413,13 +1413,13 @@ TEST(MemorySanitizer, scanf) {<br>
delete d;<br>
}<br>
<br>
-static void* SimpleThread_threadfn(void* data) {<br>
+static void *SimpleThread_threadfn(void* data) {<br>
return new int;<br>
}<br>
<br>
TEST(MemorySanitizer, SimpleThread) {<br>
pthread_t t;<br>
- void* p;<br>
+ void *p;<br>
int res = pthread_create(&t, NULL, SimpleThread_threadfn, NULL);<br>
assert(!res);<br>
res = pthread_join(t, &p);<br>
@@ -1429,26 +1429,46 @@ TEST(MemorySanitizer, SimpleThread) {<br>
delete (int*)p;<br>
}<br>
<br>
-static void* SmallStackThread_threadfn(void* data) {<br>
+static void *SmallStackThread_threadfn(void* data) {<br>
return 0;<br>
}<br>
<br>
TEST(MemorySanitizer, SmallStackThread) {<br>
pthread_attr_t attr;<br>
pthread_t t;<br>
- void* p;<br>
+ void *p;<br>
int res;<br>
res = pthread_attr_init(&attr);<br>
ASSERT_EQ(0, res);<br>
res = pthread_attr_setstacksize(&attr, 64 * 1024);<br>
ASSERT_EQ(0, res);<br>
- res = pthread_create(&t, &attr, SimpleThread_threadfn, NULL);<br>
+ res = pthread_create(&t, &attr, SmallStackThread_threadfn, NULL);<br>
ASSERT_EQ(0, res);<br>
res = pthread_join(t, &p);<br>
ASSERT_EQ(0, res);<br>
res = pthread_attr_destroy(&attr);<br>
ASSERT_EQ(0, res);<br>
}<br>
+<br>
+TEST(MemorySanitizer, PreAllocatedStackThread) {<br>
+ pthread_attr_t attr;<br>
+ pthread_t t;<br>
+ int res;<br>
+ res = pthread_attr_init(&attr);<br>
+ ASSERT_EQ(0, res);<br>
+ void *stack;<br>
+ const size_t kStackSize = 64 * 1024;<br>
+ res = posix_memalign(&stack, 4096, kStackSize);<br>
+ ASSERT_EQ(0, res);<br>
+ res = pthread_attr_setstack(&attr, stack, kStackSize);<br>
+ ASSERT_EQ(0, res);<br>
+ // A small self-allocated stack can not be extended by the tool.<br>
+ // In this case pthread_create is expected to fail.<br>
+ res = pthread_create(&t, &attr, SmallStackThread_threadfn, NULL);<br>
+ EXPECT_NE(0, res);<br>
+ res = pthread_attr_destroy(&attr);<br>
+ ASSERT_EQ(0, res);<br>
+}<br>
<br>
TEST(MemorySanitizer, uname) {<br>
struct utsname u;<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=177383&r1=177382&r2=177383&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=177383&r1=177382&r2=177383&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc Tue Mar 19 04:30:52 2013<br>
@@ -706,6 +706,30 @@ uptr GetTlsSize() {<br>
return g_tls_size;<br>
}<br>
<br>
+void AdjustStackSizeLinux(void *attr_, int verbosity) {<br>
+ pthread_attr_t *attr = (pthread_attr_t *)attr_;<br>
+ uintptr_t stackaddr = 0;<br>
+ size_t stacksize = 0;<br>
+ pthread_attr_getstack(attr, (void**)&stackaddr, &stacksize);<br>
+ // GLibC will return (0 - stacksize) as the stack address in the case when<br>
+ // stacksize is set, but stackaddr is not.<br>
+ bool stack_set = (stackaddr != 0) && (stackaddr + stacksize != 0);<br>
+ // We place a lot of tool data into TLS, account for that.<br>
+ const uptr minstacksize = GetTlsSize() + 128*1024;<br>
+ if (stacksize < minstacksize) {<br>
+ if (!stack_set) {<br>
+ if (verbosity && stacksize != 0)<br>
+ Printf("Sanitizer: increasing stacksize %zu->%zu\n", stacksize,<br>
+ minstacksize);<br></blockquote><div><br></div><div style>There are SanitizerToolName string and SanitizerVerbosity variable you can use here.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ pthread_attr_setstacksize(attr, minstacksize);<br>
+ } else {<br>
+ Printf("Sanitizer: pre-allocated stack size is insufficient: "<br>
+ "%zu < %zu\n", stacksize, minstacksize);<br>
+ Printf("Sanitizer: pthread_create is likely to fail.\n");<br>
+ }<br>
+ }<br>
+}<br>
+<br>
} // namespace __sanitizer<br>
<br>
#endif // __linux__<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.h?rev=177383&r1=177382&r2=177383&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.h?rev=177383&r1=177382&r2=177383&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.h (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.h Tue Mar 19 04:30:52 2013<br>
@@ -48,6 +48,9 @@ class ThreadLister {<br>
struct linux_dirent* entry_;<br>
int bytes_read_;<br>
};<br>
+<br>
+void AdjustStackSizeLinux(void *attr, int verbosity);<br>
+<br>
} // namespace __sanitizer<br>
<br>
#endif // SANITIZER_LINUX_H<br>
<br>
Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc?rev=177383&r1=177382&r2=177383&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc?rev=177383&r1=177382&r2=177383&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc (original)<br>
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc Tue Mar 19 04:30:52 2013<br>
@@ -15,6 +15,7 @@<br>
<br>
#include "sanitizer_common/sanitizer_atomic.h"<br>
#include "sanitizer_common/sanitizer_libc.h"<br>
+#include "sanitizer_common/sanitizer_linux.h"<br>
#include "sanitizer_common/sanitizer_platform_limits_posix.h"<br>
#include "sanitizer_common/sanitizer_placement_new.h"<br>
#include "sanitizer_common/sanitizer_stacktrace.h"<br>
@@ -738,14 +739,14 @@ TSAN_INTERCEPTOR(int, pthread_create,<br>
}<br>
int detached = 0;<br>
pthread_attr_getdetachstate(attr, &detached);<br>
- uptr stacksize = 0;<br>
- pthread_attr_getstacksize(attr, &stacksize);<br>
- // We place the huge ThreadState object into TLS, account for that.<br>
- const uptr minstacksize = GetTlsSize() + 128*1024;<br>
- if (stacksize < minstacksize) {<br>
- DPrintf("ThreadSanitizer: stacksize %zu->%zu\n", stacksize, minstacksize);<br>
- pthread_attr_setstacksize(attr, minstacksize);<br>
- }<br>
+<br>
+#if defined(TSAN_DEBUG_OUTPUT)<br>
+ int verbosity = (TSAN_DEBUG_OUTPUT);<br>
+#else<br>
+ int verbosity = 0;<br>
+#endif<br>
+ AdjustStackSizeLinux(attr, verbosity);<br>
+<br>
ThreadParam p;<br>
p.callback = callback;<br>
p.param = param;<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div>Alexey Samsonov, MSK</div>
</div></div>