-
Notifications
You must be signed in to change notification settings - Fork 6.1k
8356865: C2: Unreasonable values for debug flag FastAllocateSizeLimit can lead to left-shift-overflow, which is UB #25834
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
Conversation
👋 Welcome back bmaillard! A progress list of the required criteria for merging this PR into |
@benoitmaillard 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 64 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 (@eme64) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
@benoitmaillard The following label will be automatically applied to this pull request:
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. |
Webrevs
|
/label add hotspot-compiler |
@benoitmaillard |
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.
Thank you for working on this, @benoitmaillard. This looks good to me.
src/hotspot/share/opto/graphKit.cpp
Outdated
@@ -3804,6 +3804,7 @@ Node* GraphKit::new_array(Node* klass_node, // array klass (maybe variable) | |||
// Increase the size limit if we have exact knowledge of array type. | |||
int log2_esize = Klass::layout_helper_log2_element_size(layout_con); | |||
fast_size_limit <<= (LogBytesPerLong - log2_esize); | |||
assert (fast_size_limit > 0, "increasing the size limit should not produce negative values"); |
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.
Prior C++14 left shit producing a negative value is undefined behavior: https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2161.pdf
Do we compile c++ source specifying the C++ standard?
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.
Yes we use -std=c++14, but creating a negative value in this way still feels like a kind of overflow to me.
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.
Thanks for the comments!
I added the assert because the issue in the JBS mentioned a specific case where we ended up with negative values.
Should I leave it like this, or rather convert it to a more specific check (ie. making sure that the LogBytesPerLong - log2_esize
most significant bits are not used before shifting)?
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.
IMO your assert is obfuscating the overflow problem.
I think the assert should be before doing the shift.
It can be like:
assert((fast_size_limit == 0) || (count_leading_zeros(fast_size_limit) > (LogBytesPerLong - log2_esize), "fast_size_limit (%d) overflow when shifted left by %d", fast_size_limit, (LogBytesPerLong - log2_esize));
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.
Thanks for the tip, I made the requested changes!
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.
Thanks for the updates! Nice work :)
/integrate |
@benoitmaillard |
/sponsor |
Going to push as commit c220b13.
Your commit was automatically rebased without conflicts. |
@eme64 @benoitmaillard Pushed as commit c220b13. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
This PR adds a range constraint for the
-XX:FastAllocateSizeLimit
debug flag. This prevents undefined behavior caused by left-shift overflow of the flag value inGraphKit::new_array
.Testing
Thanks!
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/25834/head:pull/25834
$ git checkout pull/25834
Update a local copy of the PR:
$ git checkout pull/25834
$ git pull https://git.openjdk.org/jdk.git pull/25834/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 25834
View PR using the GUI difftool:
$ git pr show -t 25834
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/25834.diff
Using Webrev
Link to Webrev Comment