--- old/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp 2018-11-19 17:20:31.579841400 -0800 +++ new/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp 2018-11-19 17:20:30.663169400 -0800 @@ -22,14 +22,17 @@ * */ +#include "logging/log.hpp" #include "precompiled.hpp" #include "gc/g1/g1BiasedArray.hpp" #include "gc/g1/g1RegionToSpaceMapper.hpp" #include "memory/allocation.inline.hpp" #include "memory/virtualspace.hpp" +#include "runtime/java.hpp" #include "services/memTracker.hpp" #include "utilities/align.hpp" #include "utilities/bitMap.inline.hpp" +#include "utilities/formatBuffer.hpp" G1RegionToSpaceMapper::G1RegionToSpaceMapper(ReservedSpace rs, size_t used_size, @@ -170,23 +173,24 @@ } } -void G1RegionToHeteroSpaceMapper::map_nvdimm_space(ReservedSpace rs) { +static bool map_nvdimm_space(ReservedSpace rs) { assert(AllocateOldGenAt != NULL, ""); int _backing_fd = os::create_file_for_heap(AllocateOldGenAt); if (_backing_fd == -1) { - vm_exit_during_initialization( - err_msg("Could not create file for Old generation at location %s", AllocateOldGenAt)); + return false; + log_error(gc, init)("Could not create file for Old generation at location %s", AllocateOldGenAt); } // commit this memory in nv-dimm char* ret = os::attempt_reserve_memory_at(rs.size(), rs.base(), _backing_fd); - //char* ret = os::replace_existing_mapping_with_file_mapping(rs.base(), rs.size(), _backing_fd); + if (ret != rs.base()) { if (ret != NULL) { os::unmap_memory(rs.base(), rs.size()); } - vm_exit_during_initialization( - err_msg("Error in mapping Old Gen to given AllocateOldGenAt = %s", AllocateOldGenAt)); + log_error(gc, init)("Error in mapping Old Gen to given AllocateOldGenAt = %s", AllocateOldGenAt); + return false; } + return true; } G1RegionToHeteroSpaceMapper::G1RegionToHeteroSpaceMapper(ReservedSpace rs, @@ -196,22 +200,19 @@ size_t commit_factor, MemoryType type) : G1RegionToSpaceMapper(rs, actual_size, page_size, alloc_granularity, commit_factor, type), - _num_committed_dram(0), _num_committed_nvdimm(0) { + _num_committed_dram(0), _num_committed_nvdimm(0), _success(false) { assert(actual_size == 2 * MaxHeapSize, "For 2-way heterogenuous heap, reserved space is two times MaxHeapSize"); - // Since we need to split the reserved space in half and map second half to file in NV-DIMM, we need to release the reserved memory first + // Since we need to re-map the reserved space - 'Xmx' to nv-dimm and 'Xmx' to dram, we need to release the reserved memory first. // Because on some OSes (e.g. Windows) you cannot do a file mapping on memory reserved with regular mapping. os::release_memory(rs.base(), rs.size()); - - /* Toggle HeteroHeap - // We map first part of size Xmx to DRAM. - ReservedSpace rs_dram = rs.first_part(MaxHeapSize); - // Second half of reserved memory is mapped to NV-DIMM. - ReservedSpace rs_nvdimm = rs.last_part(MaxHeapSize);*/ - // We map first part of size Xmx to NVDIMM. + // First half of size Xmx is for nv-dimm. ReservedSpace rs_nvdimm = rs.first_part(MaxHeapSize); - // Second half of reserved memory is mapped to DRAM. + assert(rs_nvdimm.base() == rs.base(), "We should get the same base address"); + + // Second half of reserved memory is mapped to dram. ReservedSpace rs_dram = rs.last_part(MaxHeapSize); + assert(rs_dram.size() == rs_nvdimm.size() && rs_nvdimm.size() == MaxHeapSize, "They all should be same"); // Reserve dram memory @@ -220,11 +221,15 @@ if (base != NULL) { os::release_memory(base, rs_dram.size()); } - vm_exit_during_initialization(err_msg("Error in allocating heap")); + log_error(gc, init)("Error in re-mapping memory on dram during G1 heterogenous memory initialization"); + return; } // We reserve and commit this entire space to NV-DIMM. - map_nvdimm_space(rs_nvdimm); + if (!map_nvdimm_space(rs_nvdimm)) { + log_error(gc, init)("Error in re-mapping memory to nv-dimm during G1 heterogenous memory initialization"); + return; + } if (alloc_granularity >= (page_size * commit_factor)) { _dram_mapper = new G1RegionsLargerThanCommitSizeMapper(rs_dram, rs_dram.size(), page_size, alloc_granularity, commit_factor, type); @@ -233,19 +238,14 @@ _dram_mapper = new G1RegionsSmallerThanCommitSizeMapper(rs_dram, rs_dram.size(), page_size, alloc_granularity, commit_factor, type); } -/* Toggle HeteroHeap - _start_index_of_nvdimm = (uint)(rs_dram.size() / alloc_granularity); - _start_index_of_dram = 0; */ _start_index_of_nvdimm = 0; _start_index_of_dram = (uint)(rs_nvdimm.size() / alloc_granularity); + _success = true; } void G1RegionToHeteroSpaceMapper::commit_regions(uint start_idx, size_t num_regions, WorkGang* pretouch_gang) { uint end_idx = (start_idx + (uint)num_regions - 1); - /* Toggle HeteroHeap - uint num_nvdimm = end_idx >= _start_index_of_nvdimm ? MIN2((end_idx - _start_index_of_nvdimm + 1), (uint)num_regions) : 0; - uint num_dram = (uint)num_regions - num_nvdimm;*/ uint num_dram = end_idx >= _start_index_of_dram ? MIN2((end_idx - _start_index_of_dram + 1), (uint)num_regions) : 0; uint num_nvdimm = (uint)num_regions - num_dram; @@ -254,8 +254,6 @@ _num_committed_nvdimm += num_nvdimm; } if (num_dram > 0) { - /* Toggle HeteroHeap - _dram_mapper->commit_regions(start_idx, num_dram, pretouch_gang); */ _dram_mapper->commit_regions(start_idx > _start_index_of_dram ? (start_idx - _start_index_of_dram) : 0, num_dram, pretouch_gang); _num_committed_dram += num_dram; } @@ -263,9 +261,6 @@ void G1RegionToHeteroSpaceMapper::uncommit_regions(uint start_idx, size_t num_regions) { uint end_idx = (start_idx + (uint)num_regions - 1); - /* Toggle HeterHeap - uint num_nvdimm = end_idx >= _start_index_of_nvdimm ? MIN2((end_idx - _start_index_of_nvdimm + 1), (uint)num_regions) : 0; - uint num_dram = (uint)num_regions - num_nvdimm;*/ uint num_dram = end_idx >= _start_index_of_dram ? MIN2((end_idx - _start_index_of_dram + 1), (uint)num_regions) : 0; uint num_nvdimm = (uint)num_regions - num_dram; @@ -280,11 +275,11 @@ } } -uint G1RegionToHeteroSpaceMapper::num_committed_dram() { +uint G1RegionToHeteroSpaceMapper::num_committed_dram() const { return _num_committed_dram; } -uint G1RegionToHeteroSpaceMapper::num_committed_nvdimm() { +uint G1RegionToHeteroSpaceMapper::num_committed_nvdimm() const { return _num_committed_nvdimm; } @@ -295,7 +290,12 @@ size_t commit_factor, MemoryType type) { if (AllocateOldGenAt != NULL) { - return new G1RegionToHeteroSpaceMapper(rs, actual_size, page_size, region_granularity, commit_factor, type); + G1RegionToHeteroSpaceMapper* mapper = new G1RegionToHeteroSpaceMapper(rs, actual_size, page_size, region_granularity, commit_factor, type); + if (!mapper->success()) { + delete mapper; + return NULL; + } + return (G1RegionToSpaceMapper*)mapper; } else { return create_mapper(rs, actual_size, page_size, region_granularity, commit_factor, type); }