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

8274501: c2i entry barriers read int as long on AArch64 #5754

Closed
wants to merge 1 commit into from

Conversation

fisk
Copy link
Contributor

@fisk fisk commented Sep 29, 2021

There was a bug in the x86_64 implementation of the c2i entry barriers. We read the CLD::_keep_alive int as a 64 bit integer, while it is of course in fact a 32 bit integer. It was fixed in the patch that ported it to x86_32 (JDK-8235262). However, somewhere in-between I think the wrong code was used as a basis for the AArch64 implementation, which now seemingly has inherited that same bug.


Progress

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

Issue

  • JDK-8274501: c2i entry barriers read int as long on AArch64

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5754/head:pull/5754
$ git checkout pull/5754

Update a local copy of the PR:
$ git checkout pull/5754
$ git pull https://git.openjdk.java.net/jdk pull/5754/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5754

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5754.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 29, 2021

👋 Welcome back eosterlund! 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 Pull request is ready for review label Sep 29, 2021
@openjdk
Copy link

openjdk bot commented Sep 29, 2021

@fisk 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 hotspot-dev@openjdk.org label Sep 29, 2021
@mlbridge
Copy link

mlbridge bot commented Sep 29, 2021

Webrevs

Copy link
Member

@shipilev shipilev left a comment

Looks good!

I suspect PPC has the same problem, @TheRealMDoerr, @GoeLin?

@openjdk
Copy link

openjdk bot commented Sep 29, 2021

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

8274501: c2i entry barriers read int as long on AArch64

Reviewed-by: shade, kbarrett, aph

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:

  • 94e31e5: 8274506: TestPids.java and TestPidsLimit.java fail with podman run as root
  • a8210c5: 8274401: C2: GraphKit::load_array_element bypasses Access API
  • dfc557c: 8274406: RunThese30M.java failed "assert(!LCA_orig->dominates(pred_block) || early->dominates(pred_block)) failed: early is high enough"
  • c0533ef: 8274522: java/lang/management/ManagementFactory/MXBeanException.java test fails with Shenandoah
  • f8415a9: 8274523: java/lang/management/MemoryMXBean/MemoryTest.java test should handle Shenandoah
  • 355356c: 8273435: Remove redundant zero-length check in ClassDesc.of
  • 97385d4: 8274405: Suppress warnings on non-serializable non-transient instance fields in javac and javadoc
  • 79cebe2: 8274050: Unnecessary Vector usage in javax.crypto
  • 97b2874: 8274509: Remove stray * and stylistic . from doc comments
  • b1b6696: 8274453: (sctp) com/sun/nio/sctp/SctpChannel/CloseDescriptors.java test should be resilient to lsof warnings
  • ... and 4 more: https://git.openjdk.java.net/jdk/compare/c4d115701d102c33af937ca25dda8ac50117ac6b...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 Sep 29, 2021
@fisk
Copy link
Contributor Author

fisk commented Sep 29, 2021

Looks good!

I suspect PPC has the same problem, @TheRealMDoerr, @GoeLin?

Thanks Aleksey!

Copy link

@kimbarrett kimbarrett left a comment

Looks good.

@fisk
Copy link
Contributor Author

fisk commented Sep 30, 2021

Looks good.

Thanks, Kim.

@shipilev
Copy link
Member

shipilev commented Sep 30, 2021

Submitted JDK-8274550 for the suspect PPC problem.

@fisk
Copy link
Contributor Author

fisk commented Sep 30, 2021

Thanks everyone.
/integrate

@openjdk
Copy link

openjdk bot commented Sep 30, 2021

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

  • c57ed22: 8274528: Add comment to explain an HKDF optimization in SSLSecretDerivation
  • 9180d9a: 8273216: JCMD does not work across container boundaries with Podman
  • 3e0d7c3: 8270290: NTLM authentication fails if HEAD request is used
  • bfd6163: 8274196: Crashes in VM_HeapDumper::work after JDK-8252842
  • bb95dda: 8248001: javadoc generates invalid HTML pages whose ftp:// links are broken
  • 2f955d6: 8273142: Remove dependancy of TestHttpServer, HttpTransaction, HttpCallback from open/test/jdk/sun/net/www/protocol/http/ tests
  • 94e31e5: 8274506: TestPids.java and TestPidsLimit.java fail with podman run as root
  • a8210c5: 8274401: C2: GraphKit::load_array_element bypasses Access API
  • dfc557c: 8274406: RunThese30M.java failed "assert(!LCA_orig->dominates(pred_block) || early->dominates(pred_block)) failed: early is high enough"
  • c0533ef: 8274522: java/lang/management/ManagementFactory/MXBeanException.java test fails with Shenandoah
  • ... and 10 more: https://git.openjdk.java.net/jdk/compare/c4d115701d102c33af937ca25dda8ac50117ac6b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 30, 2021
@openjdk 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 30, 2021
@openjdk
Copy link

openjdk bot commented Sep 30, 2021

@fisk Pushed as commit f08180f.

💡 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 integrated Pull request has been integrated
4 participants