Skip to content
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.

Sign up for GitHub

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

Jump to bottom

8270317: Large Allocation in CipherSuite #253

Closed
wants to merge 3 commits into from
Closed

8270317: Large Allocation in CipherSuite #253

wants to merge 3 commits into from

Conversation

phohensee
Copy link
Member

@phohensee phohensee commented Jan 30, 2023 •
edited by openjdk bot
Loading

Backport for Oracle parity. Backport from 11u is not clean due to lack of CopyOf in 8u. The nearest equivalents are Collections.unmodifiableMap and Collections.unmodifiableList. Also, there is no jmh archive in 8u, so the performance test is not included.

Tier1 and all security tests pass, in production at Amazon for over a year without issues.

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

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev pull/253/head:pull/253
$ git checkout pull/253

Update a local copy of the PR:
$ git checkout pull/253
$ git pull https://git.openjdk.org/jdk8u-dev pull/253/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 253

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/253.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 30, 2023

👋 Welcome back phh! 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 openjdk bot changed the title Backport e627caec84c169c99c04e0d355c29b806a0266ed 8270317: Large Allocation in CipherSuite Jan 30, 2023
@openjdk
Copy link

openjdk bot commented Jan 30, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jan 30, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 30, 2023 •
edited
Loading

Webrevs

simonis
simonis approved these changes Jan 31, 2023
View reviewed changes
Copy link
Member

@simonis simonis 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 except for the comment change (which might be a merge artifact?).

jdk/src/share/classes/sun/security/ssl/CipherSuite.java Outdated
@@ -39,7 +35,7 @@
import static sun.security.ssl.SupportedGroupsExtension.NamedGroupType.*;

/**
* Enum for SSL/TLS cipher suites.
* Enum for SSL/(D)TLS cipher suites
Copy link
Member

Choose a reason for hiding this comment

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

It doesn't look like the original 11u patch changed this comment so I don't think we need this change in 8.

jdk/src/share/classes/sun/security/ssl/CipherSuite.java
cipherSuiteNames = Collections.unmodifiableMap(names);
allowedCipherSuites = Collections.unmodifiableList(allowedCS);
defaultCipherSuites = Collections.unmodifiableList(defaultCS);
}
Copy link
Member

Choose a reason for hiding this comment

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

Agree that in this case Collections.unmodifiableMap()/Collections.unmodifiableList() are a good replacement for the missing copyOf(). And it should also be faster, because it avoids a copy :)

@openjdk
Copy link

openjdk bot commented Jan 31, 2023 •
edited
Loading

@phohensee This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8270317: Large Allocation in CipherSuite

Reviewed-by: simonis, mbalao

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 19 new commits pushed to the master branch:

  • 71108a5: 8287463: JFR: Disable TestDevNull.java on Windows
  • ec53e00: 8282947: JFR: Dump on shutdown live-locks in some conditions
  • c183dc5: 8142540: [TEST_BUG] Test sun/awt/dnd/8024061/bug8024061.java fails on ubuntu
  • cbde744: 8137101: [TEST_BUG] javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java failure due to timing
  • 29a1b79: 7124238: [macosx] Font in BasicHTML document is bigger than it should be
  • 3af19d3: 8282511: Use fixed certificate validation date in SSLExampleCert template
  • 8995356: 6734341: REGTEST fails: SelectionAutoscrollTest.html
  • 11a96a7: 8156581: Cleanup of ProblemList.txt
  • fd41600: 8205959: Do not restart close if errno is EINTR
  • b71f59b: 8298027: Remove SCCS id's from awt jtreg tests
  • ... and 9 more: https://git.openjdk.org/jdk8u-dev/compare/36f6f17a9c2ad27a50159c2bf93b7e1fe067d3a8...master

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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 31, 2023
martinuy
martinuy approved these changes Feb 15, 2023
View reviewed changes
Copy link
Contributor

@martinuy martinuy left a comment

Choose a reason for hiding this comment

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

Hi Paul,

Thanks for your contribution. Looks good to me too.

Martin.-

@phohensee
Copy link
Member Author

Thank you, Martin. Now just waiting on maintainer review/approval...

@phohensee
Copy link
Member Author

/integrate

Got the approval.

@openjdk
Copy link

openjdk bot commented Feb 16, 2023

Going to push as commit aed31d9.
Since your change was applied there have been 20 commits pushed to the master branch:

  • 713c020: 8301760: Fix possible leak in SpNegoContext dispose
  • 71108a5: 8287463: JFR: Disable TestDevNull.java on Windows
  • ec53e00: 8282947: JFR: Dump on shutdown live-locks in some conditions
  • c183dc5: 8142540: [TEST_BUG] Test sun/awt/dnd/8024061/bug8024061.java fails on ubuntu
  • cbde744: 8137101: [TEST_BUG] javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java failure due to timing
  • 29a1b79: 7124238: [macosx] Font in BasicHTML document is bigger than it should be
  • 3af19d3: 8282511: Use fixed certificate validation date in SSLExampleCert template
  • 8995356: 6734341: REGTEST fails: SelectionAutoscrollTest.html
  • 11a96a7: 8156581: Cleanup of ProblemList.txt
  • fd41600: 8205959: Do not restart close if errno is EINTR
  • ... and 10 more: https://git.openjdk.org/jdk8u-dev/compare/36f6f17a9c2ad27a50159c2bf93b7e1fe067d3a8...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 16, 2023
@openjdk openjdk bot closed this Feb 16, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 16, 2023
@openjdk
Copy link

openjdk bot commented Feb 16, 2023

@phohensee Pushed as commit aed31d9.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simonis simonis simonis approved these changes

@martinuy martinuy martinuy approved these changes

Assignees
No one assigned
Labels
backport integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@phohensee @simonis @martinuy