archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 14:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8013398: Adjust number of stack guard pages on systems with large memory page size

Browse source 
Auto adjust number of stack guard pages on systems with large memory page size

Reviewed-by: bobv, coleenp
This commit is contained in:
Vladimir Danushevsky 2013-04-30 17:36:01 -04:00
parent a2f5f4ca1b
commit 867c30e1bd
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hotspot/src/os/linux/vm/os_linux.cpp
View file

@ -119,6 +119,7 @@ int (*os::Linux::_pthread_getcpuclockid)(pthread_t, clockid_t *) = NULL;
Mutex* os::Linux::_createThread_lock = NULL; Mutex* os::Linux::_createThread_lock = NULL;
pthread_t os::Linux::_main_thread; pthread_t os::Linux::_main_thread;
int os::Linux::_page_size = -1; int os::Linux::_page_size = -1;
const int os::Linux::_vm_default_page_size = (8 * K);
bool os::Linux::_is_floating_stack = false; bool os::Linux::_is_floating_stack = false;
bool os::Linux::_is_NPTL = false; bool os::Linux::_is_NPTL = false;
bool os::Linux::_supports_fast_thread_cpu_time = false; bool os::Linux::_supports_fast_thread_cpu_time = false;
@ -4250,6 +4251,15 @@ void os::init(void) {
Linux::clock_init(); Linux::clock_init();
initial_time_count = os::elapsed_counter(); initial_time_count = os::elapsed_counter();
pthread_mutex_init(&dl_mutex, NULL); pthread_mutex_init(&dl_mutex, NULL);
// If the pagesize of the VM is greater than 8K determine the appropriate
// number of initial guard pages. The user can change this with the
// command line arguments, if needed.
if (vm_page_size() > (int)Linux::vm_default_page_size()) {
StackYellowPages = 1;
StackRedPages = 1;
StackShadowPages = round_to((StackShadowPages*Linux::vm_default_page_size()), vm_page_size()) / vm_page_size();
}
} }
// To install functions for atexit system call // To install functions for atexit system call
@ -4303,8 +4313,8 @@ jint os::init_2(void)
// Add in 2*BytesPerWord times page size to account for VM stack during // Add in 2*BytesPerWord times page size to account for VM stack during
// class initialization depending on 32 or 64 bit VM. // class initialization depending on 32 or 64 bit VM.
os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed, os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed,
(size_t)(StackYellowPages+StackRedPages+StackShadowPages+ (size_t)(StackYellowPages+StackRedPages+StackShadowPages) * Linux::page_size() +
2*BytesPerWord COMPILER2_PRESENT(+1)) * Linux::page_size()); (2*BytesPerWord COMPILER2_PRESENT(+1)) * Linux::vm_default_page_size());
size_t threadStackSizeInBytes = ThreadStackSize * K; size_t threadStackSizeInBytes = ThreadStackSize * K;
if (threadStackSizeInBytes != 0 && if (threadStackSizeInBytes != 0 &&

3
hotspot/src/os/linux/vm/os_linux.hpp
View file

@ -70,6 +70,7 @@ class Linux {
static pthread_t _main_thread; static pthread_t _main_thread;
static Mutex* _createThread_lock; static Mutex* _createThread_lock;
static int _page_size; static int _page_size;
static const int _vm_default_page_size;
static julong available_memory(); static julong available_memory();
static julong physical_memory() { return _physical_memory; } static julong physical_memory() { return _physical_memory; }
@ -116,6 +117,8 @@ class Linux {
static int page_size(void) { return _page_size; } static int page_size(void) { return _page_size; }
static void set_page_size(int val) { _page_size = val; } static void set_page_size(int val) { _page_size = val; }
static int vm_default_page_size(void) { return _vm_default_page_size; }
static address ucontext_get_pc(ucontext_t* uc); static address ucontext_get_pc(ucontext_t* uc);
static intptr_t* ucontext_get_sp(ucontext_t* uc); static intptr_t* ucontext_get_sp(ucontext_t* uc);
static intptr_t* ucontext_get_fp(ucontext_t* uc); static intptr_t* ucontext_get_fp(ucontext_t* uc);