infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-03 20:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

8266891: Provide a switch to force the class space to a specific location

Browse Source 
Reviewed-by: iklam, coleenp
This commit is contained in:
Thomas Stuefe 2021-06-09 04:05:46 +00:00
parent 2cc1977a96
commit c9dbc4f034
2 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/hotspot/share/memory/metaspace.cpp
View File

@ -742,6 +742,9 @@ void Metaspace::global_initialize() {
#if INCLUDE_CDS
// case (a)
if (UseSharedSpaces) {
if (!FLAG_IS_DEFAULT(CompressedClassSpaceBaseAddress)) {
log_warning(metaspace)("CDS active - ignoring CompressedClassSpaceBaseAddress.");
}
MetaspaceShared::initialize_runtime_shared_and_meta_spaces();
// If any of the archived space fails to map, UseSharedSpaces
// is reset to false.
@ -757,23 +760,49 @@ void Metaspace::global_initialize() {
if (using_class_space() && !class_space_is_initialized()) {
assert(!UseSharedSpaces, "CDS archive is not mapped at this point");
// case (b)
// case (b) (No CDS)
ReservedSpace rs;
// If UseCompressedOops=1 and the java heap has been placed in coops-friendly
// territory, i.e. its base is under 32G, then we attempt to place ccs
// right above the java heap.
// Otherwise the lower 32G are still free. We try to place ccs at the lowest
// allowed mapping address.
address base = (UseCompressedOops && (uint64_t)CompressedOops::base() < OopEncodingHeapMax) ?
CompressedOops::end() : (address)HeapBaseMinAddress;
base = align_up(base, Metaspace::reserve_alignment());
const size_t size = align_up(CompressedClassSpaceSize, Metaspace::reserve_alignment());
if (base != NULL) {
if (CompressedKlassPointers::is_valid_base(base)) {
rs = ReservedSpace(size, Metaspace::reserve_alignment(),
os::vm_page_size(), (char*)base);
address base = NULL;
// If CompressedClassSpaceBaseAddress is set, we attempt to force-map class space to
// the given address. This is a debug-only feature aiding tests. Due to the ASLR lottery
// this may fail, in which case the VM will exit after printing an appropiate message.
// Tests using this switch should cope with that.
if (CompressedClassSpaceBaseAddress != 0) {
base = (address)CompressedClassSpaceBaseAddress;
if (!is_aligned(base, Metaspace::reserve_alignment())) {
vm_exit_during_initialization(
err_msg("CompressedClassSpaceBaseAddress=" PTR_FORMAT " invalid "
"(must be aligned to " SIZE_FORMAT_HEX ").",
CompressedClassSpaceBaseAddress, Metaspace::reserve_alignment()));
}
rs = ReservedSpace(size, Metaspace::reserve_alignment(),
os::vm_page_size() /* large */, (char*)base);
if (rs.is_reserved()) {
log_info(metaspace)("Sucessfully forced class space address to " PTR_FORMAT, p2i(base));
} else {
vm_exit_during_initialization(
err_msg("CompressedClassSpaceBaseAddress=" PTR_FORMAT " given, but reserving class space failed.",
CompressedClassSpaceBaseAddress));
}
}
if (!rs.is_reserved()) {
// If UseCompressedOops=1 and the java heap has been placed in coops-friendly
// territory, i.e. its base is under 32G, then we attempt to place ccs
// right above the java heap.
// Otherwise the lower 32G are still free. We try to place ccs at the lowest
// allowed mapping address.
base = (UseCompressedOops && (uint64_t)CompressedOops::base() < OopEncodingHeapMax) ?
CompressedOops::end() : (address)HeapBaseMinAddress;
base = align_up(base, Metaspace::reserve_alignment());
if (base != NULL) {
if (CompressedKlassPointers::is_valid_base(base)) {
rs = ReservedSpace(size, Metaspace::reserve_alignment(),
os::vm_page_size(), (char*)base);
}
}
}

4
src/hotspot/share/runtime/globals.hpp
View File

@ -1466,6 +1466,10 @@ const intx ObjectAlignmentInBytes = 8;
"class pointers are used") \
range(1*M, 3*G) \
\
develop(size_t, CompressedClassSpaceBaseAddress, 0, \
"Force the class space to be allocated at this address or " \
"fails VM initialization (requires -Xshare=off.") \
\
product(ccstr, MetaspaceReclaimPolicy, "balanced", \
"options: balanced, aggressive, none") \
\