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

8271490: [ppc] [s390]: Crash in JavaThread::pd_get_top_frame_for_profiling #333

Closed
wants to merge 1 commit into from

Conversation

RealLucy
Copy link
Contributor

@RealLucy RealLucy commented Sep 13, 2021

Please review this backport PR.

The original change did not apply cleanly for three minor reasons (frame_ppc.cpp and frame_s390.cpp):

  • The stack range check function is_in_stack_range_excl() does not exist in jdk11. Explicit code used instead.
  • Some rephrased comment.
  • Reusing a boolean value instead of recalculating it.

Crashes attributable to code fixed with this patch are observed in jdk11 jfr tests.


Progress

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

Issue

  • JDK-8271490: [ppc] [s390]: Crash in JavaThread::pd_get_top_frame_for_profiling

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/333/head:pull/333
$ git checkout pull/333

Update a local copy of the PR:
$ git checkout pull/333
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/333/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 333

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/333.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 13, 2021

👋 Welcome back lucy! 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 276b07b36af01d339e48baada7a512451fe34afe 8271490: [ppc] [s390]: Crash in JavaThread::pd_get_top_frame_for_profiling Sep 13, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 13, 2021

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

@openjdk openjdk bot added backport rfr labels Sep 13, 2021
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

LGTM.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 13, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Sep 13, 2021

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

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

8271490: [ppc] [s390]: Crash in JavaThread::pd_get_top_frame_for_profiling

Reviewed-by: mdoerr

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

  • 9437d45: 8252049: Native memory leak in ciMethodData ctor
  • 3319efb: 8268672: C2: assert(!loop->is_member(u_loop)) failed: can be in outer loop or out of both loops only
  • 87299f3: 8268019: C2: assert(no_dead_loop) failed: dead loop detected
  • 625690e: 8263303: C2 compilation fails with assert(found_sfpt) failed: no node in loop that's not input to safepoint
  • 977ca31: 8273671: Backport of 8260616 misses one JNF header inclusion removal
  • 59f0ea3: 8213301: Fix legal headers in jdk logging tests
  • dc43ace: 8213328: Update test copyrights in test/java/util/zip and test/jdk/tools
  • 1d09112: 8213306: Fix legal headers in test/java/nio
  • 97d37b8: 8213305: Fix legal headers in test/java/math
  • 77bbf1e: 8213296: Fix legal headers in test/jdk/java/net
  • ... and 4 more: https://git.openjdk.java.net/jdk11u-dev/compare/126f1a29e2a625136b986f8fda738c16c312ed9b...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 (@TheRealMDoerr) 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 openjdk bot added the ready label Sep 13, 2021
@RealLucy
Copy link
Contributor Author

@RealLucy RealLucy commented Sep 13, 2021

Thank you, Martin, for the review.

@RealLucy
Copy link
Contributor Author

@RealLucy RealLucy commented Sep 15, 2021

Finally, tests on linuxppcle and linuxs390 ran. No issues detected. Ready to integrate.

@RealLucy
Copy link
Contributor Author

@RealLucy RealLucy commented Sep 15, 2021

/integrate

@openjdk openjdk bot added the sponsor label Sep 15, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 15, 2021

@RealLucy
Your change (at version 322322c) is now ready to be sponsored by a Committer.

@TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Sep 15, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Sep 15, 2021

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

  • 9437d45: 8252049: Native memory leak in ciMethodData ctor
  • 3319efb: 8268672: C2: assert(!loop->is_member(u_loop)) failed: can be in outer loop or out of both loops only
  • 87299f3: 8268019: C2: assert(no_dead_loop) failed: dead loop detected
  • 625690e: 8263303: C2 compilation fails with assert(found_sfpt) failed: no node in loop that's not input to safepoint
  • 977ca31: 8273671: Backport of 8260616 misses one JNF header inclusion removal
  • 59f0ea3: 8213301: Fix legal headers in jdk logging tests
  • dc43ace: 8213328: Update test copyrights in test/java/util/zip and test/jdk/tools
  • 1d09112: 8213306: Fix legal headers in test/java/nio
  • 97d37b8: 8213305: Fix legal headers in test/java/math
  • 77bbf1e: 8213296: Fix legal headers in test/jdk/java/net
  • ... and 4 more: https://git.openjdk.java.net/jdk11u-dev/compare/126f1a29e2a625136b986f8fda738c16c312ed9b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 15, 2021
@openjdk openjdk bot added integrated and removed ready rfr sponsor labels Sep 15, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 15, 2021

@TheRealMDoerr @RealLucy Pushed as commit 579fbcb.

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

@RealLucy
Copy link
Contributor Author

@RealLucy RealLucy commented Sep 15, 2021

Thank you for sponsoring, Martin!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated
2 participants