--- old/src/hotspot/os/aix/os_aix.cpp 2017-10-31 15:49:40.708728521 -0700 +++ new/src/hotspot/os/aix/os_aix.cpp 2017-10-31 15:49:40.483730226 -0700 @@ -2491,9 +2491,25 @@ return false; } +char* os::pd_attempt_reserve_memory_at(size_t bytes, char* requested_addr, int file_desc) { + assert(file_desc >= 0, "file_desc is not valid"); + char* result = NULL; + + // Always round to os::vm_page_size(), which may be larger than 4K. + bytes = align_up(bytes, os::vm_page_size()); + result = reserve_mmaped_memory(bytes, requested_addr, 0); + + if (result != NULL) { + if (replace_existing_mapping_with_dax_file_mapping(result, bytes, file_desc) == NULL) { + vm_exit_during_initialization(err_msg("Error in mapping Java heap at the given filesystem directory")); + } + } + return result; +} + // Reserve memory at an arbitrary address, only if that area is // available (and not reserved for something else). -char* os::pd_attempt_reserve_memory_at(size_t bytes, char* requested_addr, bool use_SHM) { +char* os::pd_attempt_reserve_memory_at(size_t bytes, char* requested_addr) { char* addr = NULL; // Always round to os::vm_page_size(), which may be larger than 4K. @@ -2504,7 +2520,7 @@ if (os::vm_page_size() == 4*K) { return reserve_mmaped_memory(bytes, requested_addr, 0); } else { - if (use_SHM && bytes >= Use64KPagesThreshold) { + if (bytes >= Use64KPagesThreshold) { return reserve_shmated_memory(bytes, requested_addr, 0); } else { return reserve_mmaped_memory(bytes, requested_addr, 0);