-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8366154: Validate thread type requirements in debug commands #27033
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
base: master
Are you sure you want to change the base?
Conversation
Prevent crashes when calling interactive debug commands from native or non-java threads. Add onThread() and onJavaThread() methods to the Command class to validate the current thread type. Update debug commands to use these checks, printing an error and exiting gracefully upon failure.
👋 Welcome back krk! A progress list of the required criteria for merging this PR into |
@krk This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 74 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@dholmes-ora) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
Co-authored-by: Francesco Andreuzzi <[email protected]>
Webrevs
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We typically assume the user knows what they are doing at this level, but I suppose making it a little more robust doesn't hurt. I don't think we quite need everything though.
Thanks
} | ||
|
||
if (!_has_rm) { | ||
::new (&_rm) ResourceMark(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There should be #include <new>
to use global placement-new.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added, thanks.
bool onJavaThread() { | ||
if (!onThread()) return false; | ||
|
||
if (JavaThread::active() == nullptr) { | ||
tty->print_cr("Failed: Current thread is not a java thread or the vm thread"); | ||
return false; | ||
} | ||
return true; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we need this. The commands that require a JavaThread should be checking that directly themselves. Typically we assume/expect the person debugging to know what they are dealing with and use the appropriate commands.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will remove this function and do the check in the 3 call sites of it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dholmes-ora, are you sure you want this level of code duplication? As is it, the latest version duplicates the following 3 times
if (!c.onThread()) return;
JavaThread* p = JavaThread::active();
if (p == nullptr) {
tty->print_cr("Failed: JavaThread::active is null");
return;
}
tty->print(" for thread: ");
p->print();
tty->cr();
return false; | ||
} | ||
|
||
if (!_has_rm) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it even possible for this not to be false with correct usage?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, onThread
would have to be called at least twice.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems okay to me.
Note you need two reviews before integrating.
Prevents segmentation faults during
gdb
sessions. The crashes were caused by theResourceMark
constructor being called on a native thread, which is not supported. This happened when invoking debug commands that require aThread
orJavaThread
context from an incorrect thread type.Solution
This change introduces
onThread()
andonJavaThread()
helper methods to theCommand
class. These methods validate the thread context and ensureResourceMark
is only created when on a valid VM thread. All thread-dependent debug commands now use these guards to validate the context, printing a clear error and exiting gracefully upon failure.Testing
Manually verified using
gdb
by calling the modified commands (ps
,universe
,pns
, etc.) from different thread contexts (native, Java, and non-java threads) to ensure they fail gracefully with an error message instead of crashing the debug session.Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/27033/head:pull/27033
$ git checkout pull/27033
Update a local copy of the PR:
$ git checkout pull/27033
$ git pull https://git.openjdk.org/jdk.git pull/27033/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 27033
View PR using the GUI difftool:
$ git pr show -t 27033
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/27033.diff
Using Webrev
Link to Webrev Comment