8276660: Scalability bottleneck in java.security.Provider.getService() #2730

lutkerd · 2024-07-19T18:46:32Z

Backporting JDK-8276660 which also fixes a bug in SecureRandom registration that was exposed during testing of https://github.com/corretto/amazon-corretto-crypto-provider. Currently, if you register a new provider then new SecureRandom doesn't work right away and only after making some other call like Cipher.getInstance() does it return the ACCP provided SecureRandom.

Ran all "java/security/Provider/", "jdk/jfr/event/" and tier1 tests locally on Linux x64 and they passed.

"JDK-8254711: Add java.security.Provider.getService JFR Event" makes changes some of the same functioned but was different in 17u than upstream. To get a cleaner backport I reverted it locally, backported JDK-8276660 and then re-applied 8254711 to get the updated code around the Map changes.

Also backporting the followup fixes:
8292739: Invalid legacy entries may be returned by Provider.getServic…
8279222: Incorrect legacyMap.get in java.security.Provider after JDK-8276660

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
JDK-8292739 needs maintainer approval
JDK-8279222 needs maintainer approval
JDK-8276660 needs maintainer approval

Issues

JDK-8276660: Scalability bottleneck in java.security.Provider.getService() (Enhancement - P3 - Approved)
JDK-8292739: Invalid legacy entries may be returned by Provider.getServices() call (Bug - P4 - Approved)
JDK-8279222: Incorrect legacyMap.get in java.security.Provider after JDK-8276660 (Bug - P4 - Approved)

Reviewers

Sean Coffey (@coffeys - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2730

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

Using diff file

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

Webrev

Link to Webrev Comment

This reverts commit 394a756.

lutkerd · 2024-07-19T18:46:56Z

/issue add JDK-8292739
/issue add JDK-8279222

bridgekeeper · 2024-07-19T18:47:11Z

👋 Welcome back dlutker! 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 · 2024-07-19T18:47:46Z

@lutkerd 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:

8276660: Scalability bottleneck in java.security.Provider.getService()
8292739: Invalid legacy entries may be returned by Provider.getServices() call
8279222: Incorrect legacyMap.get in java.security.Provider after JDK-8276660

Reviewed-by: coffeys

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

9ef505d: 8315651: Stop hiding AIX specific multicast socket errors via NetworkConfiguration (aix)
269bd25: 8307352: AARCH64: Improve itable_stub
c7ca5f8: 8334339: Test java/nio/file/attribute/BasicFileAttributeView/CreationTime.java fails on alinux3
933587a: 8280990: [XWayland] XTest emulated mouse click does not bring window to front
234bf86: 8331011: [XWayland] TokenStorage fails under Security Manager
3d39e85: 8320655: awt screencast robot spin and sync issues with native libpipewire api
73b24d0: 8327424: ProblemList serviceability/sa/TestJmapCore.java on all platforms with ZGC
e0e2fe6: 8275851: Deproblemlist open/test/jdk/javax/swing/JComponent/6683775/bug6683775.java
6e3dca8: 8280034: ProblemList jdk/jfr/api/consumer/recordingstream/TestOnEvent.java on linux-x64
19aab39: 8193547: Regression automated test '/open/test/jdk/java/awt/Toolkit/DesktopProperties/rfe4758438.java' fails
... and 5 more: https://git.openjdk.org/jdk17u-dev/compare/72de151057ab4aefc53cfcad9745416f60af9068...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.

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 (@shipilev, @coffeys) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

openjdk · 2024-07-19T18:48:00Z

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

openjdk · 2024-07-19T18:48:42Z

@lutkerd
Adding additional issue to issue list: 8292739: Invalid legacy entries may be returned by Provider.getServices() call.

openjdk · 2024-07-19T18:49:25Z

@lutkerd
Adding additional issue to issue list: 8279222: Incorrect legacyMap.get in java.security.Provider after JDK-8276660.

Reviewed-by: mullan, valeriep, jpai

shipilev

This looks okay, but I have questions:

shipilev · 2024-07-22T08:12:36Z

src/java.base/share/classes/java/security/Provider.java

        if (s == null) {
-            synchronized (this) {
-                ensureLegacyParsed();
-                if (legacyMap != null && !legacyMap.isEmpty()) {
-                    s = legacyMap.get(key);
-                }
+            s = legacyMap.get(key);
+            if (s != null && !s.isValid()) {
+                legacyMap.remove(key, s);


This hunk seems to be different from the hunk in the original changeset: openjdk/jdk@9b74749#diff-c2847a8d1997d3d28a13354b05d5e21ac6656e7e17f849bc198715099b9b5bd2L1204-R1286 -- and the follow-ups did not change it as well. Does this stack of patches contain some other patch?

This block comes from the JFR patch I reverted and re-applied: https://github.com/openjdk/jdk/commit/bc2af47e1e4e6e96020e03a60ce098ddd17f63ba#diff-c2847a8d1997d3d28a13354b05d5[…]f849bc198715099b9b5bd2R1286-R1290

The code should be matching tip minus change changes from openjdk/jdk@1769596#diff-c2847a8d1997d3d28a13354b05d5e21ac6656e7e17f849bc198715099b9b5bd2R1273-R1274

All right, thanks.

lutkerd · 2024-07-22T16:31:06Z

@coffeys @valeriepeng, can you take a look?

mlbridge · 2024-07-22T16:35:40Z

Webrevs

00: Full (be1ae3ac)

coffeys · 2024-07-23T11:18:50Z

@coffeys @valeriepeng, can you take a look?

Changes look ok to me.

openjdk · 2024-07-23T11:19:46Z

⚠️ @lutkerd This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

lutkerd · 2024-07-23T19:40:15Z

/approval request Backporting JDK-8276660 to fix issue with Provider registration not taking immediate effect. Ran tier1-4 and reproducer of the issue without a problem. Also pulling in followups of JDK-8292739 and JDK-8279222 as to not introduce bugs. This was not clean and required reverting and re-applying JDK-8254711 to get the correct code.

openjdk · 2024-07-23T19:41:44Z

@lutkerd
8276660: The approval request has been created successfully.
8292739: The approval request has been created successfully.
8279222: The approval request has been created successfully.

lutkerd · 2024-07-25T20:45:37Z

/integrate

openjdk · 2024-07-25T20:46:25Z

@lutkerd
Your change (at version be1ae3a) is now ready to be sponsored by a Committer.

Rudometov · 2024-07-25T20:53:00Z

/sponsor

openjdk · 2024-07-25T20:54:00Z

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

9ef505d: 8315651: Stop hiding AIX specific multicast socket errors via NetworkConfiguration (aix)
269bd25: 8307352: AARCH64: Improve itable_stub
c7ca5f8: 8334339: Test java/nio/file/attribute/BasicFileAttributeView/CreationTime.java fails on alinux3
933587a: 8280990: [XWayland] XTest emulated mouse click does not bring window to front
234bf86: 8331011: [XWayland] TokenStorage fails under Security Manager
3d39e85: 8320655: awt screencast robot spin and sync issues with native libpipewire api
73b24d0: 8327424: ProblemList serviceability/sa/TestJmapCore.java on all platforms with ZGC
e0e2fe6: 8275851: Deproblemlist open/test/jdk/javax/swing/JComponent/6683775/bug6683775.java
6e3dca8: 8280034: ProblemList jdk/jfr/api/consumer/recordingstream/TestOnEvent.java on linux-x64
19aab39: 8193547: Regression automated test '/open/test/jdk/java/awt/Toolkit/DesktopProperties/rfe4758438.java' fails
... and 5 more: https://git.openjdk.org/jdk17u-dev/compare/72de151057ab4aefc53cfcad9745416f60af9068...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-07-25T20:54:11Z

@Rudometov @lutkerd Pushed as commit fe1a4a8.

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

lutkerd and others added 2 commits July 19, 2024 18:28

Revert "8254711: Add java.security.Provider.getService JFR Event"

8a9a4c8

This reverts commit 394a756.

Backport 9b747491de01fd011b09668a67113e80c2b7c70

023b536

openjdk bot changed the title ~~Backport 9b747491de01fd011b09668a67113e80c2b7c708~~ 8276660: Scalability bottleneck in java.security.Provider.getService() Jul 19, 2024

openjdk bot added the backport label Jul 19, 2024

lutkerd force-pushed the 8276660 branch 3 times, most recently from 60d5a8b to 8561268 Compare July 19, 2024 19:18

coffeys and others added 3 commits July 19, 2024 19:18

8254711: Add java.security.Provider.getService JFR Event

ddf3838

Reviewed-by: mullan, valeriep, jpai

Backport 0f4807e8fe2468f303b32a6f2dc9ccc7ecad82a1

4701d30

Backport 14623c6087105a4228ff190e9e27372729b2bc4b

be1ae3a

lutkerd force-pushed the 8276660 branch from 8561268 to be1ae3a Compare July 19, 2024 19:18

shipilev reviewed Jul 22, 2024

View reviewed changes

lutkerd marked this pull request as ready for review July 22, 2024 16:30

openjdk bot added the rfr Pull request is ready for review label Jul 22, 2024

coffeys approved these changes Jul 23, 2024

View reviewed changes

openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jul 23, 2024

openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 25, 2024

openjdk bot added the integrated Pull request has been integrated label Jul 25, 2024

openjdk bot closed this Jul 25, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jul 25, 2024

lutkerd deleted the 8276660 branch July 25, 2024 20:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8276660: Scalability bottleneck in java.security.Provider.getService() #2730

8276660: Scalability bottleneck in java.security.Provider.getService() #2730

lutkerd commented Jul 19, 2024 •

edited by openjdk bot

Loading

lutkerd commented Jul 19, 2024

bridgekeeper bot commented Jul 19, 2024

openjdk bot commented Jul 19, 2024 •

edited

Loading

openjdk bot commented Jul 19, 2024

openjdk bot commented Jul 19, 2024

openjdk bot commented Jul 19, 2024

shipilev left a comment

shipilev Jul 22, 2024

lutkerd Jul 22, 2024 •

edited

Loading

shipilev Jul 22, 2024

lutkerd commented Jul 22, 2024

mlbridge bot commented Jul 22, 2024

coffeys commented Jul 23, 2024

openjdk bot commented Jul 23, 2024

lutkerd commented Jul 23, 2024 •

edited

Loading

openjdk bot commented Jul 23, 2024

lutkerd commented Jul 25, 2024

openjdk bot commented Jul 25, 2024

Rudometov commented Jul 25, 2024

openjdk bot commented Jul 25, 2024

openjdk bot commented Jul 25, 2024

8276660: Scalability bottleneck in java.security.Provider.getService() #2730

8276660: Scalability bottleneck in java.security.Provider.getService() #2730

Conversation

lutkerd commented Jul 19, 2024 • edited by openjdk bot Loading

Progress

Issues

Reviewers

Reviewing

Webrev

lutkerd commented Jul 19, 2024

bridgekeeper bot commented Jul 19, 2024

openjdk bot commented Jul 19, 2024 • edited Loading

openjdk bot commented Jul 19, 2024

openjdk bot commented Jul 19, 2024

openjdk bot commented Jul 19, 2024

shipilev left a comment

Choose a reason for hiding this comment

shipilev Jul 22, 2024

Choose a reason for hiding this comment

lutkerd Jul 22, 2024 • edited Loading

Choose a reason for hiding this comment

shipilev Jul 22, 2024

Choose a reason for hiding this comment

lutkerd commented Jul 22, 2024

mlbridge bot commented Jul 22, 2024

Webrevs

coffeys commented Jul 23, 2024

openjdk bot commented Jul 23, 2024

lutkerd commented Jul 23, 2024 • edited Loading

openjdk bot commented Jul 23, 2024

lutkerd commented Jul 25, 2024

openjdk bot commented Jul 25, 2024

Rudometov commented Jul 25, 2024

openjdk bot commented Jul 25, 2024

openjdk bot commented Jul 25, 2024

lutkerd commented Jul 19, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Jul 19, 2024 •

edited

Loading

lutkerd Jul 22, 2024 •

edited

Loading

lutkerd commented Jul 23, 2024 •

edited

Loading