rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rt: Get rid of the valgrind guard bytes at the end of the stack

Browse Source 
Preventing us from writing beyond our allocations is _what valgrind does_,
so telling valgrind not to let us write to the end of the stack isn't
buying anything.
This commit is contained in:
Brian Anderson
2011-12-17 16:46:50 -08:00
parent 00be346089
commit fe683dfb80
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/rt/rust_task.cpp
View File

@@ -15,22 +15,15 @@
#include "globals.h" #include "globals.h"
// Each stack gets some guard bytes that valgrind will verify we don't touch
#ifndef NVALGRIND
#define STACK_NOACCESS_SIZE 16
#else
#define STACK_NOACCESS_SIZE 0
#endif
// The amount of extra space at the end of each stack segment, available // The amount of extra space at the end of each stack segment, available
// to the rt, compiler and dynamic linker for running small functions // to the rt, compiler and dynamic linker for running small functions
// FIXME: We want this to be 128 but need to slim the red zone calls down // FIXME: We want this to be 128 but need to slim the red zone calls down
#ifdef __i386__ #ifdef __i386__
#define RED_ZONE_SIZE (65536 + STACK_NOACCESS_SIZE) #define RED_ZONE_SIZE 65536
#endif #endif
#ifdef __x86_64__ #ifdef __x86_64__
#define RED_ZONE_SIZE (65536 + STACK_NOACCESS_SIZE) #define RED_ZONE_SIZE 65536
#endif #endif
// Stack size // Stack size
@@ -80,19 +73,11 @@ config_valgrind_stack(stk_seg *stk) {
// caused valgrind to consider the whole thing inaccessible. // caused valgrind to consider the whole thing inaccessible.
size_t sz = stk->end - (uintptr_t)&stk->data[0]; size_t sz = stk->end - (uintptr_t)&stk->data[0];
VALGRIND_MAKE_MEM_UNDEFINED(stk->data, sz); VALGRIND_MAKE_MEM_UNDEFINED(stk->data, sz);
// Establish some guard bytes so valgrind will tell
// us if we run off the end of the stack
VALGRIND_MAKE_MEM_NOACCESS(stk->data, STACK_NOACCESS_SIZE);
#endif #endif
} }
static void static void
unconfig_valgrind_stack(stk_seg *stk) { unconfig_valgrind_stack(stk_seg *stk) {
#ifndef NVALGRIND
// Make the guard bytes accessible again, but undefined
VALGRIND_MAKE_MEM_UNDEFINED(stk->data, STACK_NOACCESS_SIZE);
#endif
VALGRIND_STACK_DEREGISTER(stk->valgrind_id); VALGRIND_STACK_DEREGISTER(stk->valgrind_id);
} }