8319747: galoisCounterMode_AESCrypt stack walking broken #16567

djelinski · 2023-11-08T18:11:58Z

This PR fixes stack walking by removing incorrect RBP change in the middle of a stub.

I also changed the register assignment to avoid saving RSI on Windows.

Testing:

test/hotspot/jtreg/compiler/codegen/aes/TestAESMain.java still passes, both on Windows and Linux
mach5 tier1-2 (including security and TLS-heavy networking tests) still pass
the generated flamegraphs (attached in JBS) show the correct stack trace with this fix

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-8319747: galoisCounterMode_AESCrypt stack walking broken (Bug - P4)

Reviewers

Vladimir Kozlov (@vnkozlov - Reviewer) ⚠️ Review applies to 632f5c18
Sandhya Viswanathan (@sviswa7 - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16567

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-11-08T18:12:47Z

👋 Welcome back djelinski! 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 · 2023-11-08T18:14:33Z

@djelinski 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 · 2023-11-08T20:22:25Z

Webrevs

01: Full - Incremental (237abb92)
00: Full (632f5c18)

vnkozlov

Looks good. Please run tier3 too which will execute the test as part for hotspot_vector_2 group with different AVX settings.

openjdk · 2023-11-08T22:40:44Z

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

8319747: galoisCounterMode_AESCrypt stack walking broken

Reviewed-by: kvn, sviswanathan

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

a75b6e5: 8191460: crash in Annotate with duplicate declaration and annotation processing enabled
7bb1999: 8316342: CLHSDB "dumpclass" command produces invalid classes
97ea5bf: 8319961: JvmtiEnvBase doesn't zero _ext_event_callbacks
25f9af9: 8319883: Zero: Use atomic built-ins for 64-bit accesses
9c98270: 8254693: Add Panama feature to pass heap segments to native code
c80e691: 8319970: AArch64: enable tests compiler/intrinsics/Test(Long|Integer)UnsignedDivMod.java on aarch64
856c280: 8319960: RISC-V: compiler/intrinsics/TestInteger/LongUnsignedDivMod.java failed with "counts: Graph contains wrong number of nodes"
cb7875d: 8318218: RISC-V: C2 CompressBits
1535528: 8318479: [jmh] the test security.CacheBench failed for multiple threads run
95bd92a: 8210807: Printing a JTable with a JScrollPane prints table without rows populated
... and 55 more: https://git.openjdk.org/jdk/compare/8555e0f6c40c045f7763777a9bf976de99c0534c...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.

sviswa7 · 2023-11-10T03:48:22Z

src/hotspot/cpu/x86/stubGenerator_x86_64_aes.cpp

@@ -240,10 +240,10 @@ address StubGenerator::generate_galoisCounterMode_AESCrypt() {
  const Address state_mem(rbp, 7 * wordSize);
  const Register state = r13;
  const Address subkeyH_mem(rbp, 8 * wordSize);
-  const Register subkeyHtbl = r14;
-  const Register avx512_subkeyHtbl = r12;
+  const Register subkeyHtbl = r11;


Changing the register from r14 to r11 here doesn't look correct. As aesgcm_encrypt() uses r11 as temporary for windows at line 3046 and overwrites it at line 3074 etc in the original code.
3046 const Register ghash_pos = NOT_WIN64( r14) WIN64_ONLY( r11 );
3074 __ movl(ghash_pos, 0); // Pointer for ghash read and store operations

Ah, you're right! I missed that. I was looking for #ifdefs, and forgot that we have the *_ONLY macros.

The code works correctly because subkeyHtbl and ghash_pos have non-overlapping lifetimes; subkeyHtbl is last used in line:
3072 __ call(GENERATE_HTBL_48_BLKS, relocInfo::none);

I'd like to make this explicit by changing the code like:

// reuse subkeyHtbl register - the lifetimes do not overlap const Register ghash_pos = subkeyHtbl;

but I can also revert the register renaming changes. What's your preference?

I reverted register renaming to keep this PR focused on stack walking. Tests still pass.

sviswa7

Looks good to me.

djelinski · 2023-11-16T08:53:52Z

Thanks for the reviews!

/integrate

openjdk · 2023-11-16T08:55:22Z

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

b4c2d1c: 8319542: Fix boundaries of region to be tested with os::is_readable_range
c36ec2c: 8316653: Large NMethodSizeLimit triggers assert during C1 code buffer allocation
2db9ea9: 8317723: C2: CountedLoopEndNodes and Zero Trip Guards are wrongly treated as Runtime Predicate
eaa4417: 8319301: Static analysis warnings after JDK-8318016
3452210: 8283140: Remove unused encoding classes/operands from x86_64.ad
f0b7eb5: 8304020: Speed up test/jdk/java/util/zip/ZipFile/TestTooManyEntries.java and clarify its purpose
ffa35d8: 8301997: Move method resolution information out of the cpCache
891d8cf: 8319986: Invalid/inconsistent description and example for DateFormat
536b1ce: 8320130: Problemlist 2 vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt tests with Xcomp
0bda467: 8319187: Add three eMudhra emSign roots
... and 85 more: https://git.openjdk.org/jdk/compare/8555e0f6c40c045f7763777a9bf976de99c0534c...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-11-16T08:55:31Z

@djelinski Pushed as commit faeea07.

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

Remove problematic rbp save, rename registers

632f5c1

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Nov 8, 2023

djelinski changed the title ~~Remove problematic rbp save, rename registers~~ 8319747 Nov 8, 2023

openjdk bot changed the title ~~8319747~~ 8319747: galoisCounterMode_AESCrypt stack walking broken Nov 8, 2023

djelinski marked this pull request as ready for review November 8, 2023 20:17

openjdk bot added the rfr Pull request is ready for review label Nov 8, 2023

vnkozlov approved these changes Nov 8, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 8, 2023

sviswa7 reviewed Nov 10, 2023

View reviewed changes

Revert register renaming

237abb9

sviswa7 approved these changes Nov 14, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Nov 16, 2023

openjdk bot closed this Nov 16, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 16, 2023

djelinski deleted the gcm-stackwalking branch November 16, 2023 12:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8319747: galoisCounterMode_AESCrypt stack walking broken #16567

8319747: galoisCounterMode_AESCrypt stack walking broken #16567

Uh oh!

djelinski commented Nov 8, 2023 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Nov 8, 2023

Uh oh!

openjdk bot commented Nov 8, 2023

Uh oh!

mlbridge bot commented Nov 8, 2023 •

edited

Loading

Uh oh!

vnkozlov left a comment

Uh oh!

openjdk bot commented Nov 8, 2023 •

edited

Loading

Uh oh!

sviswa7 Nov 10, 2023

Uh oh!

djelinski Nov 10, 2023

Uh oh!

djelinski Nov 14, 2023 •

edited

Loading

Uh oh!

sviswa7 left a comment

Uh oh!

djelinski commented Nov 16, 2023

Uh oh!

openjdk bot commented Nov 16, 2023

Uh oh!

openjdk bot commented Nov 16, 2023

Uh oh!

Uh oh!

8319747: galoisCounterMode_AESCrypt stack walking broken #16567

8319747: galoisCounterMode_AESCrypt stack walking broken #16567

Uh oh!

Conversation

djelinski commented Nov 8, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Nov 8, 2023

Uh oh!

openjdk bot commented Nov 8, 2023

Uh oh!

mlbridge bot commented Nov 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

vnkozlov left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Nov 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sviswa7 Nov 10, 2023

Choose a reason for hiding this comment

Uh oh!

djelinski Nov 10, 2023

Choose a reason for hiding this comment

Uh oh!

djelinski Nov 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sviswa7 left a comment

Choose a reason for hiding this comment

Uh oh!

djelinski commented Nov 16, 2023

Uh oh!

openjdk bot commented Nov 16, 2023

Uh oh!

openjdk bot commented Nov 16, 2023

Uh oh!

Uh oh!

djelinski commented Nov 8, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Nov 8, 2023 •

edited

Loading

openjdk bot commented Nov 8, 2023 •

edited

Loading

djelinski Nov 14, 2023 •

edited

Loading