8274730: AArch64: AES/GCM acceleration is broken by the fix for JDK-8273297 #5819

theRealAph · 2021-10-05T09:58:38Z

The recent AES/GCM acceleration on AArch64 was broken by https://bugs.openjdk.java.net/browse/JDK-8273297 . This was entirely expected, and I approved the patch, but now we must make AArch64 acceleration work again.
The only significant change from the point of view of this patch is that one argument was added to the call to the intrinsic, and that argument caused another argument to spill onto the stack.

Progress

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

Issue

JDK-8274730: AArch64: AES/GCM acceleration is broken by the fix for JDK-8273297

Reviewers

Andrew Dinn (@adinn - Reviewer) ⚠️ Review applies to adfcc75
Roland Westrelin (@rwestrel - Reviewer) ⚠️ Review applies to adfcc75
Vladimir Kozlov (@vnkozlov - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5819

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

Using diff file

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

The text was updated successfully, but these errors were encountered:

…273297

bridgekeeper · 2021-10-05T09:59:05Z

👋 Welcome back aph! 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 · 2021-10-05T10:00:41Z

@theRealAph The following label will be automatically applied to this pull request:

hotspot-compiler

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.

mlbridge · 2021-10-05T10:05:23Z

Webrevs

01: Full - Incremental (89e4655b)
00: Full (adfcc75c)

adinn

Changes look good.

openjdk · 2021-10-05T11:08:39Z

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

8274730: AArch64: AES/GCM acceleration is broken by the fix for JDK-8273297

Reviewed-by: adinn, roland, kvn

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

1e75203: 8274656: Remove default_checksum and safe_checksum_type from krb5.conf
03d3c03: 8273670: Remove weak etypes from default krb5 etype list
c391e59: 8274244: ReportOnImportedModuleAnnotation.java fails on rerun
3789065: 8274397: [macOS] Stop setting env. var JAVA_MAIN_CLASS_ in launcher code
e1f0df0: 8267853: Remove unused styles from stylesheet
4e3948f: 8274744: TestSnippetTag test fails after recent integration
92b64a2: 8273745: VerifyLocale.java occasionally times out
90a5ae8: 8274282: Clarify special wait assert
bb0bab5: 8274286: Skip null for make_referent_alive in referenceProcessor
7ad74d8: 8274299: Make Method/Constructor/Field accessors @stable
... and 17 more: https://git.openjdk.java.net/jdk/compare/7eb0372e55f23275b12470593adc97f1b79bc965...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.

rwestrel

c2 change looks good to me.

vnkozlov

Looks good with just 2 small comments.
I will test changes and approve it after that.

vnkozlov · 2021-10-05T16:10:48Z

src/hotspot/share/opto/library_call.cpp

+    subkeyHtbl_48_entries_start
+      = array_element_address(subkeyHtbl_48_entries, intcon(0), T_LONG);


Please, don't split such line.

vnkozlov · 2021-10-05T16:10:48Z

src/hotspot/share/opto/library_call.cpp

@@ -6794,14 +6794,20 @@ bool LibraryCallKit::inline_galoisCounterMode_AESCrypt() {
  ciKlass* klass = ciTypeArrayKlass::make(T_LONG);
  Node* klass_node = makecon(TypeKlassPtr::make(klass));

-  // htbl entries is set to 96 only fox x86-64
+  // Does this target support this intrinsic?
  if (Matcher::htbl_entries == -1) return false;

  // new array to hold 48 computed htbl entries


Move this comment under (Matcher::htbl_entries != 0) check.

vnkozlov

Good. And my testing passed.

theRealAph · 2021-10-06T08:17:23Z

/integrate

openjdk · 2021-10-06T08:18:20Z

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

2faced0: 8274738: ZGC: Use relaxed atomic load when reading bits in the live map
8a4d2b4: 8274680: Remove unnecessary conversion to String in java.desktop
986ee5d: 8274670: Improve version string handling in SA
df7b0c7: 8274715: Implement forEach in Collections.CopiesList
d4e8712: 8274797: ProblemList resourcehogs/serviceability/sa/TestHeapDumpForLargeArray.java on macosx-x64
4726267: 8274642: jdk/jshell/CommandCompletionTest.java fails with NoSuchElementException after JDK-8271287
83b2219: 8273612: Fix for JDK-8272873 causes timeout in running some tests with -Xcomp
d34ec6c: 8274793: Suppress warnings on non-serializable non-transient instance fields in sun.net
332f067: 8274729: Define Position.NOPOS == Diagnostic.NOPOS
1e75203: 8274656: Remove default_checksum and safe_checksum_type from krb5.conf
... and 26 more: https://git.openjdk.java.net/jdk/compare/7eb0372e55f23275b12470593adc97f1b79bc965...master

Your commit was automatically rebased without conflicts.

openjdk · 2021-10-06T08:18:35Z

@theRealAph Pushed as commit c74726d.

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

8274730: AArch64: AES/GCM acceleration is broken by the fix for JDK-8…

adfcc75

…273297

openjdk bot added the rfr label Oct 5, 2021

openjdk bot added the hotspot-compiler label Oct 5, 2021

adinn approved these changes Oct 5, 2021

View changes

openjdk bot added the ready label Oct 5, 2021

rwestrel approved these changes Oct 5, 2021

View changes

vnkozlov reviewed Oct 5, 2021

View changes

Cleanup, no functional change.

89e4655

vnkozlov approved these changes Oct 5, 2021

View changes

openjdk bot closed this Oct 6, 2021

openjdk bot added integrated and removed ready rfr labels Oct 6, 2021

schlosna mentioned this pull request Nov 9, 2021

Expand EncryptionBenchmark palantir/hadoop-crypto#586

Open

openjdk / jdk Public

8274730: AArch64: AES/GCM acceleration is broken by the fix for JDK-8273297 #5819

8274730: AArch64: AES/GCM acceleration is broken by the fix for JDK-8273297 #5819

theRealAph commented Oct 5, 2021 •

edited by openjdk bot

bridgekeeper bot commented Oct 5, 2021

openjdk bot commented Oct 5, 2021

mlbridge bot commented Oct 5, 2021 •

edited

adinn left a comment

openjdk bot commented Oct 5, 2021 •

edited

rwestrel left a comment

vnkozlov left a comment

vnkozlov Oct 5, 2021

vnkozlov Oct 5, 2021

vnkozlov left a comment

theRealAph commented Oct 6, 2021

openjdk bot commented Oct 6, 2021

openjdk bot commented Oct 6, 2021

		subkeyHtbl_48_entries_start
		= array_element_address(subkeyHtbl_48_entries, intcon(0), T_LONG);

openjdk / jdk Public

8274730: AArch64: AES/GCM acceleration is broken by the fix for JDK-8273297 #5819

8274730: AArch64: AES/GCM acceleration is broken by the fix for JDK-8273297 #5819

Conversation

theRealAph commented Oct 5, 2021 • edited by openjdk bot

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Oct 5, 2021

openjdk bot commented Oct 5, 2021

mlbridge bot commented Oct 5, 2021 • edited

Webrevs

adinn left a comment

openjdk bot commented Oct 5, 2021 • edited

rwestrel left a comment

vnkozlov left a comment

vnkozlov Oct 5, 2021

Choose a reason for hiding this comment

vnkozlov Oct 5, 2021

Choose a reason for hiding this comment

vnkozlov left a comment

theRealAph commented Oct 6, 2021

openjdk bot commented Oct 6, 2021

openjdk bot commented Oct 6, 2021

theRealAph commented Oct 5, 2021 •

edited by openjdk bot

mlbridge bot commented Oct 5, 2021 •

edited

openjdk bot commented Oct 5, 2021 •

edited