8318817: Could not reserve enough space in CodeHeap 'profiled nmethods' (0K)

Reviewed-by: stuefe, rcastanedalo
This commit is contained in:
Daniel Lundén 2023-11-14 07:49:35 +00:00 committed by Roberto Castañeda Lozano
parent 07eaea8c25
commit 7df73a23d3
2 changed files with 91 additions and 11 deletions
src/hotspot/share/code
test/hotspot/jtreg/compiler/arguments

@ -200,8 +200,9 @@ void CodeCache::initialize_heaps() {
bool non_nmethod_set = FLAG_IS_CMDLINE(NonNMethodCodeHeapSize);
bool profiled_set = FLAG_IS_CMDLINE(ProfiledCodeHeapSize);
bool non_profiled_set = FLAG_IS_CMDLINE(NonProfiledCodeHeapSize);
size_t min_size = os::vm_page_size();
size_t cache_size = ReservedCodeCacheSize;
const size_t ps = page_size(false, 8);
const size_t min_size = MAX2(os::vm_allocation_granularity(), ps);
const size_t cache_size = ReservedCodeCacheSize;
size_t non_nmethod_size = NonNMethodCodeHeapSize;
size_t profiled_size = ProfiledCodeHeapSize;
size_t non_profiled_size = NonProfiledCodeHeapSize;
@ -232,8 +233,10 @@ void CodeCache::initialize_heaps() {
}
// Calculate default CodeHeap sizes if not set by user
if (!non_nmethod_set && !profiled_set && !non_profiled_set) {
// Leave room for the other two parts of the code cache
const size_t max_non_nmethod_size = cache_size - 2 * min_size;
// Check if we have enough space for the non-nmethod code heap
if (cache_size > non_nmethod_size) {
if (max_non_nmethod_size >= non_nmethod_size) {
// Use the default value for non_nmethod_size and one half of the
// remaining size for non-profiled and one half for profiled methods
size_t remaining_size = cache_size - non_nmethod_size;
@ -241,7 +244,7 @@ void CodeCache::initialize_heaps() {
non_profiled_size = remaining_size - profiled_size;
} else {
// Use all space for the non-nmethod heap and set other heaps to minimal size
non_nmethod_size = cache_size - 2 * min_size;
non_nmethod_size = max_non_nmethod_size;
profiled_size = min_size;
non_profiled_size = min_size;
}
@ -310,7 +313,6 @@ void CodeCache::initialize_heaps() {
FLAG_SET_ERGO(ProfiledCodeHeapSize, profiled_size);
FLAG_SET_ERGO(NonProfiledCodeHeapSize, non_profiled_size);
const size_t ps = page_size(false, 8);
// Print warning if using large pages but not able to use the size given
if (UseLargePages) {
const size_t lg_ps = page_size(false, 1);
@ -321,12 +323,11 @@ void CodeCache::initialize_heaps() {
}
}
// If large page support is enabled, align code heaps according to large
// page size to make sure that code cache is covered by large pages.
const size_t alignment = MAX2(ps, os::vm_allocation_granularity());
non_nmethod_size = align_up(non_nmethod_size, alignment);
profiled_size = align_down(profiled_size, alignment);
non_profiled_size = align_down(non_profiled_size, alignment);
// Note: if large page support is enabled, min_size is at least the large
// page size. This ensures that the code cache is covered by large pages.
non_nmethod_size = align_up(non_nmethod_size, min_size);
profiled_size = align_down(profiled_size, min_size);
non_profiled_size = align_down(non_profiled_size, min_size);
// Reserve one continuous chunk of memory for CodeHeaps and split it into
// parts for the individual heaps. The memory layout looks like this:

@ -0,0 +1,79 @@
/*
* Copyright (c) 2023, 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.
*/
/**
* @test
* @bug 8318817
* @requires vm.debug
* @summary Test flag with large value
*
* @run main/othervm -XX:NMethodSizeLimit=351658240
* compiler.arguments.TestC1Globals
*/
/**
* @test
* @bug 8318817
* @requires vm.debug
* @summary Test flag with large value
*
* @run main/othervm -XX:NMethodSizeLimit=224001703
* compiler.arguments.TestC1Globals
*/
/**
* @test
* @bug 8318817
* @requires vm.debug
* @requires os.family == "linux"
* @summary Test flag with large value combined with transparent huge pages on
* Linux.
*
* @run main/othervm -XX:NMethodSizeLimit=351658240
* -XX:+UseTransparentHugePages
* compiler.arguments.TestC1Globals
*
*/
/**
* @test
* @bug 8318817
* @requires vm.debug
* @requires os.family == "linux"
* @summary Test flag with large value combined with transparent huge pages on
* Linux.
*
* @run main/othervm -XX:NMethodSizeLimit=224001703
* -XX:+UseTransparentHugePages
* compiler.arguments.TestC1Globals
*
*/
package compiler.arguments;
public class TestC1Globals {
public static void main(String args[]) {
System.out.println("Passed");
}
}