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.

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

8233343: Deprecate -XX:+CriticalJNINatives flag which implements JavaCritical native functions #764

Closed
wants to merge 3 commits into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Oct 20, 2020

This change deprecates the -XX:+CriticalJNINatives flag and removes the develop flag -XX:+StressCriticalJNINatives. See CSR for more details.

This change also removes the lazy GC lock in the critical native transition, and runs the critical native function as thread_in_Java. I add a safepoint check at the end of the native function and transition to native and poll again for the safepoint after the function if a safepoint is requested.

Tested with tier 1-6 (we have a few tests that use this). And built on linux-x86-open,linux-s390x-open,linux-arm32-debug,linux-ppc64le-debug.


Progress

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

Testing

Linux x64 Windows x64 macOS x64
Build ✔️ (5/5 passed) ✔️ (2/2 passed) ✔️ (2/2 passed)
Test (tier1) ✔️ (9/9 passed) (1/9 failed) ✔️ (9/9 passed)

Failed test task

Issue

  • JDK-8233343: Deprecate -XX:+CriticalJNINatives flag which implements JavaCritical native functions

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 20, 2020

👋 Welcome back coleenp! 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 added the rfr label Oct 20, 2020
@openjdk
Copy link

openjdk bot commented Oct 20, 2020

@coleenp 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 pull request command.

@openjdk openjdk bot added the hotspot label Oct 20, 2020
@mlbridge
Copy link

mlbridge bot commented Oct 20, 2020

Webrevs

robehn
robehn approved these changes Oct 20, 2020
Copy link
Contributor

@robehn robehn left a comment

Thanks you @coleenp!
Looks good, really nice delta of -800 LOC !

@TheRealMDoerr
Copy link
Contributor

TheRealMDoerr commented Oct 20, 2020

Makes sense to me. But I have a couple of remarks/suggestions:

  • Object pinning for T_ARRAY on x86 shouldn't be needed any more since we stay in _thread_in_Java
  • Transition to _thread_in_native is pointless if we transition to _thread_in_native_trans immediately afterwards
  • I think the tests should also run on os.arch=="ppc64" | os.arch=="ppc64le" | os.arch=="s390x", but we should double-check if they really work
    Thanks for taking care of all platforms!

@coleenp
Copy link
Contributor Author

coleenp commented Oct 20, 2020

@TheRealMDoerr Thank you for reviewing this and your comments.

  • yes, I can remove object pinning since it's no longer needed.
  • The transition to native is pointless but I was a bit unnerved from going from _thread_in_Java to _thread_in_native_trans even though there's no consistency checks to show it's an illegal transition. On the other hand, the dummy transition to native isn't nice either so I'll make this change and retest.
  • I can't test with ppc or s390 but can you modify the requires in the two tests in this patch and let me know if it works?

@zhengyu123
Copy link
Contributor

zhengyu123 commented Oct 21, 2020

@TheRealMDoerr Thank you for reviewing this and your comments.

  • yes, I can remove object pinning since it's no longer needed.
  • The transition to native is pointless but I was a bit unnerved from going from _thread_in_Java to _thread_in_native_trans even though there's no consistency checks to show it's an illegal transition. On the other hand, the dummy transition to native isn't nice either so I'll make this change and retest.
  • I can't test with ppc or s390 but can you modify the requires in the two tests in this patch and let me know if it works?

Agree, object pinning is no longer needed for critical native in Shenandoah.

src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Looks good. Thanks!

@coleenp coleenp changed the title 8233343: Deprecate -XX:+CriticalJNINatives flag which implements Java… Deprecate -XX:+CriticalJNINatives flag which implements JavaCritical native functions Oct 21, 2020
@openjdk openjdk bot removed the rfr label Oct 21, 2020
@coleenp coleenp changed the title Deprecate -XX:+CriticalJNINatives flag which implements JavaCritical native functions 8233343: Deprecate -XX:+CriticalJNINatives flag which implements JavaCritical native functions Oct 21, 2020
@openjdk
Copy link

openjdk bot commented Oct 21, 2020

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

8233343: Deprecate -XX:+CriticalJNINatives flag which implements JavaCritical native functions

Reviewed-by: rehn, mdoerr, zgu

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

  • 615b759: 8255070: Shenandoah: Use single thread for concurrent CLD liveness test
  • 6020991: 8255068: [JVMCI] errors during compiler creation can be hidden
  • 8d9e6d0: 8255041: Zero: remove old JSR 292 support leftovers
  • 0efdde1: 8238669: Long.divideUnsigned is extremely slow for certain values (Needs to be Intrinsic)
  • 365f19c: 8254790: SIGSEGV in string_indexof_char and stringL_indexof_char intrinsics
  • f813a28: 8254692: (se) Clarify the behaviour of the non-abstract SelectorProvider::inheritedChannel
  • c9269bf: 8255036: Shenandoah: Reset GC state for root verifier
  • 839f01d: 8242068: Signed JAR support for RSASSA-PSS and EdDSA
  • e559bd2: 8254889: name_and_sig_as_C_string usages in frame coding without ResourceMark
  • da97ab5: 8253474: Javadoc clean up in HttpsExchange, HttpsParameters, and HttpsServer
  • ... and 67 more: https://git.openjdk.java.net/jdk/compare/14e1e1741f6be123db4336805325ccab8d8c81a4...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 ready rfr labels Oct 21, 2020
@coleenp
Copy link
Contributor Author

coleenp commented Oct 21, 2020

Thank you for the code reviews!
/integrate

@openjdk openjdk bot closed this Oct 21, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 21, 2020
@openjdk
Copy link

openjdk bot commented Oct 21, 2020

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

  • 615b759: 8255070: Shenandoah: Use single thread for concurrent CLD liveness test
  • 6020991: 8255068: [JVMCI] errors during compiler creation can be hidden
  • 8d9e6d0: 8255041: Zero: remove old JSR 292 support leftovers
  • 0efdde1: 8238669: Long.divideUnsigned is extremely slow for certain values (Needs to be Intrinsic)
  • 365f19c: 8254790: SIGSEGV in string_indexof_char and stringL_indexof_char intrinsics
  • f813a28: 8254692: (se) Clarify the behaviour of the non-abstract SelectorProvider::inheritedChannel
  • c9269bf: 8255036: Shenandoah: Reset GC state for root verifier
  • 839f01d: 8242068: Signed JAR support for RSASSA-PSS and EdDSA
  • e559bd2: 8254889: name_and_sig_as_C_string usages in frame coding without ResourceMark
  • da97ab5: 8253474: Javadoc clean up in HttpsExchange, HttpsParameters, and HttpsServer
  • ... and 67 more: https://git.openjdk.java.net/jdk/compare/14e1e1741f6be123db4336805325ccab8d8c81a4...master

Your commit was automatically rebased without conflicts.

Pushed as commit 56ea490.

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

@coleenp coleenp deleted the cnative branch Oct 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot integrated
4 participants