Fix race condition leak in RegisterResumptionStub#125407
Merged
jtschuster merged 2 commits intodotnet:mainfrom Mar 12, 2026
Merged
Fix race condition leak in RegisterResumptionStub#125407jtschuster merged 2 commits intodotnet:mainfrom
jtschuster merged 2 commits intodotnet:mainfrom
Conversation
Move SuppressRelease() after SetMethodDescForEntryPointInNativeImage() and make it conditional on the insertion succeeding. Previously, if two threads raced past the initial check and both allocated a MethodDesc, the loser's allocation was leaked because SuppressRelease() was called unconditionally before the insert. Now the loser's AllocMemTracker will back out the allocation on destruction. Changed SetMethodDescForEntryPointInNativeImage to return bool indicating whether the insertion occurred (true) or the entry already existed (false). Co-authored-by: Copilot <[email protected]>
Contributor
|
Tagging subscribers to this area: @agocke |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a race-condition leak when registering ReadyToRun resumption stubs by only suppressing AllocMemTracker cleanup if the entry-point-to-MethodDesc mapping insertion actually succeeds.
Changes:
- Change
ReadyToRunInfo::SetMethodDescForEntryPointInNativeImageto returnboolindicating whether it inserted a new mapping. - Update
RegisterResumptionStubto callSuppressRelease()only when the mapping insertion succeeds, so the losing racer’s allocation is reclaimed.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
src/coreclr/vm/readytoruninfo.h |
Updates the helper API to return a bool result for “inserted vs already present”. |
src/coreclr/vm/readytoruninfo.cpp |
Implements the bool return semantics and makes RegisterResumptionStub conditionally suppress AllocMemTracker cleanup based on insertion success. |
This was referenced Mar 11, 2026
jkotas
reviewed
Mar 11, 2026
jkotas
approved these changes
Mar 11, 2026
jkotas
approved these changes
Mar 12, 2026
This was referenced Mar 13, 2026
Copilot AI
pushed a commit
that referenced
this pull request
Mar 13, 2026
Move SuppressRelease() after SetMethodDescForEntryPointInNativeImage() and make it conditional on the insertion succeeding. Previously, if two threads raced past the initial check and both allocated a MethodDesc, the loser's allocation was leaked because SuppressRelease() was called unconditionally before the insert. Now the loser's AllocMemTracker will back out the allocation on destruction. Changed SetMethodDescForEntryPointInNativeImage to return bool indicating whether the insertion occurred (true) or the entry already existed (false). --------- Co-authored-by: Copilot <[email protected]>
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 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.
Move SuppressRelease() after SetMethodDescForEntryPointInNativeImage() and make it conditional on the insertion succeeding. Previously, if two threads raced past the initial check and both allocated a MethodDesc, the loser's allocation was leaked because SuppressRelease() was called unconditionally before the insert. Now the loser's AllocMemTracker will back out the allocation on destruction.
Changed SetMethodDescForEntryPointInNativeImage to return bool indicating whether the insertion occurred (true) or the entry already existed (false).