Skip to content

Invalidate JNI IDs for unloaded classes #18519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2023
Merged

Invalidate JNI IDs for unloaded classes #18519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions runtime/jvmti/jvmtiBreakpoint.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jvmtiSetBreakpoint(jvmtiEnv* env,
ENSURE_PHASE_LIVE(env);
ENSURE_CAPABILITY(env, can_generate_breakpoint_events);

ENSURE_JMETHODID_NON_NULL(method);
ENSURE_JMETHODID_VALID(method);

/* Ensure the location is valid for the method */

Expand Down Expand Up @@ -119,7 +119,7 @@ jvmtiClearBreakpoint(jvmtiEnv* env,
ENSURE_PHASE_LIVE(env);
ENSURE_CAPABILITY(env, can_generate_breakpoint_events);

ENSURE_JMETHODID_NON_NULL(method);
ENSURE_JMETHODID_VALID(method);

/* Ensure the location is valid for the method */

Expand Down
2 changes: 1 addition & 1 deletion runtime/jvmti/jvmtiExtensionMechanism.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3586,7 +3586,7 @@ jvmtiGetJ9method(jvmtiEnv *env, ...)

ENSURE_PHASE_START_OR_LIVE(env);

ENSURE_JMETHODID_NON_NULL(mid);
ENSURE_JMETHODID_VALID(mid);
ENSURE_NON_NULL(j9MethodPtr);

rv_j9Method = ((J9JNIMethodID *) mid)->method;
Expand Down
8 changes: 4 additions & 4 deletions runtime/jvmti/jvmtiField.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jvmtiGetFieldName(jvmtiEnv* env,
ENSURE_PHASE_START_OR_LIVE(env);

ENSURE_JCLASS_NON_NULL(klass);
ENSURE_JFIELDID_NON_NULL(field);
ENSURE_JFIELDID_VALID(field);

romFieldShape = ((J9JNIFieldID *) field)->field;

Expand Down Expand Up @@ -149,7 +149,7 @@ jvmtiGetFieldDeclaringClass(jvmtiEnv* env,
ENSURE_PHASE_START_OR_LIVE(env);

ENSURE_JCLASS_NON_NULL(klass);
ENSURE_JFIELDID_NON_NULL(field);
ENSURE_JFIELDID_VALID(field);
ENSURE_NON_NULL(declaring_class_ptr);

fieldClass = getCurrentClass(((J9JNIFieldID *) field)->declaringClass);
Expand Down Expand Up @@ -188,7 +188,7 @@ jvmtiGetFieldModifiers(jvmtiEnv* env,
ENSURE_PHASE_START_OR_LIVE(env);

ENSURE_JCLASS_NON_NULL(klass);
ENSURE_JFIELDID_NON_NULL(field);
ENSURE_JFIELDID_VALID(field);
ENSURE_NON_NULL(modifiers_ptr);

romField = ((J9JNIFieldID *) field)->field;
Expand Down Expand Up @@ -230,7 +230,7 @@ jvmtiIsFieldSynthetic(jvmtiEnv* env,
ENSURE_CAPABILITY(env, can_get_synthetic_attribute);

ENSURE_JCLASS_NON_NULL(klass);
ENSURE_JFIELDID_NON_NULL(field);
ENSURE_JFIELDID_VALID(field);
ENSURE_NON_NULL(is_synthetic_ptr);

romFieldShape = ((J9JNIFieldID *) field)->field;
Expand Down
24 changes: 12 additions & 12 deletions runtime/jvmti/jvmtiMethod.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jvmtiGetMethodName(jvmtiEnv* env,

ENSURE_PHASE_START_OR_LIVE(env);

ENSURE_JMETHODID_NON_NULL(method);
ENSURE_JMETHODID_VALID(method);

romMethod = J9_ROM_METHOD_FROM_RAM_METHOD(((J9JNIMethodID *) method)->method);

Expand Down Expand Up @@ -141,7 +141,7 @@ jvmtiGetMethodDeclaringClass(jvmtiEnv* env,

ENSURE_PHASE_START_OR_LIVE(env);

ENSURE_JMETHODID_NON_NULL(method);
ENSURE_JMETHODID_VALID(method);
ENSURE_NON_NULL(declaring_class_ptr);

methodClass = getCurrentClass(J9_CLASS_FROM_METHOD(((J9JNIMethodID *) method)->method));
Expand Down Expand Up @@ -171,7 +171,7 @@ jvmtiGetMethodModifiers(jvmtiEnv* env,

ENSURE_PHASE_START_OR_LIVE(env);

ENSURE_JMETHODID_NON_NULL(method);
ENSURE_JMETHODID_VALID(method);
ENSURE_NON_NULL(modifiers_ptr);

romMethod = J9_ROM_METHOD_FROM_RAM_METHOD(((J9JNIMethodID *) method)->method);
Expand Down Expand Up @@ -200,7 +200,7 @@ jvmtiGetMaxLocals(jvmtiEnv* env,

ENSURE_PHASE_START_OR_LIVE(env);

ENSURE_JMETHODID_NON_NULL(method);
ENSURE_JMETHODID_VALID(method);
ENSURE_NON_NULL(max_ptr);

romMethod = J9_ROM_METHOD_FROM_RAM_METHOD(((J9JNIMethodID *) method)->method);
Expand Down Expand Up @@ -238,7 +238,7 @@ jvmtiGetArgumentsSize(jvmtiEnv* env,

ENSURE_PHASE_START_OR_LIVE(env);

ENSURE_JMETHODID_NON_NULL(method);
ENSURE_JMETHODID_VALID(method);
ENSURE_NON_NULL(size_ptr);

romMethod = J9_ROM_METHOD_FROM_RAM_METHOD(((J9JNIMethodID *) method)->method);
Expand Down Expand Up @@ -277,7 +277,7 @@ jvmtiGetLineNumberTable(jvmtiEnv* env,
ENSURE_PHASE_START_OR_LIVE(env);
ENSURE_CAPABILITY(env, can_get_line_numbers);

ENSURE_JMETHODID_NON_NULL(method);
ENSURE_JMETHODID_VALID(method);
ENSURE_NON_NULL(entry_count_ptr);
ENSURE_NON_NULL(table_ptr);

Expand Down Expand Up @@ -356,7 +356,7 @@ jvmtiGetMethodLocation(jvmtiEnv* env,

ENSURE_PHASE_START_OR_LIVE(env);

ENSURE_JMETHODID_NON_NULL(method);
ENSURE_JMETHODID_VALID(method);
ENSURE_NON_NULL(start_location_ptr);
ENSURE_NON_NULL(end_location_ptr);

Expand Down Expand Up @@ -404,7 +404,7 @@ jvmtiGetLocalVariableTable(jvmtiEnv* env,
ENSURE_PHASE_LIVE(env);
ENSURE_CAPABILITY(env, can_access_local_variables);

ENSURE_JMETHODID_NON_NULL(method);
ENSURE_JMETHODID_VALID(method);
ENSURE_NON_NULL(entry_count_ptr);
ENSURE_NON_NULL(table_ptr);

Expand Down Expand Up @@ -520,7 +520,7 @@ jvmtiGetBytecodes(jvmtiEnv* env,
ENSURE_PHASE_START_OR_LIVE(env);
ENSURE_CAPABILITY(env, can_get_bytecodes);

ENSURE_JMETHODID_NON_NULL(method);
ENSURE_JMETHODID_VALID(method);
ENSURE_NON_NULL(bytecode_count_ptr);
ENSURE_NON_NULL(bytecodes_ptr);

Expand Down Expand Up @@ -843,7 +843,7 @@ jvmtiIsMethodNative(jvmtiEnv* env,

ENSURE_PHASE_START_OR_LIVE(env);

ENSURE_JMETHODID_NON_NULL(method);
ENSURE_JMETHODID_VALID(method);
ENSURE_NON_NULL(is_native_ptr);

romMethod = J9_ROM_METHOD_FROM_RAM_METHOD(((J9JNIMethodID *) method)->method);
Expand Down Expand Up @@ -872,7 +872,7 @@ jvmtiIsMethodSynthetic(jvmtiEnv* env,
ENSURE_PHASE_START_OR_LIVE(env);
ENSURE_CAPABILITY(env, can_get_synthetic_attribute);

ENSURE_JMETHODID_NON_NULL(method);
ENSURE_JMETHODID_VALID(method);
ENSURE_NON_NULL(is_synthetic_ptr);

romMethod = J9_ROM_METHOD_FROM_RAM_METHOD(((J9JNIMethodID *) method)->method);
Expand All @@ -899,7 +899,7 @@ jvmtiIsMethodObsolete(jvmtiEnv* env,

ENSURE_PHASE_START_OR_LIVE(env);

ENSURE_JMETHODID_NON_NULL(method);
ENSURE_JMETHODID_VALID(method);
ENSURE_NON_NULL(is_obsolete_ptr);

rv_is_obsolete = (J9CLASS_FLAGS(J9_CLASS_FROM_METHOD(((J9JNIMethodID *) method)->method)) & J9AccClassHotSwappedOut) ? JNI_TRUE : JNI_FALSE;
Expand Down
4 changes: 2 additions & 2 deletions runtime/jvmti/jvmtiWatchedField.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ setFieldWatch(jvmtiEnv* env,
vm->internalVMFunctions->internalEnterVMFromJNI(currentThread);

ENSURE_JCLASS_NON_NULL(klass);
ENSURE_JFIELDID_NON_NULL(field);
ENSURE_JFIELDID_VALID(field);

vm->internalVMFunctions->acquireExclusiveVMAccess(currentThread);

Expand Down Expand Up @@ -231,7 +231,7 @@ clearFieldWatch(jvmtiEnv* env,
vm->internalVMFunctions->internalEnterVMFromJNI(currentThread);

ENSURE_JCLASS_NON_NULL(klass);
ENSURE_JFIELDID_NON_NULL(field);
ENSURE_JFIELDID_VALID(field);

vm->internalVMFunctions->acquireExclusiveVMAccess(currentThread);

Expand Down
5 changes: 5 additions & 0 deletions runtime/oti/j9nonbuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3812,6 +3812,11 @@ typedef struct J9JNIFieldID {
struct J9Class* declaringClass;
} J9JNIFieldID;

typedef union J9GenericJNIID {
J9JNIFieldID fieldID;
J9JNIMethodID methodID;
} J9GenericJNIID;

typedef struct J9ITable {
struct J9Class* interfaceClass;
UDATA depth;
Expand Down
12 changes: 6 additions & 6 deletions runtime/oti/jvmtiInternal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,16 +436,16 @@ typedef struct jvmtiGcp_translation {
} \
} while(0)

#define ENSURE_JMETHODID_NON_NULL(var) \
#define ENSURE_JMETHODID_VALID(var) \
do { \
if ((var) == NULL) { \
if ((NULL == (var)) || (UDATA_MAX == (UDATA)((J9JNIMethodID*)(var))->method)) { \
JVMTI_ERROR(JVMTI_ERROR_INVALID_METHODID); \
} \
} while(0)

#define ENSURE_JFIELDID_NON_NULL(var) \
#define ENSURE_JFIELDID_VALID(var) \
do { \
if ((var) == NULL) { \
if ((NULL == (var)) || (UDATA_MAX == (UDATA)((J9JNIFieldID*)(var))->declaringClass)) { \
JVMTI_ERROR(JVMTI_ERROR_INVALID_FIELDID); \
} \
} while(0)
Expand Down Expand Up @@ -515,8 +515,8 @@ typedef struct jvmtiGcp_translation {
#define ENSURE_CAPABILITY(env, capability)
#define ENSURE_NON_NULL(var)
#define ENSURE_NON_NEGATIVE(var)
#define ENSURE_JMETHODID_NON_NULL(var)
#define ENSURE_JFIELDID_NON_NULL(var)
#define ENSURE_JMETHODID_VALID(var)
#define ENSURE_JFIELDID_VALID(var)
#define ENSURE_JOBJECT_NON_NULL(var)
#define ENSURE_JCLASS_NON_NULL(var)
#define ENSURE_JTHREADGROUP_NON_NULL(var)
Expand Down
10 changes: 9 additions & 1 deletion runtime/vm/classallocation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,15 @@ freeClassLoader(J9ClassLoader *classLoader, J9JavaVM *javaVM, J9VMThread *vmThre
}

if (NULL != classLoader->jniIDs) {
if (J9_ARE_NO_BITS_SET(javaVM->extendedRuntimeFlags2, J9_EXTENDED_RUNTIME2_KEEP_JNI_IDS)) {
if (J9_ARE_ANY_BITS_SET(javaVM->extendedRuntimeFlags2, J9_EXTENDED_RUNTIME2_KEEP_JNI_IDS)) {
pool_state idWalkState;
J9GenericJNIID *jniID = pool_startDo(classLoader->jniIDs, &idWalkState);

while (NULL != jniID) {
memset(jniID, -1, sizeof(J9GenericJNIID));
jniID = pool_nextDo(&idWalkState);
}
} else {
pool_kill(classLoader->jniIDs);
}
classLoader->jniIDs = NULL;
Expand Down
5 changes: 0 additions & 5 deletions runtime/vm/jnicsup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@

extern "C" {

typedef union J9GenericJNIID {
J9JNIFieldID fieldID;
J9JNIMethodID methodID;
} J9GenericJNIID;

#define METHODID_CLASS_REF(methodID) ((jclass) &(J9_CP_FROM_METHOD(((J9JNIMethodID *) (methodID))->method)->ramClass->classObject))

#define MAX_LOCAL_CAPACITY (64 * 1024)
Expand Down