stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8087291: InitialBootClassLoaderMetaspaceSize and CompressedClassSpaceSize should be checked consistent from MaxMetaspaceSize

Browse Source 
Reviewed-by: coleenp, hseigel
This commit is contained in:
Yasumasa Suenaga 2017-10-18 18:49:54 -04:00
parent 25f56657aa
commit f778dfd81a
3 changed files with 80 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3323,6 +3323,24 @@ void Metaspace::ergo_initialize() {
CompressedClassSpaceSize = align_down_bounded(CompressedClassSpaceSize, _reserve_alignment);
set_compressed_class_space_size(CompressedClassSpaceSize);
// Initial virtual space size will be calculated at global_initialize()
size_t min_metaspace_sz =
VIRTUALSPACEMULTIPLIER * InitialBootClassLoaderMetaspaceSize;
if (UseCompressedClassPointers) {
if ((min_metaspace_sz + CompressedClassSpaceSize) > MaxMetaspaceSize) {
if (min_metaspace_sz >= MaxMetaspaceSize) {
vm_exit_during_initialization("MaxMetaspaceSize is too small.");
} else {
FLAG_SET_ERGO(size_t, CompressedClassSpaceSize,
MaxMetaspaceSize - min_metaspace_sz);
}
}
} else if (min_metaspace_sz >= MaxMetaspaceSize) {
FLAG_SET_ERGO(size_t, InitialBootClassLoaderMetaspaceSize,
min_metaspace_sz);
}
}
void Metaspace::global_initialize() {

47
test/hotspot/jtreg/runtime/Metaspace/MaxMetaspaceSizeTest.java Normal file
View File

@ -0,0 +1,47 @@
/*
* Copyright (c) 2017, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
/*
* @test MaxMetaspaceSizeTest
* @requires vm.bits == "64"
* @bug 8087291
* @library /test/lib
* @run main/othervm MaxMetaspaceSizeTest
*/
public class MaxMetaspaceSizeTest {
public static void main(String... args) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx1g",
"-XX:InitialBootClassLoaderMetaspaceSize=4195328",
"-XX:MaxMetaspaceSize=4195328",
"-XX:+UseCompressedClassPointers",
"-XX:CompressedClassSpaceSize=1g",
"--version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldContain("MaxMetaspaceSize is too small.");
}
}

17
test/hotspot/jtreg/runtime/SharedArchiveFile/MaxMetaspaceSize.java
View File

@ -31,14 +31,27 @@
* java.management
*/
import java.util.ArrayList;
import jdk.test.lib.cds.CDSTestUtils;
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Platform;
public class MaxMetaspaceSize {
public static void main(String[] args) throws Exception {
ArrayList<String> processArgs = new ArrayList<>();
processArgs.add("-Xshare:dump");
if (Platform.is64bit()) {
processArgs.add("-XX:MaxMetaspaceSize=3m");
processArgs.add("-XX:CompressedClassSpaceSize=1m");
processArgs.add("-XX:InitialBootClassLoaderMetaspaceSize=1m");
} else {
processArgs.add("-XX:MaxMetaspaceSize=1m");
}
String msg = "OutOfMemoryError: Metaspace";
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-XX:MaxMetaspaceSize=1m", "-Xshare:dump");
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(processArgs.toArray(new String[0]));
CDSTestUtils.executeAndLog(pb, "dump").shouldContain(msg).shouldHaveExitValue(1);
}
}