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

8227275: Within native OOM error handling, assertions may hang the process

Browse source 
Reviewed-by: mdoerr, coleenp
This commit is contained in:
Thomas Stuefe 2019-07-11 06:56:51 +02:00
parent 4b5b4f479c
commit ac0e72332e
10 changed files with 40 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/hotspot/share/utilities/debug.cpp
View file

@ -734,6 +734,10 @@ void initialize_assert_poison() {
}
}
void disarm_assert_poison() {
g_assert_poison = &g_dummy;
}
static void store_context(const void* context) {
memcpy(&g_stored_assertion_context, context, sizeof(ucontext_t));
#if defined(__linux) && defined(PPC64)
@ -746,7 +750,14 @@ static void store_context(const void* context) {
bool handle_assert_poison_fault(const void* ucVoid, const void* faulting_address) {
if (faulting_address == g_assert_poison) {
// Disarm poison page.
os::protect_memory((char*)g_assert_poison, os::vm_page_size(), os::MEM_PROT_RWX);
if (os::protect_memory((char*)g_assert_poison, os::vm_page_size(), os::MEM_PROT_RWX) == false) {
#ifdef ASSERT
fprintf(stderr, "Assertion poison page cannot be unprotected - mprotect failed with %d (%s)",
errno, os::strerror(errno));
fflush(stderr);
#endif
return false; // unprotecting memory may fail in OOM situations, as surprising as this sounds.
}
// Store Context away.
if (ucVoid) {
const intx my_tid = os::current_thread_id();