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

8319747: galoisCounterMode_AESCrypt stack walking broken #16567

Closed
wants to merge 2 commits into from

Conversation

djelinski
Copy link
Member

@djelinski djelinski commented Nov 8, 2023

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

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
Copy link

bridgekeeper bot commented Nov 8, 2023

👋 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
Copy link

openjdk bot commented Nov 8, 2023

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

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Nov 8, 2023
@djelinski djelinski changed the title Remove problematic rbp save, rename registers 8319747 Nov 8, 2023
@openjdk openjdk bot changed the title 8319747 8319747: galoisCounterMode_AESCrypt stack walking broken Nov 8, 2023
@djelinski djelinski marked this pull request as ready for review November 8, 2023 20:17
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 8, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 8, 2023

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. Please run tier3 too which will execute the test as part for hotspot_vector_2 group with different AVX settings.

@openjdk
Copy link

openjdk bot commented Nov 8, 2023

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

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 8, 2023
@@ -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;
Copy link

Choose a reason for hiding this comment

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

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

Copy link
Member Author

Choose a reason for hiding this comment

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

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?

Copy link
Member Author

@djelinski djelinski Nov 14, 2023

Choose a reason for hiding this comment

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

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

Copy link

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

@djelinski
Copy link
Member Author

Thanks for the reviews!

/integrate

@openjdk
Copy link

openjdk bot commented Nov 16, 2023

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 openjdk bot added the integrated Pull request has been integrated label Nov 16, 2023
@openjdk openjdk bot closed this Nov 16, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 16, 2023
@openjdk
Copy link

openjdk bot commented Nov 16, 2023

@djelinski Pushed as commit faeea07.

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

@djelinski djelinski deleted the gcm-stackwalking branch November 16, 2023 12:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
3 participants