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

8343153: compiler/codecache/CheckLargePages.java fails on linux with huge pages configured but its number set to 0

Browse Source 
Reviewed-by: eastigeevich, thartmann
This commit is contained in:
Damon Fenacci 2024-11-04 07:33:54 +00:00
parent f9e1c62dcd
commit e7f0bf11ff
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/hotspot/jtreg/ProblemList.txt
View File

@ -55,7 +55,6 @@ compiler/c2/Test8004741.java 8235801 generic-all
compiler/c2/irTests/TestDuplicateBackedge.java 8318904 generic-all
compiler/codecache/jmx/PoolsIndependenceTest.java 8264632 macosx-all
compiler/codecache/CheckLargePages.java 8332654 linux-x64
compiler/vectorapi/reshape/TestVectorReinterpret.java 8320897 aix-ppc64,linux-ppc64le
compiler/vectorapi/VectorLogicalOpIdentityTest.java 8302459 linux-x64,windows-x64

26
test/hotspot/jtreg/compiler/codecache/CheckLargePages.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, 2024, 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
@ -39,6 +39,9 @@ import jdk.test.lib.Asserts;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
import jdk.test.whitebox.WhiteBox;
import java.util.Scanner;
import java.io.File;
import java.io.FileNotFoundException;
import java.util.Arrays;
import java.util.List;
@ -47,6 +50,7 @@ public class CheckLargePages {
private final static long LP_1G = 1024 * 1024 * 1024;
private final static boolean LARGE_PAGES_ENABLED;
private final static long LARGE_PAGE_SIZE;
private final static String LARGE_PAGE_NUMBER_FILE_BASE = "/sys/kernel/mm/hugepages/hugepages-%skB/nr_hugepages";
static {
WhiteBox whiteBox = WhiteBox.getWhiteBox();
@ -58,6 +62,16 @@ public class CheckLargePages {
return LARGE_PAGE_SIZE == size;
}
private static int numberOfLargePages(long size) {
String largePageNumberFile = String.format(LARGE_PAGE_NUMBER_FILE_BASE, size / 1024);
try (Scanner scanner = new Scanner(new File(largePageNumberFile))) {
if (scanner.hasNextInt()) {
return scanner.nextInt();
}
} catch (FileNotFoundException e) { };
return 0;
}
private static void testSegmented2GbCodeCacheWith1GbPage() throws Exception {
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
"-XX:+UseLargePages",
@ -113,11 +127,17 @@ public class CheckLargePages {
out.shouldContain("UseLargePages=1, UseTransparentHugePages=0");
out.shouldMatch("CodeCache: min=1[gG] max=1[gG] base=[^ ]+ size=1[gG] page_size=1[gG]");
}
public static void main(String[] args) throws Exception {
if (isLargePageSizeEqual(LP_1G)) {
testSegmented2GbCodeCacheWith1GbPage();
testDefaultCodeCacheWith1GbLargePages();
testNonSegmented1GbCodeCacheWith1GbLargePages();
if (numberOfLargePages(LP_1G) >= 1) {
testDefaultCodeCacheWith1GbLargePages();
testNonSegmented1GbCodeCacheWith1GbLargePages();
} else {
System.out.println("Skipping testDefaultCodeCacheWith1GbLargePages and " +
"testNonSegmented1GbCodeCacheWith1GbLargePages, no 1Gb pages available");
}
} else {
System.out.println("1GB large pages not supported: UseLargePages=" + LARGE_PAGES_ENABLED +
(LARGE_PAGES_ENABLED ? ", largePageSize=" + LARGE_PAGE_SIZE : "") + ". Skipping");