8307156: native_thread not protected by TLH

Markus Grönlund · Markus Grönlund · commit 0c6529d2d38a · 2023-05-04T17:26:31.000Z
Reviewed-by: coleenp, dcubed
diff --git a/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp b/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
@@ -664,8 +664,7 @@ bool JfrJavaSupport::is_jdk_jfr_module_available(outputStream* stream, TRAPS) {
 
 typedef JfrOopTraceId<ThreadIdAccess> AccessThreadTraceId;
 
-static JavaThread* get_native(jobject thread) {
-  ThreadsListHandle tlh;
+static JavaThread* get_native(ThreadsListHandle& tlh, jobject thread) {
   JavaThread* native_thread = NULL;
   (void)tlh.cv_internal_thread_to_JavaThread(thread, &native_thread, NULL);
   return native_thread;
@@ -704,7 +703,8 @@ void JfrJavaSupport::exclude(JavaThread* jt, oop ref, jobject thread) {
       return;
     }
   }
-  jt = get_native(thread);
+  ThreadsListHandle tlh;
+  jt = get_native(tlh, thread);
   if (jt != nullptr) {
     JfrThreadLocal::exclude_jvm_thread(jt);
   }
@@ -720,7 +720,8 @@ void JfrJavaSupport::include(JavaThread* jt, oop ref, jobject thread) {
       return;
     }
   }
-  jt = get_native(thread);
+  ThreadsListHandle tlh;
+  jt = get_native(tlh, thread);
   if (jt != nullptr) {
     JfrThreadLocal::include_jvm_thread(jt);
   }

Original file line number	Diff line number	Diff line change
`@@ -664,8 +664,7 @@ bool JfrJavaSupport::is_jdk_jfr_module_available(outputStream* stream, TRAPS) {`
`664`	`664`
`665`	`665`	`typedef JfrOopTraceId<ThreadIdAccess> AccessThreadTraceId;`
`666`	`666`
`667`		`-static JavaThread* get_native(jobject thread) {`
`668`		`- ThreadsListHandle tlh;`
	`667`	`+static JavaThread* get_native(ThreadsListHandle& tlh, jobject thread) {`
`669`	`668`	`JavaThread* native_thread = NULL;`
`670`	`669`	`(void)tlh.cv_internal_thread_to_JavaThread(thread, &native_thread, NULL);`
`671`	`670`	`return native_thread;`
`@@ -704,7 +703,8 @@ void JfrJavaSupport::exclude(JavaThread* jt, oop ref, jobject thread) {`
`704`	`703`	`return;`
`705`	`704`	`}`
`706`	`705`	`}`
`707`		`- jt = get_native(thread);`
	`706`	`+ ThreadsListHandle tlh;`
	`707`	`+ jt = get_native(tlh, thread);`
`708`	`708`	`if (jt != nullptr) {`
`709`	`709`	`JfrThreadLocal::exclude_jvm_thread(jt);`
`710`	`710`	`}`
`@@ -720,7 +720,8 @@ void JfrJavaSupport::include(JavaThread* jt, oop ref, jobject thread) {`
`720`	`720`	`return;`
`721`	`721`	`}`
`722`	`722`	`}`
`723`		`- jt = get_native(thread);`
	`723`	`+ ThreadsListHandle tlh;`
	`724`	`+ jt = get_native(tlh, thread);`
`724`	`725`	`if (jt != nullptr) {`
`725`	`726`	`JfrThreadLocal::include_jvm_thread(jt);`
`726`	`727`	`}`