Skip to content

[release/8.0-staging] Move a lock to protect m_pDynamicStaticsInfo #97352

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
jeffschwMSFT merged 4 commits into from
Feb 9, 2024
Merged

[release/8.0-staging] Move a lock to protect m_pDynamicStaticsInfo #97352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
344aa29
Move a lock to protect m_pDynamicStaticsInfo
HJLeee Dec 7, 2023
2114e07
apply feedback
HJLeee Dec 8, 2023
57e846f
cast to LONG
HJLeee Dec 8, 2023
2146779
Fix access to m_pDynamicStaticsInfo (#97353)
davidwrighton Jan 23, 2024
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
30 changes: 13 additions & 17 deletions src/coreclr/vm/ceeload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1550,29 +1550,25 @@ DWORD Module::AllocateDynamicEntry(MethodTable *pMT)
}
CONTRACTL_END;

DWORD newId = InterlockedExchangeAdd((LONG*)&m_cDynamicEntries, 1);
CrstHolder ch(&m_Crst);
DWORD newId = (LONG)m_cDynamicEntries++;

if (newId >= VolatileLoad(&m_maxDynamicEntries))
if (newId >= m_maxDynamicEntries)
{
CrstHolder ch(&m_Crst);

if (newId >= m_maxDynamicEntries)
SIZE_T maxDynamicEntries = max(16, m_maxDynamicEntries);
while (maxDynamicEntries <= newId)
{
SIZE_T maxDynamicEntries = max(16, m_maxDynamicEntries);
while (maxDynamicEntries <= newId)
{
maxDynamicEntries *= 2;
}
maxDynamicEntries *= 2;
}

DynamicStaticsInfo* pNewDynamicStaticsInfo = (DynamicStaticsInfo*)
(void*)GetLoaderAllocator()->GetHighFrequencyHeap()->AllocMem(S_SIZE_T(sizeof(DynamicStaticsInfo)) * S_SIZE_T(maxDynamicEntries));
DynamicStaticsInfo* pNewDynamicStaticsInfo = (DynamicStaticsInfo*)
(void*)GetLoaderAllocator()->GetHighFrequencyHeap()->AllocMem(S_SIZE_T(sizeof(DynamicStaticsInfo)) * S_SIZE_T(maxDynamicEntries));

if (m_pDynamicStaticsInfo)
memcpy(pNewDynamicStaticsInfo, m_pDynamicStaticsInfo, sizeof(DynamicStaticsInfo) * m_maxDynamicEntries);
if (m_pDynamicStaticsInfo)
memcpy(pNewDynamicStaticsInfo, m_pDynamicStaticsInfo, sizeof(DynamicStaticsInfo) * m_maxDynamicEntries);

m_pDynamicStaticsInfo = pNewDynamicStaticsInfo;
VolatileStore(&m_maxDynamicEntries, maxDynamicEntries);
}
VolatileStore(&m_pDynamicStaticsInfo, pNewDynamicStaticsInfo);
m_maxDynamicEntries = maxDynamicEntries;
}

m_pDynamicStaticsInfo[newId].pEnclosingMT = pMT;
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/ceeload.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ inline MethodTable* Module::GetDynamicClassMT(DWORD dynamicClassID)
{
LIMITED_METHOD_CONTRACT;
_ASSERTE(m_cDynamicEntries > dynamicClassID);
return m_pDynamicStaticsInfo[dynamicClassID].pEnclosingMT;
return VolatileLoadWithoutBarrier(&m_pDynamicStaticsInfo)[dynamicClassID].pEnclosingMT;
}

#ifdef FEATURE_CODE_VERSIONING
Expand Down