Skip to content

8361103: java_lang_Thread::async_get_stack_trace does not properly protect JavaThread #26119

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.

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

alexmenkov
Copy link

@alexmenkov alexmenkov commented Jul 3, 2025

The fix updates java_lang_Thread::async_get_stack_trace() (used by java.lang.Thread.getStackTrace() to get stack trace for platform and mounted virtual threads) to correctly use ThreadListHandle for thread protection.

Testing: tier1..5


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8361103: java_lang_Thread::async_get_stack_trace does not properly protect JavaThread (Bug - P3)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26119/head:pull/26119
$ git checkout pull/26119

Update a local copy of the PR:
$ git checkout pull/26119
$ git pull https://git.openjdk.org/jdk.git pull/26119/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26119

View PR using the GUI difftool:
$ git pr show -t 26119

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26119.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 3, 2025

👋 Welcome back amenkov! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Jul 3, 2025

@alexmenkov This change is no longer ready for integration - check the PR body for details.

@openjdk openjdk bot changed the title 8361103 8361103: java_lang_Thread::async_get_stack_trace does not properly protect JavaThread Jul 3, 2025
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 3, 2025
@openjdk
Copy link

openjdk bot commented Jul 3, 2025

@alexmenkov The following label will be automatically applied to this pull request:

  • hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@mlbridge
Copy link

mlbridge bot commented Jul 3, 2025

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks good. A couple of minor nits/queries.

Thanks

thread = java_lang_Thread::thread(carrier_thread);
} else {
thread = java_lang_Thread::thread(java_thread);
java_thread = java_lang_Thread::thread(carrier_thread);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't java_thread already have been set correctly by cv_internal_thread_to_JavaThread?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. This is for virtual thread. We need to get JavaThread from the carrier

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it.

Copy link
Member

@dholmes-ora dholmes-ora Jul 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I think we need a further check here. If we get the carrier thread directly, we have not checked that it is actually protected by the TLH - that is normally done by cv_internal_thread_to_JavaThread but that doesn't know about virtual threads and carriers! I need to check if we have to fix cv_internal_thread_to_JavaThread for the virtual thread case.

Copy link
Author

@alexmenkov alexmenkov Jul 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, we don't have TLH protection for carrier (and looks like JVMTI also doesn't care about carrier protection).
I think it may be useful to add virtual thread support to ThreadsListHandle (and update comments in threadSMR.hpp).
What about:

  bool cv_internal_thread_to_JavaThread(jobject jthread, JavaThread ** jt_pp, oop * thread_oop_p);

+  bool cv_oop_to_JavaThread(oop thread_oop, JavaThread** jt_pp);
+  bool cv_thread_or_carrier_to_JavaThread(oop thread_oop, JavaThread** jt_pp, bool* is_virtual_p = nullptr);

Also we need a way to check if specific vthread is mounted to JavaThread (to be checked in handshake), I think it should go to javaThread.hpp/.cpp:

  inline bool is_vthread_mounted() const;
+  inline bool is_vthread_mounted(oop vthread) const;

What do you think?
Would be nice to hear @dcubed-ojdk opinion (AFAIK he implemented threadSMR stuff)

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Thanks

thread = java_lang_Thread::thread(carrier_thread);
} else {
thread = java_lang_Thread::thread(java_thread);
java_thread = java_lang_Thread::thread(carrier_thread);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it.

@@ -1896,7 +1896,6 @@ oop java_lang_Thread::async_get_stack_trace(jobject jthread, TRAPS) {
java_thread = java_lang_Thread::thread(carrier_thread);
}
if (java_thread == nullptr) {
// terminated platform thread or unmounted virtual thread
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can leave the // terminated platform thread comment

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 8, 2025
@dholmes-ora
Copy link
Member

I'm also unclear if this code in the handshake is sufficient for dealing with the case where we have a mounted virtual thread initially, but it is unmounted before the handshake gets to execute:

    if (java_lang_VirtualThread::is_instance(_java_thread())) {
        // if (thread->vthread() != _java_thread()) // We might be inside a System.executeOnCarrierThread
        const ContinuationEntry* ce = thread->vthread_continuation();
        if (ce == nullptr || ce->cont_oop(thread) != java_lang_VirtualThread::continuation(_java_thread())) {
          return; // not mounted
        }
      }

The commented line seems an inaccurate characterization as we could be executing a completely different virtual thread on this carrier now - which is not related to executeOnCarrierThread.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revoking my approval as there may be further issues.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jul 8, 2025
@alexmenkov
Copy link
Author

I'm also unclear if this code in the handshake is sufficient for dealing with the case where we have a mounted virtual thread initially, but it is unmounted before the handshake gets to execute:

    if (java_lang_VirtualThread::is_instance(_java_thread())) {
        // if (thread->vthread() != _java_thread()) // We might be inside a System.executeOnCarrierThread
        const ContinuationEntry* ce = thread->vthread_continuation();
        if (ce == nullptr || ce->cont_oop(thread) != java_lang_VirtualThread::continuation(_java_thread())) {
          return; // not mounted
        }
      }

The commented line seems an inaccurate characterization as we could be executing a completely different virtual thread on this carrier now - which is not related to executeOnCarrierThread.

I suppose the comment is obsolete. I don't see executeOnCarrierThread in the current codebase.
The condition checks if there were some changes in vthread/carrier:
ce == nullptr - the carries has no mounted vthread now (i.e. the vthread has been unmounted);
ce->cont_oop(thread) != java_lang_VirtualThread::continuation(_java_thread()) - the carrier has other vthread mounted;
Even if there were unmount/mount the same vthread on the carrier, it's fine (we need vthread stack trace and we are in handshake with its carrier)

@AlanBateman
Copy link
Contributor

I suppose the comment is obsolete. I don't see executeOnCarrierThread in the current codebase. The condition checks if there were some changes in vthread/carrier: ce == nullptr - the carries has no mounted vthread now (i.e. the vthread has been unmounted); ce->cont_oop(thread) != java_lang_VirtualThread::continuation(_java_thread()) - the carrier has other vthread mounted; Even if there were unmount/mount the same vthread on the carrier, it's fine (we need vthread stack trace and we are in handshake with its carrier)

I suspect it dates back to when there were temporary transitions and where the thread identity had to be temporarily changed to the carrier thread. We've been able to remove that complexity, which eliminates complexity from JVMTI, and maybe here too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot [email protected] rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

3 participants