Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix locking around m_LoaderAllocatorReferences iteration #68336

Merged
merged 2 commits into from
Apr 21, 2022
Merged

Fix locking around m_LoaderAllocatorReferences iteration #68336

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d144919
Fix locking around m_LoaderAllocatorReferences iteration
janvorli Apr 21, 2022
73fc6ec
Reflect PR feedback
janvorli Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions src/coreclr/vm/loaderallocator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,9 @@ LoaderAllocator * LoaderAllocator::GCLoaderAllocators_RemoveAssemblies(AppDomain
#endif //0

AppDomain::AssemblyIterator i;
// Iterate through every loader allocator, marking as we go
{
// Iterate through every loader allocator, marking as we go
CrstHolder chLoaderAllocatorReferencesLock(pAppDomain->GetLoaderAllocatorReferencesLock());
CrstHolder chAssemblyListLock(pAppDomain->GetAssemblyListLock());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The second iteration below is going to acquire same locks now. We can acquire the locks just once for the whole duration of both iterations.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, I'll update the PR that way.


i = pAppDomain->IterateAssembliesEx((AssemblyIterationFlags)(
Expand All @@ -405,17 +406,11 @@ LoaderAllocator * LoaderAllocator::GCLoaderAllocators_RemoveAssemblies(AppDomain
}
}
}
}

// Iterate through every loader allocator, unmarking marked loaderallocators, and
// build a free list of unmarked ones
{
CrstHolder chLoaderAllocatorReferencesLock(pAppDomain->GetLoaderAllocatorReferencesLock());
CrstHolder chAssemblyListLock(pAppDomain->GetAssemblyListLock());

// Iterate through every loader allocator, unmarking marked loaderallocators, and
// build a free list of unmarked ones
i = pAppDomain->IterateAssembliesEx((AssemblyIterationFlags)(
kIncludeExecution | kIncludeLoaded | kIncludeCollected));
CollectibleAssemblyHolder<DomainAssembly *> pDomainAssembly;

while (i.Next_Unlocked(pDomainAssembly.This()))
{
Expand Down