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

8292694: x86_64 c2i/i2c adapters may use more stack space than necessary #10034

Closed
wants to merge 2 commits into from

Conversation

dean-long
Copy link
Member

@dean-long dean-long commented Aug 26, 2022

The c2i adapter includes the return address in the alignment calculation, making %rsp always mis-aligned according to the ABI.

The i2c adapter aligns "extrawords" even though %rsp is aligned later, and the incoming stack is not guaranteed to be aligned.


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

  • JDK-8292694: x86_64 c2i/i2c adapters may use more stack space than necessary

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/10034/head:pull/10034
$ git checkout pull/10034

Update a local copy of the PR:
$ git checkout pull/10034
$ git pull https://git.openjdk.org/jdk pull/10034/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10034

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10034.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 26, 2022

👋 Welcome back dlong! 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 8292694: x86_64 c2i/i2c adapters may use more stack space than necessary 8292694: x86_64 c2i/i2c adapters may use more stack space than necessary Aug 26, 2022
@dean-long
Copy link
Member Author

/cc hotspot-compiler hotspot-runtime hotspot

@openjdk openjdk bot added rfr Pull request is ready for review hotspot-compiler hotspot-compiler-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org hotspot hotspot-dev@openjdk.org labels Aug 26, 2022
@openjdk
Copy link

openjdk bot commented Aug 26, 2022

@dean-long
The hotspot-compiler label was successfully added.

The hotspot-runtime label was successfully added.

The hotspot label was successfully added.

@mlbridge
Copy link

mlbridge bot commented Aug 26, 2022

Webrevs

Copy link
Contributor

@vnkozlov vnkozlov 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 to me.

@openjdk
Copy link

openjdk bot commented Aug 26, 2022

@dean-long 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:

8292694: x86_64 c2i/i2c adapters may use more stack space than necessary

Reviewed-by: kvn, thartmann

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:

  • a476ec5: 8292983: ModuleReferenceImpl.computeHash should record algorithm for cache checks
  • 99cab6a: 8292911: Add a note about jtreg failure handlers in the testing doc
  • f6b6360: 8289949: Improve test coverage for XPath: operators
  • b0e0b87: 8292917: [JVMCI] Extend InstalledCode API to make an nmethod non entrant.
  • 1500d3d: 8292994: ProblemList vmTestbase/gc/lock/jni/jnilock001/TestDescription.java
  • 4e457ac: 8291760: PipelineLeaksFD.java still fails: More or fewer pipes than expected
  • 774edeb: 8271615: vmTestbase/vm/jit/LongTransitions/ test fail due to locale mismatch
  • 9a0d1e7: 8292541: [Metrics] Reported memory limit may exceed physical machine memory
  • c74b6d4: 8292562: (fc) Use copy_file_range in FileChannel::transferTo on Linux
  • 3844685: 8292697: ZGC: Hangs when almost out of metaspace memory
  • ... and 5 more: https://git.openjdk.org/jdk/compare/3e187730162965981a5e6d238935e46d1015708e...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 Aug 26, 2022
@dean-long
Copy link
Member Author

Thanks Vladimir.

@dean-long
Copy link
Member Author

I included generate_Continuation_doYield_entry() changes by mistake. I will revert those.

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Yes, I was wandering about generate_Continuation_doYield_entry().

Looks good.

Copy link
Member

@TobiHartmann TobiHartmann 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.

@dean-long
Copy link
Member Author

Thanks Tobias.

@dean-long
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 29, 2022

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

  • 30def49: 8292769: [JVMCI] OutOfMemoryError thrown when attaching the libgraal isolate causes HotSpot to crash.
  • a88a9e3: 8291466: C2: assert(false) failed: infinite loop in PhaseIterGVN::transform_old with -XX:+StressIGVN
  • d5167a9: 7189422: [macosx] Submenu's arrow have a wrong position
  • 512fee1: 8292972: Initialize fields if CodeBlobIterator shortcuts without heaps
  • a476ec5: 8292983: ModuleReferenceImpl.computeHash should record algorithm for cache checks
  • 99cab6a: 8292911: Add a note about jtreg failure handlers in the testing doc
  • f6b6360: 8289949: Improve test coverage for XPath: operators
  • b0e0b87: 8292917: [JVMCI] Extend InstalledCode API to make an nmethod non entrant.
  • 1500d3d: 8292994: ProblemList vmTestbase/gc/lock/jni/jnilock001/TestDescription.java
  • 4e457ac: 8291760: PipelineLeaksFD.java still fails: More or fewer pipes than expected
  • ... and 9 more: https://git.openjdk.org/jdk/compare/3e187730162965981a5e6d238935e46d1015708e...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 29, 2022

@dean-long Pushed as commit adb3d4f.

💡 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
Labels
hotspot hotspot-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
3 participants