-
Notifications
You must be signed in to change notification settings - Fork 5.8k
8308118: Avoid multiarray allocations in AESCrypt.makeSessionKey #13996
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 shade! A progress list of the required criteria for merging this PR into |
Webrevs
|
src/java.base/share/classes/com/sun/crypto/provider/AESCrypt.java
Outdated
Show resolved
Hide resolved
src/java.base/share/classes/com/sun/crypto/provider/AESCrypt.java
Outdated
Show resolved
Hide resolved
@XueleiFan, or anyone else, please take a look? |
I will have a look, but I may need more time. |
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.
Looks good to me. Please make sure the security regression testing passed.
@shipilev 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 46 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. ➡️ To integrate this PR with the above commit message to the |
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 my review counts, but this looks good to me
Thanks! By "security regression testing" that you mean |
jdk_security or tier2. |
Gotcha, I already tested both, see "Additional Testing" section in PR. |
Thanks! |
Rechecked /integrate |
Going to push as commit 6765761.
Your commit was automatically rebased without conflicts. |
One of our services has a hot path with AES/GCM cipher reuse. The JDK code reinitializes the session key on that path, and JDK-8308105 shows up prominently there.
Fixing JDK-8308105 would take a while, as would likely require multiple patches in VM internals. Meanwhile, we can avoid the multiarray allocations in AESCrypt.makeSessionKey completely, reaping performance benefits. We can go even deeper: replace the multi-array with the flat array and drop
expandToSubKey
completely.Example original profile is in the bug.
There are other things we can polish in that code, but experiments show those polishings have rather diminshed returns.
On new benchmark:
Additional testing:
jdk_security
tier1 tier2 tier3
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/13996/head:pull/13996
$ git checkout pull/13996
Update a local copy of the PR:
$ git checkout pull/13996
$ git pull https://git.openjdk.org/jdk.git pull/13996/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 13996
View PR using the GUI difftool:
$ git pr show -t 13996
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/13996.diff
Webrev
Link to Webrev Comment