8252794: Creation of JNIMethodBlock should be done with a leaf lock #53

robehn · 2020-09-07T12:16:17Z

JVM TI uses handshakes and sometimes need jmethod ids.
The CLD have an area where these ids are saved, which is created on first request for an id.

The creation of this area should be done with a leaf lock.
In W.I.P. asynchronous handshake change-set we use a mutex instead of a semaphore for serializing the handshakes,
we thus get into lock ranks asserts.

The CLD metaspace lock cannot be pushed down but we can use the same lock as for creating jmethod ids: JmethodIdCreation_lock.
And push that down. (special-2 is picked to be compatible with W.I.P. asynchronous handshake change-set)

The reason for CLD metaspace lock being used now is that we have one per CLD instead of one global one.

Testing passes: t1-3

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8252794: Creation of JNIMethodBlock should be done with a leaf lock

Reviewers

Coleen Phillimore (@coleenp - Reviewer) ⚠️ Review applies to ec4eb40
David Holmes (@dholmes-ora - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jdk pull/53/head:pull/53
$ git checkout pull/53

bridgekeeper · 2020-09-07T12:17:32Z

👋 Welcome back rehn! 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 · 2020-09-07T12:18:29Z

@robehn The following label will be automatically applied to this pull request: hotspot.

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 (add|remove) "label" command.

mlbridge · 2020-09-07T12:21:57Z

Webrevs

01: Full - Incremental (0ca8c6c)
00: Full (ec4eb40)

openjdk · 2020-09-08T15:39:18Z

@robehn This change now passes all automated pre-integration checks. In addition to the automated checks, the change must also fulfill all project specific requirements

After integration, the commit message will be:

8252794: Creation of JNIMethodBlock should be done with a leaf lock

Reviewed-by: coleenp, dholmes

If you would like to add a summary, use the /summary command.
To credit additional contributors, use the /contributor command.
To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there have been 25 commits pushed to the master branch:

5fef8dd: 8235229: Compilation against a modular, multi-release JAR erroneous with --release
382b8fe: 8240751: Shenandoah: fold ShenandoahTracer definition
c98417e: 8250840: some tests use --enable-preview unnecessarily
c655b70: 8252916: Newline in object field values list of ScopeDesc should be removed
30fa8d5: 8157729: examples in LinkedHashMap and LinkedHashSet class doc use raw types
26c7218: 8252773: [TESTBUG] serviceability/jvmti/GetObjectSizeOverflow fails due to OOM conditions
e20004d: 8249625: cleanup unused SkippedException in the tests under cds/appcds/dynamicArchive/methodHandles
63a5a12: 8252658: G1: Do not consider G1HeapWastePercent during region selection within a gc
001e51d: 8250563: Add KVHashtable::add_if_absent
91a20ca: 8252695: Shenandoah: clean up Graal enabled/disabled filter in tests
... and 15 more: https://git.openjdk.java.net/jdk/compare/cc5039e19e38c60b037eaab8fc42c0e77296d8a0...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 5fef8ddaffb37e76abc0b3a4bde1d325439b29bc.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

dholmes-ora

The locking strategy in this code is somewhat unclear.

src/hotspot/share/oops/method.cpp

dholmes-ora

Update is good.

robehn · 2020-09-09T13:19:26Z

Update is good.

Thank you. As the update was trivial I'll go head and integrate.

robehn · 2020-09-09T13:20:34Z

/integrate

openjdk · 2020-09-09T13:21:11Z

@robehn Since your change was applied there have been 25 commits pushed to the master branch:

5fef8dd: 8235229: Compilation against a modular, multi-release JAR erroneous with --release
382b8fe: 8240751: Shenandoah: fold ShenandoahTracer definition
c98417e: 8250840: some tests use --enable-preview unnecessarily
c655b70: 8252916: Newline in object field values list of ScopeDesc should be removed
30fa8d5: 8157729: examples in LinkedHashMap and LinkedHashSet class doc use raw types
26c7218: 8252773: [TESTBUG] serviceability/jvmti/GetObjectSizeOverflow fails due to OOM conditions
e20004d: 8249625: cleanup unused SkippedException in the tests under cds/appcds/dynamicArchive/methodHandles
63a5a12: 8252658: G1: Do not consider G1HeapWastePercent during region selection within a gc
001e51d: 8250563: Add KVHashtable::add_if_absent
91a20ca: 8252695: Shenandoah: clean up Graal enabled/disabled filter in tests
... and 15 more: https://git.openjdk.java.net/jdk/compare/cc5039e19e38c60b037eaab8fc42c0e77296d8a0...master

Your commit was automatically rebased without conflicts.

Pushed as commit d560964.

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

…jdk#53) Co-authored-by: Xin Liu <xxinliu@amazon.com>

* Update rivos/gitlab-ci.yml file * 8294241: Deprecate URL public constructors Reviewed-by: joehw, prr, alanb, aefimov, michaelm Co-authored-by: Daniel Fuchs <dfuchs@openjdk.org>

* Update LICENSE file * The experimental version is aimed to refactor the tool * verificationType mistakenly added to source code is renamed to type * Adapted mvn bindings to at8 * Added tests to represent bad stream handling in jdec and correctone in jdis * Made jdec to write output to proper toolOutput instead of bad logOutput * 7903208: [Jasm] Add support for generics (the Signature attribute) * 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs * Replaced hardcoded String[] args, by varargs String... where reasonable Once the "tool" mandatory array memebr was removed from each tool's main method, and considering calls from libraries, and form tests where the argument is very often just one file, or more readable "a1", a2"... without new String[]{} declaration, changed those String[] enforcing headers to more benevolent String... * Intentionally removed ACC_SUPER class modifier was causing hotswap to fail When jasm's disasm, modify, asm cycle output binary was used for class hotswap, remote JDK was not accepting it with java.lang.UnsupportedOperationException: class redefinition failed: attempted to change the class modifiers beacuse of ommited supoer keyword (although it have already no real reason) This patch is returning the kwyword without conditions, when it was included in original bytecode * extended test to verify that super is not used always if super is not in source code, then it is not in disambled code * 7903248: jasm: FieldData.ConstantValue holds undefined reference to CP while writing fields to a class * Added support for stdin in jdis * stdin is now read also by jasm,jcod,jdec more tests needed * Removed jdis specific missleading provide method * Tool output moved where it belongs to commons * Removed duplicated declaration of ArrayList<ToolInput> fileList * Changed requireNonNull message in getDataInputStream * Added one more abstraction layer providing highly reusable byte[] based input * Properly exiting after verson is printed * Stream based inputs are now drained once needed, not during construction * reworked stdin read to be initiated by - As a side effect, files and stdin can be read together remove dduplicated code in tests by getting class in compile time added tests and adapted older to new behavior * added tests if asmtools assmble itself into valid bytecode Added two set of tests jdec->jcoder->load jdis->jasm->load Both in two variants, with -g, and without Both jdec->jcoder->load works fine Both jdis->jasm->load now fails on three files from 278: /org/openjdk/asmtools/jasm/JasmEnvironment$InputFile.class, /org/openjdk/asmtools/jcoder/Jcoder.class, /org/openjdk/asmtools/jasm/Parser.class Fail looks valid. Unluckily, the issue where -g disassembled and back assembled com.google.gson.Gson produce invalid bytecode was not hit The class BruteForceHelper is reusable for any set of classes * Naive fix for enforced dot.suffix * repalce stdout by configurable object This checkout is not buildable, but server as showcase for issue with dual logging for compilers * Replaced dualstream logger by wrapper so it can be later made fully customisable * Enabled shared i18n properties via reused asmtools/i18n.props * All four tools now use neww ToolOutput output As a consequence, all four tools by by default prints to stdout, and honours -d properly * Fixed typo which casued behavior regression found by unittests * Refatoed tests so they can harbour resources in maven way * Moved all logging to stderr. use -dls to return original behavior The -dls switch is oging to be removed once stderr is properl adapted * Implemented library-like input and output This commit is adding byte[]/String input/output clasases for direct library usage. Added tests, advertising how simple is usage of those inputs/outputs There are two hunks, which fixes issues ovberlooked in previous refactorings: - traceln now correctly calls getOutputs - jdec now uses proper logger insted of accidental stderr * Enabled -g for jcoder to be set from external code * Temporary workaround around tests being order-sensitive As -g is now making some disassmebld code not asemble-able back, and order of tests is not deterministic, and Options are static, thus if -g is now set in some test, it is not unset in other tests. Real fix is to move Options out of static context to context of environment as it is done for jcoder. * Added github actions Just for record for "act" for local testing. To run with podman based distros, several steps are ncessary. See nektos/act#303 ; especially * nektos/act#303 (comment) * and nektos/act#303 (comment) * the bind and socket eg: systemctl enable --now --user podman.socket systemctl start --user podman.socket export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/podman/podman.sock ../act/bin/act --bind --container-daemon-socket $XDG_RUNTIME_DIR/podman/podman.sock To rerun the build on clean env, you have to stop and start the podman socket again Without explicit 'mvn test' the tests are not running. Not sure why * 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs * Fixed issue when jasm produced only one file from source with multiple ones Added tests for this issue Added test veryfying that the jcoder is not affected * 7903401: jtreg fails if set of jdk tests process jasm,jdis files with defects * 7903402: jdis: tool writes incorrect StackMapTable if the first same_frame has type 0 (openjdk#51) * 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs * 7903401: jtreg fails if set of jdk tests process jasm,jdis files with defects * 7903402: jdis: tool writes incorrect StackMapTable if the first same_frame has type 0 * 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs * Refactored new ToolInput/Outputs so they reside in own packages and not in original interfaces (openjdk#53) * Refactored new ToolInput/Outputs so they reside in own packages and not in original interfaces * Removed unused imports * Added licence headers * Added ajvadoc description to three main interfaces. * Removed unnecessary guard condition before changging \ to / for fqn * Replaced "\n" by System.lineSeparator() * Used better names for highlighted abbrevations * 7903405: compiler does not warn about instruction arguments that exceed allowed limits (openjdk#54) * 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs * 7903401: jtreg fails if set of jdk tests process jasm,jdis files with defects * 7903402: jdis: tool writes incorrect StackMapTable if the first same_frame has type 0 * 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs * 7903405: compiler does not warn about instruction arguments that exceed allowed limits * 7903405: compiler does not warn about instruction arguments that exceed allowed limits * Delete ToolOutput.java * Fixed junit test for CODETOOLS-7903405 (openjdk#56) * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 (openjdk#57) * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * Fix tabs * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 (Part II) (openjdk#58) * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * Fix tabs * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * CODETOOLS-7903506: Asmtools: jdis prints BootstrapMethod attribute if detailed output is off (openjdk#59) * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * Fix tabs * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * 7903506: Asmtools: jdis prints BootstrapMethod attribute if detailed output is off * 7903509: jcoder, jasm: add option to override class file version in source file(s) (openjdk#60) * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * Fix tabs * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * 7903509: jcoder, jasm: add option to override class file version in source file(s) * CODETOOLS-7903531: jdis: Suppress printing comments by adding an option (openjdk#61) * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * Fix tabs * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * 7903531: jdis: Suppress printing comments by adding an option --------- Co-authored-by: Jiri Vanek <jvanek@redhat.com>

Changed and pushed down

ec4eb40

openjdk bot added the rfr Pull request is ready for review label Sep 7, 2020

openjdk bot added the hotspot hotspot-dev@openjdk.org label Sep 7, 2020

coleenp approved these changes Sep 8, 2020

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Sep 8, 2020

dholmes-ora suggested changes Sep 9, 2020

View reviewed changes

src/hotspot/share/oops/method.cpp Show resolved Hide resolved

src/hotspot/share/oops/method.cpp Show resolved Hide resolved

Corrected comment

0ca8c6c

dholmes-ora approved these changes Sep 9, 2020

View reviewed changes

openjdk bot closed this Sep 9, 2020

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 9, 2020

robehn deleted the 8252794-jmethodid-lock branch September 9, 2020 13:24

caojoshua pushed a commit to caojoshua/jdk that referenced this pull request Jul 13, 2023

JVM-2055: PEA spot 'failed: method signature required' in jtreg (open…

c75f6a2

…jdk#53) Co-authored-by: Xin Liu <xxinliu@amazon.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8252794: Creation of JNIMethodBlock should be done with a leaf lock #53

8252794: Creation of JNIMethodBlock should be done with a leaf lock #53

Uh oh!

robehn commented Sep 7, 2020 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Sep 7, 2020

Uh oh!

openjdk bot commented Sep 7, 2020

Uh oh!

mlbridge bot commented Sep 7, 2020 •

edited

Loading

Uh oh!

openjdk bot commented Sep 8, 2020 •

edited

Loading

Uh oh!

dholmes-ora left a comment

Uh oh!

Uh oh!

Uh oh!

dholmes-ora left a comment

Uh oh!

robehn commented Sep 9, 2020

Uh oh!

robehn commented Sep 9, 2020

Uh oh!

openjdk bot commented Sep 9, 2020

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

8252794: Creation of JNIMethodBlock should be done with a leaf lock #53

8252794: Creation of JNIMethodBlock should be done with a leaf lock #53

Uh oh!

Conversation

robehn commented Sep 7, 2020 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Download

Uh oh!

bridgekeeper bot commented Sep 7, 2020

Uh oh!

openjdk bot commented Sep 7, 2020

Uh oh!

mlbridge bot commented Sep 7, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

openjdk bot commented Sep 8, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dholmes-ora left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

dholmes-ora left a comment

Choose a reason for hiding this comment

Uh oh!

robehn commented Sep 9, 2020

Uh oh!

robehn commented Sep 9, 2020

Uh oh!

openjdk bot commented Sep 9, 2020

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

robehn commented Sep 7, 2020 •

edited by openjdk bot

Loading

mlbridge bot commented Sep 7, 2020 •

edited

Loading

openjdk bot commented Sep 8, 2020 •

edited

Loading