--- a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp Fri Dec 21 18:26:55 2018 +0000
+++ b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp Fri Dec 21 08:18:59 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,15 @@
#include "precompiled.hpp"
#include "gc/g1/g1BiasedArray.hpp"
#include "gc/g1/g1RegionToSpaceMapper.hpp"
+#include "logging/log.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/virtualspace.hpp"
+#include "runtime/java.hpp"
+#include "runtime/os.inline.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,16 +174,156 @@
}
}
+static bool map_nvdimm_space(ReservedSpace rs) {
+ assert(AllocateOldGenAt != NULL, "");
+ int _backing_fd = os::create_file_for_heap(AllocateOldGenAt);
+ if (_backing_fd == -1) {
+ log_error(gc, init)("Could not create file for Old generation at location %s", AllocateOldGenAt);
+ return false;
+ }
+ // 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);
+ os::close(_backing_fd);
+ return false;
+ }
+
+ os::close(_backing_fd);
+ 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),
+ _rs(rs),
+ _num_committed_dram(0),
+ _num_committed_nvdimm(0),
+ _page_size(page_size),
+ _commit_factor(commit_factor),
+ _type(type) {
+ assert(actual_size == 2 * MaxHeapSize, "For 2-way heterogenuous heap, reserved space is two times MaxHeapSize");
+}
+
+bool G1RegionToHeteroSpaceMapper::initialize() {
+ // 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 false;
+ }
+
+ // 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 false;
+ }
+
+ if (_region_granularity >= (_page_size * _commit_factor)) {
+ _dram_mapper = new G1RegionsLargerThanCommitSizeMapper(rs_dram, rs_dram.size(), _page_size, _region_granularity, _commit_factor, _type);
+ } else {
+ _dram_mapper = new G1RegionsSmallerThanCommitSizeMapper(rs_dram, rs_dram.size(), _page_size, _region_granularity, _commit_factor, _type);
+ }
+
+ _start_index_of_nvdimm = 0;
+ _start_index_of_dram = (uint)(rs_nvdimm.size() / _region_granularity);
+ return 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->initialize()) {
+ 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 {
return new G1RegionsSmallerThanCommitSizeMapper(rs, actual_size, page_size, region_granularity, commit_factor, type);
}
}
+
+void G1RegionToSpaceMapper::commit_and_set_special() {
+ _storage.commit_and_set_special();
+}