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

8268052: [JVMCI] non-default installed code must be marked as in_use

Browse Source 
Reviewed-by: kvn, dnsimon
This commit is contained in:
Tom Rodriguez 2021-06-09 17:34:17 +00:00
parent bb3d226a4e
commit db45ff09ac
9 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/share/jvmci/jvmci.hpp
View File

@ -89,7 +89,9 @@ class JVMCI : public AllStatic {
ok,
dependencies_failed,
cache_full,
code_too_large
nmethod_reclaimed, // code cache sweeper reclaimed nmethod in between its creation and being marked "in_use"
code_too_large,
first_permanent_bailout = code_too_large
};
// Gets the handle to the loaded JVMCI shared library, loading it

19
src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
View File

@ -480,6 +480,7 @@ JVMCI::CodeInstallResult CodeInstaller::install(JVMCICompiler* compiler,
JVMCIObject target,
JVMCIObject compiled_code,
CodeBlob*& cb,
nmethodLocker& nmethod_handle,
JVMCIObject installed_code,
FailedSpeculation** failed_speculations,
char* speculations,
@ -537,18 +538,20 @@ JVMCI::CodeInstallResult CodeInstaller::install(JVMCICompiler* compiler,
}
JVMCIObject mirror = installed_code;
nmethod* nm = NULL;
result = runtime()->register_method(jvmci_env(), method, nm, entry_bci, &_offsets, _orig_pc_offset, &buffer,
result = runtime()->register_method(jvmci_env(), method, nmethod_handle, entry_bci, &_offsets, _orig_pc_offset, &buffer,
stack_slots, _debug_recorder->_oopmaps, &_exception_handler_table, &_implicit_exception_table,
compiler, _debug_recorder, _dependencies, id,
has_unsafe_access, _has_wide_vector, compiled_code, mirror,
failed_speculations, speculations, speculations_len);
cb = nm->as_codeblob_or_null();
if (nm != NULL && compile_state == NULL) {
// This compile didn't come through the CompileBroker so perform the printing here
DirectiveSet* directive = DirectivesStack::getMatchingDirective(method, compiler);
nm->maybe_print_nmethod(directive);
DirectivesStack::release(directive);
if (result == JVMCI::ok) {
nmethod* nm = nmethod_handle.code()->as_nmethod_or_null();
cb = nm;
if (compile_state == NULL) {
// This compile didn't come through the CompileBroker so perform the printing here
DirectiveSet* directive = DirectivesStack::getMatchingDirective(method, compiler);
nm->maybe_print_nmethod(directive);
DirectivesStack::release(directive);
}
}
}

1
src/hotspot/share/jvmci/jvmciCodeInstaller.hpp
View File

@ -187,6 +187,7 @@ public:
JVMCIObject target,
JVMCIObject compiled_code,
CodeBlob*& cb,
nmethodLocker& nmethod_handle,
JVMCIObject installed_code,
FailedSpeculation** failed_speculations,
char* speculations,

2
src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
View File

@ -881,11 +881,13 @@ C2V_VMENTRY_0(jint, installCode, (JNIEnv *env, jobject, jobject target, jobject
TraceTime install_time("installCode", JVMCICompiler::codeInstallTimer(!thread->is_Compiler_thread()));
nmethodLocker nmethod_handle;
CodeInstaller installer(JVMCIENV);
JVMCI::CodeInstallResult result = installer.install(compiler,
target_handle,
compiled_code_handle,
cb,
nmethod_handle,
installed_code_handle,
(FailedSpeculation**)(address) failed_speculations_address,
speculations,

20
src/hotspot/share/jvmci/jvmciRuntime.cpp
View File

@ -1641,7 +1641,7 @@ bool JVMCIRuntime::is_gc_supported(JVMCIEnv* JVMCIENV, CollectedHeap::Name name)
// ------------------------------------------------------------------
JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
const methodHandle& method,
nmethod*& nm,
nmethodLocker& code_handle,
int entry_bci,
CodeOffsets* offsets,
int orig_pc_offset,
@ -1662,7 +1662,7 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
char* speculations,
int speculations_len) {
JVMCI_EXCEPTION_CONTEXT;
nm = NULL;
nmethod* nm = NULL;
int comp_level = CompLevel_full_optimization;
char* failure_detail = NULL;
@ -1747,6 +1747,7 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
MutexUnlocker locker(MethodCompileQueue_lock);
CompileBroker::handle_full_code_cache(CodeCache::get_code_blob_type(comp_level));
}
result = JVMCI::cache_full;
} else {
nm->set_has_unsafe_access(has_unsafe_access);
nm->set_has_wide_vectors(has_wide_vector);
@ -1784,6 +1785,8 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
MutexLocker ml(CompiledMethod_lock, Mutex::_no_safepoint_check_flag);
if (nm->make_in_use()) {
method->set_code(method, nm);
} else {
result = JVMCI::nmethod_reclaimed;
}
} else {
LogTarget(Info, nmethod, install) lt;
@ -1796,13 +1799,20 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
MutexLocker ml(CompiledMethod_lock, Mutex::_no_safepoint_check_flag);
if (nm->make_in_use()) {
InstanceKlass::cast(method->method_holder())->add_osr_nmethod(nm);
} else {
result = JVMCI::nmethod_reclaimed;
}
}
} else {
assert(!nmethod_mirror.is_hotspot() || data->get_nmethod_mirror(nm, /* phantom_ref */ false) == HotSpotJVMCI::resolve(nmethod_mirror), "must be");
if (!nm->make_in_use()) {
result = JVMCI::nmethod_reclaimed;
}
}
}
result = nm != NULL ? JVMCI::ok :JVMCI::cache_full;
}
if (result == JVMCI::ok) {
code_handle.set_code(nm);
}
}
@ -1813,8 +1823,8 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
JVMCIENV->set_HotSpotCompiledNmethod_installationFailureMessage(compiled_code, message);
}
// JVMTI -- compiled method notification (must be done outside lock)
if (nm != NULL) {
if (result == JVMCI::ok) {
// JVMTI -- compiled method notification (must be done outside lock)
nm->post_compiled_method_load_event();
}

2
src/hotspot/share/jvmci/jvmciRuntime.hpp
View File

@ -290,7 +290,7 @@ class JVMCIRuntime: public CHeapObj<mtJVMCI> {
// Register the result of a compilation.
JVMCI::CodeInstallResult register_method(JVMCIEnv* JVMCIENV,
const methodHandle& target,
nmethod*& nm,
nmethodLocker& code_handle,
int entry_bci,
CodeOffsets* offsets,
int orig_pc_offset,

11
src/hotspot/share/jvmci/vmStructs_jvmci.cpp
View File

@ -590,10 +590,13 @@
declare_constant(JumpData::taken_off_set) \
declare_constant(JumpData::displacement_off_set) \
\
declare_preprocessor_constant("JVMCI::ok", JVMCI::ok) \
declare_preprocessor_constant("JVMCI::dependencies_failed", JVMCI::dependencies_failed) \
declare_preprocessor_constant("JVMCI::cache_full", JVMCI::cache_full) \
declare_preprocessor_constant("JVMCI::code_too_large", JVMCI::code_too_large) \
declare_preprocessor_constant("JVMCI::ok", JVMCI::ok) \
declare_preprocessor_constant("JVMCI::dependencies_failed", JVMCI::dependencies_failed) \
declare_preprocessor_constant("JVMCI::cache_full", JVMCI::cache_full) \
declare_preprocessor_constant("JVMCI::code_too_large", JVMCI::code_too_large) \
declare_preprocessor_constant("JVMCI::nmethod_reclaimed", JVMCI::nmethod_reclaimed) \
declare_preprocessor_constant("JVMCI::first_permanent_bailout", JVMCI::first_permanent_bailout) \
\
declare_constant(JVMCIRuntime::none) \
declare_constant(JVMCIRuntime::by_holder) \
declare_constant(JVMCIRuntime::by_full_signature) \

2
src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
View File

@ -144,7 +144,7 @@ public class HotSpotCodeCacheProvider implements CodeCacheProvider {
} else {
msg = String.format("Code installation failed: %s", resultDesc);
}
throw new BailoutException(result != config.codeInstallResultDependenciesFailed, msg);
throw new BailoutException(result >= config.codeInstallResultFirstPermanentBailout, msg);
} else {
throw new BailoutException("Error installing %s: %s", ((HotSpotCompiledCode) compiledCode).getName(), resultDesc);
}

5
src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
View File

@ -362,6 +362,8 @@ class HotSpotVMConfig extends HotSpotVMConfigAccess {
final int codeInstallResultDependenciesFailed = getConstant("JVMCI::dependencies_failed", Integer.class);
final int codeInstallResultCacheFull = getConstant("JVMCI::cache_full", Integer.class);
final int codeInstallResultCodeTooLarge = getConstant("JVMCI::code_too_large", Integer.class);
final int codeInstallResultNMethodReclaimed = getConstant("JVMCI::nmethod_reclaimed", Integer.class);
final int codeInstallResultFirstPermanentBailout = getConstant("JVMCI::first_permanent_bailout", Integer.class);
String getCodeInstallResultDescription(int codeInstallResult) {
if (codeInstallResult == codeInstallResultOk) {
@ -376,6 +378,9 @@ class HotSpotVMConfig extends HotSpotVMConfigAccess {
if (codeInstallResult == codeInstallResultCodeTooLarge) {
return "code is too large";
}
if (codeInstallResult == codeInstallResultNMethodReclaimed) {
return "nmethod reclaimed";
}
assert false : codeInstallResult;
return "unknown";
}