Skip to content

[release/8.0] Fix a deadlock in NonGC + Profiler API #91130

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

Merged
carlossanlop merged 21 commits into from
Aug 25, 2023
Merged

[release/8.0] Fix a deadlock in NonGC + Profiler API #91130

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6aa6b07
Address Jan's feedback
EgorBo Aug 20, 2023
aac9cd4
Fix Debug build
EgorBo Aug 20, 2023
45bbad8
Clean up
EgorBo Aug 20, 2023
3962cfd
Fix debug assert
EgorBo Aug 20, 2023
e5b68d5
Update frozenobjectheap.cpp
EgorBo Aug 20, 2023
b4c1f17
Address feedback
EgorBo Aug 20, 2023
d29da2c
fix build
EgorBo Aug 20, 2023
2772f8f
Update src/coreclr/vm/frozenobjectheap.cpp
EgorBo Aug 20, 2023
ae4ea90
Address feedback
EgorBo Aug 20, 2023
0a731c4
Add gc lock for UpdateFrozenSegment
EgorBo Aug 22, 2023
714a082
Address feedback
EgorBo Aug 23, 2023
2eb4791
Oops, revert unrelated change
EgorBo Aug 23, 2023
841824a
Use preemptive for the whole method
EgorBo Aug 23, 2023
3da2145
PublishFrozenObject has to be called in COOP
EgorBo Aug 23, 2023
c980018
Update src/coreclr/vm/frozenobjectheap.cpp
EgorBo Aug 24, 2023
e8d9385
Address feedback
EgorBo Aug 24, 2023
a866d5e
Add asserts
EgorBo Aug 24, 2023
514eff3
Address feedback
EgorBo Aug 25, 2023
92f6f1c
fix build
EgorBo Aug 25, 2023
795d8f5
Address feedback
EgorBo Aug 25, 2023
fdc290b
Update src/coreclr/vm/frozenobjectheap.cpp
EgorBo Aug 25, 2023
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
Prev Previous commit
Update src/coreclr/vm/frozenobjectheap.cpp 
Co-authored-by: Jan Kotas <jkotas@microsoft.com>
  • Loading branch information
@EgorBo @jkotas
2 people authored and github-actions committed Aug 25, 2023
commit fdc290b3dc97d523aef5a343f5fd74f128586097
10 changes: 5 additions & 5 deletions src/coreclr/vm/frozenobjectheap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,12 @@ void FrozenObjectSegment::RegisterOrUpdate(uint8_t* current, size_t sizeCommited
}
CONTRACTL_END

if (VolatileLoad(&m_pCurrentRegistered) == nullptr)
if (m_pCurrentRegistered == nullptr)
{
segment_info si;
si.pvMem = m_pStart;
si.ibFirstObject = sizeof(ObjHeader);
si.ibAllocated = (size_t)m_pCurrentRegistered;
si.ibAllocated = (size_t)current;
si.ibCommit = sizeCommited;
si.ibReserved = m_Size;

Expand All @@ -190,15 +190,15 @@ void FrozenObjectSegment::RegisterOrUpdate(uint8_t* current, size_t sizeCommited
{
ThrowOutOfMemory();
}
VolatileStore(&m_pCurrentRegistered, current);
m_pCurrentRegistered = current;
}
else
{
if (current > VolatileLoad(&m_pCurrentRegistered))
if (current > m_pCurrentRegistered)
{
GCHeapUtilities::GetGCHeap()->UpdateFrozenSegment(
m_SegmentHandle, current, m_pStart + sizeCommited);
VolatileStore(&m_pCurrentRegistered, current);
m_pCurrentRegistered = current;
}
else
{
Expand Down