[release/9.0-staging] Fix race condition in cleanup of collectible thread static variables#111275
Merged
davidwrighton merged 5 commits intorelease/9.0-stagingfrom Jan 28, 2025
Conversation
There was a race condition where we could have collected all of the managed state of a LoaderAllocator, but not yet started cleaning up the actual LoaderAllocator object in native code. If a thread which had a TLS variable defined in a code associated with a collectible loader allocator was terminated at that point, then the runtime would crash. The fix is to detect if the LoaderAllocator managed state is still alive, and if so, do not attempt to clean it up.
…taticCollection.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…taticCollection.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
ghost
added
the
needs-area-label
jkotas
approved these changes
Jan 10, 2025
jeffschwMSFT
added
the
Servicing-consider
jeffschwMSFT
approved these changes
Jan 10, 2025
Member
jeffschwMSFT
left a comment
jeffschwMSFT
left a comment
There was a problem hiding this comment.
lgtm. we will take for consideration in 9.0.x
Contributor
|
@davidwrighton @jeffschwMSFT friendly reminder that today's code complete for the Feb 2025 Release. Please merge this change by 4pm PT if you'd like it included in that release version. Otherwise, it will have to wait until next month. |
jeffhandley
added
area-VM-coreclr
and removed
needs-area-label
Contributor
|
Tagging subscribers to this area: @mangod9 |
rbhanda
added
Servicing-approved
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
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.
Backport of #111257 to release/9.0-staging
/cc @davidwrighton
Customer Impact
This race condition causes an access violation in the EE accessing null when a collectible assembly is partially collected and a thread is terminated. And that thread used a collectible tls static. Found by dnceng in a CI environment.
Regression
This was introduced with the statics rewrite.
Testing
New stress test was written to verify the fix. A cut down variant of the stress test has been added as part of the fix.
Risk
Low , fix is effectively a null check that just skips doing the problematic operation.
IMPORTANT: If this backport is for a servicing release, please verify that:
release/X.0-staging, notrelease/X.0.Package authoring no longer needed in .NET 9
IMPORTANT: Starting with .NET 9, you no longer need to edit a NuGet package's csproj to enable building and bump the version.
Keep in mind that we still need package authoring in .NET 8 and older versions.