[Release/6.0] Backporting recent fixes related to AVX and suspension. #66120
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Use CopyContext to restore saved context on X86 * PR feedback * more PR feedback
…net#65825) * Do not copy XState other than AVX * #if defined(TARGET_X86) || defined(TARGET_AMD64) * mask XState unconditionally * Ensure XSTATE_MASK_AVX is set before calling EEGetThreadContext * redundant supportsAVX, more clear comment * PR feedback
* null-check the redirect context before using. * tweak the comment * do not allocate context if InitializeContext has unexpected results.
…net#65878) * RestoreContextSimulated * probe for RtlRestoreContext * ntdll.dll * restore self-trap sequence * PR feedback * Clarify CopyContext in RedirectedHandledJITCaseExceptionFilter * simpler indentation. * restore last error on the legacy path. * Update src/coreclr/vm/threads.h Co-authored-by: Dan Moseley <[email protected]>
VSadov
changed the title
|
CC:@agocke |
jkotas
approved these changes
Mar 3, 2022
jeffschwMSFT
approved these changes
Mar 3, 2022
rbhanda
added
Servicing-approved
|
/backport to release/5.0 |
|
Started backporting to release/5.0: https://github.com/dotnet/runtime/actions/runs/1929796872 |
|
@agocke backporting to release/5.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Use CopyContext to restore saved context on X86 (#65490)
Using index info to reconstruct a base tree...
A src/coreclr/vm/threadsuspend.cpp
Falling back to patching base and 3-way merge...
Auto-merging src/coreclr/src/vm/threadsuspend.cpp
Applying: Do not copy XState other than AVX when redirecting for GC stress (#65825)
.git/rebase-apply/patch:53: trailing whitespace.
//
.git/rebase-apply/patch:55: trailing whitespace.
//
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
A src/coreclr/vm/threadsuspend.cpp
Falling back to patching base and 3-way merge...
Auto-merging src/coreclr/src/vm/threadsuspend.cpp
Applying: null-check the redirect context before using. (#65910)
Using index info to reconstruct a base tree...
A src/coreclr/vm/threadsuspend.cpp
Falling back to patching base and 3-way merge...
Auto-merging src/coreclr/src/vm/threadsuspend.cpp
CONFLICT (content): Merge conflict in src/coreclr/src/vm/threadsuspend.cpp
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 null-check the redirect context before using. (#65910)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@agocke your backport attempt to 5.0 failed. Just to make sure I'm understanding it correctly, this error does not affect the ability to merge this PR, correct? Can I already merge this since it is already |
|
Yup, this one can be merged. I'll do the backport for 5.0 and 3.1 manually. |
carlossanlop
pushed a commit
that referenced
this pull request
Mar 15, 2022
* Use CopyContext to restore saved context on X86 (#65490) * Use CopyContext to restore saved context on X86 * PR feedback * more PR feedback * Do not copy XState other than AVX when redirecting for GC stress (#65825) * Do not copy XState other than AVX * #if defined(TARGET_X86) || defined(TARGET_AMD64) * mask XState unconditionally * Ensure XSTATE_MASK_AVX is set before calling EEGetThreadContext * redundant supportsAVX, more clear comment * PR feedback * null-check the redirect context before using. (#65910) * null-check the redirect context before using. * tweak the comment * do not allocate context if InitializeContext has unexpected results. * EE Suspension on x86 should use RtlRestoreContext when available (#65878) * RestoreContextSimulated * probe for RtlRestoreContext * ntdll.dll * restore self-trap sequence * PR feedback * Clarify CopyContext in RedirectedHandledJITCaseExceptionFilter * simpler indentation. * restore last error on the legacy path. * Update src/coreclr/vm/threads.h Co-authored-by: Dan Moseley <[email protected]> Co-authored-by: Vladimir Sadov <[email protected]> Co-authored-by: Dan Moseley <[email protected]>
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Port of a fix for #65292 and issues found along the way related to AVX registers and EE suspension.
Customer Impact
It is relatively easy to end up running AVX-accelerated code nowdays. Copying or comparing arrays or spans, using buffered IO are just some examples.
Issues with storing/restoring AVX context during EE suspension could result in:
Testing
Regular test passes.
Risk
Medium.
The code involved is fairly old. We keep discovering assumptions that may no longer hold. We have seen cases where fixing one bug exposes another. To our knowledge these fixes are robust, but this is a delicate area.