--- old/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp 2018-11-19 14:06:08.501678800 -0800 +++ new/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp 2018-11-19 14:06:07.545697900 -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,13 +173,140 @@ } } +static bool map_nvdimm_space(ReservedSpace rs) { + assert(AllocateOldGenAt != NULL, ""); + int _backing_fd = os::create_file_for_heap(AllocateOldGenAt); + if (_backing_fd == -1) { + 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); + + if (ret != rs.base()) { + if (ret != NULL) { + os::unmap_memory(rs.base(), rs.size()); + } + log_error(gc, init)("Error in mapping Old Gen to given AllocateOldGenAt = %s", AllocateOldGenAt); + return false; + } + return true; +} + +G1RegionToHeteroSpaceMapper::G1RegionToHeteroSpaceMapper(ReservedSpace rs, + size_t actual_size, + size_t page_size, + size_t alloc_granularity, + 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), _success(false) { + assert(actual_size == 2 * MaxHeapSize, "For 2-way heterogenuous heap, reserved space is two times MaxHeapSize"); + + // 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()); + // First half of size Xmx is for nv-dimm. + ReservedSpace rs_nvdimm = rs.first_part(MaxHeapSize); + 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 + char* base = os::attempt_reserve_memory_at(rs_dram.size(), rs_dram.base()); + if (base != rs_dram.base()) { + if (base != NULL) { + os::release_memory(base, rs_dram.size()); + } + 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. + 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); + } + else { + _dram_mapper = new G1RegionsSmallerThanCommitSizeMapper(rs_dram, rs_dram.size(), page_size, alloc_granularity, commit_factor, type); + } + + _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); + + 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; + + if (num_nvdimm > 0) { + // We do not need to commit nv-dimm regions, since they are committed in the beginning. + _num_committed_nvdimm += num_nvdimm; + } + if (num_dram > 0) { + _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; + } +} + +void G1RegionToHeteroSpaceMapper::uncommit_regions(uint start_idx, size_t num_regions) { + uint end_idx = (start_idx + (uint)num_regions - 1); + 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; + + if (num_nvdimm > 0) { + // We do not uncommit memory for nv-dimm regions. + _num_committed_nvdimm -= num_nvdimm; + } + + if (num_dram > 0) { + _dram_mapper->uncommit_regions(start_idx > _start_index_of_dram ? (start_idx - _start_index_of_dram) : 0, num_dram); + _num_committed_dram -= num_dram; + } +} + +uint G1RegionToHeteroSpaceMapper::num_committed_dram() const { + return _num_committed_dram; +} + +uint G1RegionToHeteroSpaceMapper::num_committed_nvdimm() const { + return _num_committed_nvdimm; +} + +G1RegionToSpaceMapper* G1RegionToSpaceMapper::create_heap_mapper(ReservedSpace rs, + size_t actual_size, + size_t page_size, + size_t region_granularity, + size_t commit_factor, + MemoryType type) { + if (AllocateOldGenAt != NULL) { + 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); + } +} + G1RegionToSpaceMapper* G1RegionToSpaceMapper::create_mapper(ReservedSpace rs, size_t actual_size, size_t page_size, size_t region_granularity, size_t commit_factor, MemoryType type) { - if (region_granularity >= (page_size * commit_factor)) { return new G1RegionsLargerThanCommitSizeMapper(rs, actual_size, page_size, region_granularity, commit_factor, type); } else {