8344802: Crash in StubRoutines::verify_mxcsr with -XX:+EnableX86ECoreOpts and -Xcheck:jni #22673

vpaprotsk · 2024-12-10T23:45:37Z

(Also see 8319429: Resetting MXCSR flags degrades ecore)

This PR fixes two issues:

the original issue is a crash caused by __ warn corrupting the stack on Windows only
This issue also uncovered that -Xcheck:jni test cases were getting 65k lines of warning on HelloWorld (on both Linux and windows):

OpenJDK 64-Bit Server VM warning: MXCSR changed by native JNI code, use -XX:+RestoreMXCSROnJNICall

First, the crash. Caused when FXRSTOR is attempting to write reserved bits into MXCSR. If those bits happen to be set, crash. (Hence the crash isn't deterministic. But frequent enough if __ warn is used). It is caused by the binding not reserving stack space for register parameters ()

Prolog of the warn function then proceeds to store the for arg registers onto the stack, overriding the fxstore save area. (See https://learn.microsoft.com/en-us/cpp/build/x64-calling-convention?view=msvc-170#calling-convention-defaults)

Fix uses frame::arg_reg_save_area_bytes to bump the stack pointer.

I also kept the fix to verify_mxcsr since without it, -Xcheck:jni is practically unusable when -XX:+EnableX86ECoreOpts are set (65k+ lines of warnings)

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-8344802: Crash in StubRoutines::verify_mxcsr with -XX:+EnableX86ECoreOpts and -Xcheck:jni (Bug - P4)

Reviewers

Sandhya Viswanathan (@sviswa7 - Reviewer) Review applies to b23764ab
Julian Waters (@TheShermanTanker - Committer)
Vladimir Kozlov (@vnkozlov - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22673

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2024-12-10T23:46:29Z

👋 Welcome back vpaprotski! 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 · 2024-12-10T23:46:49Z

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

8344802: Crash in StubRoutines::verify_mxcsr with -XX:+EnableX86ECoreOpts and -Xcheck:jni

Reviewed-by: jwaters, 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 706 new commits pushed to the master branch:

b8576eb: 6562489: Font-Renderer should ignore invisible characters \u2062 and \u2063
7a0832f: 8349934: Wrong file regex for copyright header format check in .jcheck/conf
2a5d1da: 8349571: Remove JavaThreadFactory interface from SA
74e458b: 8349684: Remove SA core file tests from problem list for macosx-x64
ba28119: 8348427: DeferredLintHandler API should use JCTree instead of DiagnosticPosition
c5ac3c4: 8249831: Test sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.java is marked with @ignore
336d0d8: 8349926: [BACKOUT] Support static JDK in libfontmanager/freetypeScaler.c
4b463ee: 8342103: C2 compiler support for Float16 type and associated scalar operations
332d87c: 8349859: Support static JDK in libfontmanager/freetypeScaler.c
73e1780: 8349836: G1: Improve group prediction log message
... and 696 more: https://git.openjdk.org/jdk/compare/d6b5264c3f7d0c4157ebd73b2f1a98dd15273c61...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@sviswa7, @TheShermanTanker, @vnkozlov) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

openjdk · 2024-12-10T23:47:23Z

@vpaprotsk The following labels will be automatically applied to this pull request:

core-libs
hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

mlbridge · 2024-12-11T01:23:11Z

Webrevs

bridgekeeper · 2025-01-08T01:41:28Z

@vpaprotsk This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

vpaprotsk · 2025-01-08T16:23:00Z

(back from vacation. After discussing this with Sandhya, will have an update soon)

vpaprotsk · 2025-01-23T18:23:01Z

src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp

+    if (EnableX86ECoreOpts) {
+      // On ECore, restore with signaling flags enabled
+      MxCsr |= 0x3F;
+    }


@JornVernee I came across your comment https://github.com/openjdk/jdk/pull/14523/files#r1236920072

I believe I am following the 'spirit' of that comment here, but would appreciate you having a look.

Yes, I think so. Originally I was seeing some cases where we were always resetting MxCsr, even for unrelated exceptions. The new code still only resets it for the FLT_* exceptions.

sviswa7 · 2025-02-07T17:34:25Z

src/hotspot/cpu/x86/macroAssembler_x86.cpp

+
+  stmxcsr(mxcsr_save);
+  movl(tmp, mxcsr_save);
+  // Mask out any pending exceptions (only check control and mask bits)


This comment should go on the else path and could be changed to "Mask out status bits (only check control and mask bits)"

sviswa7 · 2025-02-07T17:37:04Z

src/hotspot/cpu/x86/macroAssembler_x86.cpp

+    // On Ecore, status bits are set by default (for performance)
+    orl(tmp, 0x003f);  // On Ecore, exception bits are set by default


Duplication in comment. Comment could be modified to reflect something like "The mxcsr_std has status bits set for performance on ECore"

sviswa7 · 2025-02-07T17:49:38Z

src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp

+    //
+    jint MxCsr = INITIAL_MXCSR; // set to 0x1f80` in winnt.h
+    if (EnableX86ECoreOpts) {
+      // On ECore, restore with signaling flags enabled


Change comment to // On ECore restore with status bits enabled.

sviswa7

Looks good to me.

vpaprotsk · 2025-02-12T15:23:46Z

(deleted integrate command)

openjdk · 2025-02-12T15:24:52Z

@vpaprotsk
Your change (at version b23764a) is now ready to be sponsored by a Committer.

TheShermanTanker · 2025-02-12T15:38:34Z

src/hotspot/os/windows/os_windows.cpp

    }

 #if defined(_M_AMD64)
+    extern bool handle_FLT_exception(struct _EXCEPTION_POINTERS* exceptionInfo);


This seems strange to declare inside another method like this, not a showstopper but it might be better to declare it where handle_FLT_exception used to be defined in this file

Oh.. I remember wondering where to put this. Meant to come back and find the right header.

I couldn't find the right header 'easily' and leaving it where the old function was looked even more out of place (i.e. "things like this belong in headers"?). So this was my alternative...

TheShermanTanker

Looks good otherwise

src/hotspot/cpu/x86/macroAssembler_x86.cpp

Co-authored-by: Julian Waters <32636402+TheShermanTanker@users.noreply.github.com>

vnkozlov

I submitted our internal testing. Please wait results.

vpaprotsk · 2025-02-12T16:23:54Z

I submitted our internal testing. Please wait results.

Thanks! Deleted the integrate command

vnkozlov

My tier1-4, stress, xcomp testing passed.

vpaprotsk · 2025-02-12T21:43:44Z

Thanks!

/integrate

openjdk · 2025-02-12T22:19:40Z

@vpaprotsk
Your change (at version cbd3812) is now ready to be sponsored by a Committer.

sviswa7 · 2025-02-12T22:24:42Z

/sponsor

openjdk · 2025-02-12T22:25:10Z

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

b8576eb: 6562489: Font-Renderer should ignore invisible characters \u2062 and \u2063
7a0832f: 8349934: Wrong file regex for copyright header format check in .jcheck/conf
2a5d1da: 8349571: Remove JavaThreadFactory interface from SA
74e458b: 8349684: Remove SA core file tests from problem list for macosx-x64
ba28119: 8348427: DeferredLintHandler API should use JCTree instead of DiagnosticPosition
c5ac3c4: 8249831: Test sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.java is marked with @ignore
336d0d8: 8349926: [BACKOUT] Support static JDK in libfontmanager/freetypeScaler.c
4b463ee: 8342103: C2 compiler support for Float16 type and associated scalar operations
332d87c: 8349859: Support static JDK in libfontmanager/freetypeScaler.c
73e1780: 8349836: G1: Improve group prediction log message
... and 696 more: https://git.openjdk.org/jdk/compare/d6b5264c3f7d0c4157ebd73b2f1a98dd15273c61...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-02-12T22:25:35Z

@sviswa7 @vpaprotsk Pushed as commit 55097dd.

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

openjdk bot added hotspot hotspot-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Dec 10, 2024

fix mxcsr JNI checks

aeced07

openjdk bot added the rfr Pull request is ready for review label Dec 11, 2024

whitespace

c106e35

cleanup

6768b9d

openjdk bot removed the rfr Pull request is ready for review label Jan 23, 2025

whitespace

2b15f99

openjdk bot added the rfr Pull request is ready for review label Jan 23, 2025

vpaprotsk commented Jan 23, 2025

View reviewed changes

vpaprotsk and others added 2 commits February 3, 2025 11:39

fix crash in fxrstor

b1a712b

typo

2e372f2

sviswa7 reviewed Feb 7, 2025

View reviewed changes

comments from Sandhya

b23764a

sviswa7 approved these changes Feb 11, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Feb 11, 2025

openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 12, 2025

TheShermanTanker reviewed Feb 12, 2025

View reviewed changes

TheShermanTanker approved these changes Feb 12, 2025

View reviewed changes

TheShermanTanker reviewed Feb 12, 2025

View reviewed changes

src/hotspot/cpu/x86/macroAssembler_x86.cpp Outdated Show resolved Hide resolved

Update src/hotspot/cpu/x86/macroAssembler_x86.cpp

cbd3812

Co-authored-by: Julian Waters <32636402+TheShermanTanker@users.noreply.github.com>

openjdk bot removed the sponsor Pull request is ready to be sponsored label Feb 12, 2025

openjdk bot removed the ready Pull request is ready to be integrated label Feb 12, 2025

vnkozlov reviewed Feb 12, 2025

View reviewed changes

TheShermanTanker approved these changes Feb 12, 2025

View reviewed changes

vnkozlov approved these changes Feb 12, 2025

View reviewed changes

openjdk bot added ready Pull request is ready to be integrated sponsor Pull request is ready to be sponsored labels Feb 12, 2025

openjdk bot added the integrated Pull request has been integrated label Feb 12, 2025

openjdk bot closed this Feb 12, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Feb 12, 2025

christophfink mentioned this pull request May 6, 2025

OpenJDK 64-Bit Server VM warning: MXCSR changed by native JNI code, use -XX:+RestoreMXCSROnJNICall r5py/r5py#485

Closed

		// On Ecore, status bits are set by default (for performance)
		orl(tmp, 0x003f); // On Ecore, exception bits are set by default

8344802: Crash in StubRoutines::verify_mxcsr with -XX:+EnableX86ECoreOpts and -Xcheck:jni #22673

8344802: Crash in StubRoutines::verify_mxcsr with -XX:+EnableX86ECoreOpts and -Xcheck:jni #22673

Uh oh!

Conversation

vpaprotsk commented Dec 10, 2024 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Dec 10, 2024

Uh oh!

openjdk bot commented Dec 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Dec 10, 2024

Uh oh!

mlbridge bot commented Dec 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

bridgekeeper bot commented Jan 8, 2025

Uh oh!

vpaprotsk commented Jan 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vpaprotsk Jan 23, 2025

Choose a reason for hiding this comment

Uh oh!

JornVernee Jan 24, 2025

Choose a reason for hiding this comment

Uh oh!

sviswa7 Feb 7, 2025

Choose a reason for hiding this comment

Uh oh!

sviswa7 Feb 7, 2025

Choose a reason for hiding this comment

Uh oh!

sviswa7 Feb 7, 2025

Choose a reason for hiding this comment

Uh oh!

sviswa7 left a comment

Choose a reason for hiding this comment

Uh oh!

vpaprotsk commented Feb 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Feb 12, 2025

Uh oh!

TheShermanTanker Feb 12, 2025

Choose a reason for hiding this comment

Uh oh!

vpaprotsk Feb 12, 2025 • 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!

TheShermanTanker left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vnkozlov left a comment

Choose a reason for hiding this comment

Uh oh!

vpaprotsk commented Feb 12, 2025

Uh oh!

vnkozlov left a comment

Choose a reason for hiding this comment

Uh oh!

vpaprotsk commented Feb 12, 2025

Uh oh!

openjdk bot commented Feb 12, 2025

Uh oh!

sviswa7 commented Feb 12, 2025

Uh oh!

openjdk bot commented Feb 12, 2025

Uh oh!

openjdk bot commented Feb 12, 2025

Uh oh!

Reviewers

vpaprotsk commented Dec 10, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Dec 10, 2024 •

edited

Loading

mlbridge bot commented Dec 11, 2024 •

edited

Loading

vpaprotsk commented Jan 8, 2025 •

edited

Loading

vpaprotsk commented Feb 12, 2025 •

edited

Loading

vpaprotsk Feb 12, 2025 •

edited

Loading