Fix Windows Arm64 unwinding #102258
Merged
Fix Windows Arm64 unwinding #102258
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
There was an issue with unwinding native code functions in case of calls to no-return function placed at an end of a function code block. The return address was not in range of the function code, so RtlLookupFunctionEntry was not finding anything, we were thinking that it was a leaf function due to that and tried to unwind using LR only, which was wrong and resulted in staying on the same instruction. Thus the unwinding ended up in an infinite loop for those cases. The fix, that matches what RtlUnwind does, is to adjust the instruction pointer at call sites back. This is arm64 specific. Close dotnet#101921
|
Tagging subscribers to this area: @mangod9 |
jkotas
reviewed
May 15, 2024
src/coreclr/vm/stackwalk.cpp
Outdated
| @@ -553,6 +553,13 @@ PCODE Thread::VirtualUnwindCallFrame(T_CONTEXT* pContext, | |||
| UINT_PTR uImageBase; | |||
| PT_RUNTIME_FUNCTION pFunctionEntry; | |||
|
|
|||
| #if !defined(TARGET_UNIX) && defined(CONTEXT_UNWOUND_TO_CALL) | |||
There was a problem hiding this comment.
When is CONTEXT_UNWOUND_TO_CALL not defined on Windows here?
I see CONTEXT_UNWOUND_TO_CALL defined for both x64 and arm64 in Windows SDK.
There was a problem hiding this comment.
Hmm, that's strange. In pal.h we don't define it for x64 and Windows also doesn't set it for non-arm.
There was a problem hiding this comment.
I've added a commit to change that ifdef to TARGET_ARM64
mangod9
approved these changes
May 15, 2024
Ruihan-Yin
pushed a commit
to Ruihan-Yin/runtime
that referenced
this pull request
May 30, 2024
* Fix Windows Arm64 unwinding There was an issue with unwinding native code functions in case of calls to no-return function placed at an end of a function code block. The return address was not in range of the function code, so RtlLookupFunctionEntry was not finding anything, we were thinking that it was a leaf function due to that and tried to unwind using LR only, which was wrong and resulted in staying on the same instruction. Thus the unwinding ended up in an infinite loop for those cases. The fix, that matches what RtlUnwind does, is to adjust the instruction pointer at call sites back. This is arm64 specific. Close dotnet#101921 * Modify the ifdef from CONTEXT_UNWOUND_TO_CALL to TARGET_ARM64
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
There was an issue with unwinding native code functions in case of calls to no-return function placed at an end of a function code block. The return address was not in range of the function code, so RtlLookupFunctionEntry was not finding anything, we were thinking that it was a leaf function due to that and tried to unwind using LR only, which was wrong and resulted in staying on the same instruction. Thus the unwinding ended up in an infinite loop for those cases. The fix, that matches what RtlUnwind does, is to adjust the instruction pointer at call sites back. This is arm64 specific.
Close #101921