1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8283352: [CDS] SharedBaseAddress.java fails on x86_32

Browse Source 
Reviewed-by: dholmes, iklam, stuefe
This commit is contained in:
Jie Fu 2022-03-19 07:08:47 +00:00
parent 3e58a438e9
commit 10ccfffae1
2 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/hotspot/jtreg/runtime/cds/SharedBaseAddress.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -70,26 +70,31 @@ import jdk.test.lib.process.OutputAnalyzer;
public class SharedBaseAddress { public class SharedBaseAddress {
// shared base address test table // shared base address test table for {32, 64}bit VM
private static final String[] testTable = { private static final String[] testTableShared = {
"1g", "8g", "64g","512g", "4t", "1g", "0",
"32t", "128t", "0",
"1", "64k", "64M", "1", "64k", "64M",
"0xfff80000", // archive top wraps around 32-bit address space
"0xffffffff", // archive bottom wraps around 32-bit address space -- due to align_up()
"0" // always let OS pick the base address at runtime (ASLR for CDS archive)
};
// shared base address test table for 64bit VM only
private static final String[] testTable64 = {
"8g", "64g","512g", "4t",
"32t", "128t",
"0x800001000", // Default base address + 1 page - probably valid but unaligned to metaspace alignment, see JDK 8247522 "0x800001000", // Default base address + 1 page - probably valid but unaligned to metaspace alignment, see JDK 8247522
"0xfffffffffff00000", // archive top wraps around 64-bit address space "0xfffffffffff00000", // archive top wraps around 64-bit address space
"0xfff80000", // archive top wraps around 32-bit address space
"0xffffffffffffffff", // archive bottom wraps around 64-bit address space -- due to align_up() "0xffffffffffffffff", // archive bottom wraps around 64-bit address space -- due to align_up()
"0xffffffff", // archive bottom wraps around 32-bit address space -- due to align_up()
"0x00007ffffff00000", // end of archive will go past the end of user space on linux/x64 "0x00007ffffff00000", // end of archive will go past the end of user space on linux/x64
"0x500000000", // (20g) below 32g at a 4g aligned address, but cannot be expressed with a logical "0x500000000" // (20g) below 32g at a 4g aligned address, but cannot be expressed with a logical
// immediate on aarch64 (0x5_0000_0000) (see JDK-8265705) // immediate on aarch64 (0x5_0000_0000) (see JDK-8265705)
"0", // always let OS pick the base address at runtime (ASLR for CDS archive)
}; };
// failed pattern // failed pattern
private static String failedPattern = "os::release_memory\\(0x[0-9a-fA-F]*,\\s[0-9]*\\)\\sfailed"; private static String failedPattern = "os::release_memory\\(0x[0-9a-fA-F]*,\\s[0-9]*\\)\\sfailed";
public static void main(String[] args) throws Exception { public static void test(String[] args, String[] testTable) throws Exception {
int mid = testTable.length / 2; int mid = testTable.length / 2;
int start = args[0].equals("0") ? 0 : mid; int start = args[0].equals("0") ? 0 : mid;
int end = args[0].equals("0") ? mid : testTable.length; int end = args[0].equals("0") ? mid : testTable.length;
@ -134,4 +139,11 @@ public class SharedBaseAddress {
} }
} }
} }
public static void main(String[] args) throws Exception {
test(args, testTableShared);
if (Platform.is64bit()) {
test(args, testTable64);
}
}
} }

26
test/hotspot/jtreg/runtime/cds/appcds/SharedBaseAddress.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -33,19 +33,24 @@
* @run main/timeout=240 SharedBaseAddress * @run main/timeout=240 SharedBaseAddress
*/ */
import jdk.test.lib.Platform;
import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.OutputAnalyzer;
public class SharedBaseAddress { public class SharedBaseAddress {
// shared base address test table // shared base address test table for {32, 64}bit VM
private static final String[] testTable = { private static final String[] testTableShared = {
"1g", "8g", "64g","512g", "4t", "1g", "0", "1", "64k", "64M"
"32t", "128t", "0", };
"1", "64k", "64M", "320g",
// shared base address test table for 64bit VM only
private static final String[] testTable64 = {
"8g", "64g","512g", "4t",
"32t", "128t", "320g",
"0x800001000" // Default base address + 1 page - probably valid but unaligned to metaspace alignment, see JDK 8247522 "0x800001000" // Default base address + 1 page - probably valid but unaligned to metaspace alignment, see JDK 8247522
}; };
public static void main(String[] args) throws Exception { public static void test(String[] testTable) throws Exception {
String appJar = JarBuilder.getOrCreateHelloJar(); String appJar = JarBuilder.getOrCreateHelloJar();
for (String testEntry : testTable) { for (String testEntry : testTable) {
@ -62,4 +67,11 @@ public class SharedBaseAddress {
TestCommon.checkExec(execOutput, "Hello World"); TestCommon.checkExec(execOutput, "Hello World");
} }
} }
public static void main(String[] args) throws Exception {
test(testTableShared);
if (Platform.is64bit()) {
test(testTable64);
}
}
} }