summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/vm/virtualcallstub.cpp56
-rw-r--r--src/vm/virtualcallstub.h9
2 files changed, 54 insertions, 11 deletions
diff --git a/src/vm/virtualcallstub.cpp b/src/vm/virtualcallstub.cpp
index 4c6ad0d5d9..f5fb6321fe 100644
--- a/src/vm/virtualcallstub.cpp
+++ b/src/vm/virtualcallstub.cpp
@@ -1461,7 +1461,14 @@ ResolveCacheElem *VirtualCallStubManager::GetResolveCacheElem(void *pMT,
elem = (ResolveCacheElem*) (cache_entries->Find(&probeRC));
if (elem == CALL_STUB_EMPTY_ENTRY)
{
- elem = GenerateResolveCacheElem(target, pMT, token);
+ bool reenteredCooperativeGCMode = false;
+ elem = GenerateResolveCacheElem(target, pMT, token, &reenteredCooperativeGCMode);
+ if (reenteredCooperativeGCMode)
+ {
+ // The prober may have been invalidated by reentering cooperative GC mode, reset it
+ BOOL success = cache_entries->SetUpProber(token, (size_t)pMT, &probeRC);
+ _ASSERTE(success);
+ }
elem = (ResolveCacheElem*) (cache_entries->Add((size_t) elem, &probeRC));
}
}
@@ -1980,8 +1987,15 @@ PCODE VirtualCallStubManager::ResolveWorker(StubCallSite* pCallSite,
if (addrOfDispatch == CALL_STUB_EMPTY_ENTRY)
{
PCODE addrOfFail = pResolveHolder->stub()->failEntryPoint();
+ bool reenteredCooperativeGCMode = false;
pDispatchHolder = GenerateDispatchStub(
- target, addrOfFail, objectType, token.To_SIZE_T());
+ target, addrOfFail, objectType, token.To_SIZE_T(), &reenteredCooperativeGCMode);
+ if (reenteredCooperativeGCMode)
+ {
+ // The prober may have been invalidated by reentering cooperative GC mode, reset it
+ BOOL success = dispatchers->SetUpProber(token.To_SIZE_T(), (size_t)objectType, &probeD);
+ _ASSERTE(success);
+ }
dispatchers->Add((size_t)(pDispatchHolder->stub()->entryPoint()), &probeD);
}
else
@@ -2097,8 +2111,15 @@ PCODE VirtualCallStubManager::ResolveWorker(StubCallSite* pCallSite,
// so we may have to create it now
ResolveHolder* pResolveHolder = ResolveHolder::FromResolveEntry(pCallSite->GetSiteTarget());
PCODE addrOfFail = pResolveHolder->stub()->failEntryPoint();
+ bool reenteredCooperativeGCMode = false;
pDispatchHolder = GenerateDispatchStub(
- target, addrOfFail, objectType, token.To_SIZE_T());
+ target, addrOfFail, objectType, token.To_SIZE_T(), &reenteredCooperativeGCMode);
+ if (reenteredCooperativeGCMode)
+ {
+ // The prober may have been invalidated by reentering cooperative GC mode, reset it
+ BOOL success = dispatchers->SetUpProber(token.To_SIZE_T(), (size_t)objectType, &probeD);
+ _ASSERTE(success);
+ }
dispatchers->Add((size_t)(pDispatchHolder->stub()->entryPoint()), &probeD);
}
else
@@ -2714,7 +2735,8 @@ are the addresses the stub is to transfer to depending on the test with pMTExpec
DispatchHolder *VirtualCallStubManager::GenerateDispatchStub(PCODE addrOfCode,
PCODE addrOfFail,
void * pMTExpected,
- size_t dispatchToken)
+ size_t dispatchToken,
+ bool * pMayHaveReenteredCooperativeGCMode)
{
CONTRACT (DispatchHolder*) {
THROWS;
@@ -2723,6 +2745,8 @@ DispatchHolder *VirtualCallStubManager::GenerateDispatchStub(PCODE ad
PRECONDITION(addrOfCode != NULL);
PRECONDITION(addrOfFail != NULL);
PRECONDITION(CheckPointer(pMTExpected));
+ PRECONDITION(pMayHaveReenteredCooperativeGCMode != nullptr);
+ PRECONDITION(!*pMayHaveReenteredCooperativeGCMode);
POSTCONDITION(CheckPointer(RETVAL));
} CONTRACT_END;
@@ -2736,7 +2760,8 @@ DispatchHolder *VirtualCallStubManager::GenerateDispatchStub(PCODE ad
RETURN GenerateDispatchStubLong(addrOfCode,
addrOfFail,
pMTExpected,
- dispatchToken);
+ dispatchToken,
+ pMayHaveReenteredCooperativeGCMode);
}
dispatchHolderSize = DispatchHolder::GetHolderSize(DispatchStub::e_TYPE_SHORT);
@@ -2750,7 +2775,7 @@ DispatchHolder *VirtualCallStubManager::GenerateDispatchStub(PCODE ad
if (!DispatchHolder::CanShortJumpDispatchStubReachFailTarget(addrOfFail, (LPCBYTE)holder))
{
m_fShouldAllocateLongJumpDispatchStubs = TRUE;
- RETURN GenerateDispatchStub(addrOfCode, addrOfFail, pMTExpected, dispatchToken);
+ RETURN GenerateDispatchStub(addrOfCode, addrOfFail, pMTExpected, dispatchToken, pMayHaveReenteredCooperativeGCMode);
}
#endif
@@ -2769,6 +2794,9 @@ DispatchHolder *VirtualCallStubManager::GenerateDispatchStub(PCODE ad
EntryPointSlots::SlotType slotType;
TADDR slot = holder->stub()->implTargetSlot(&slotType);
pMD->RecordAndBackpatchEntryPointSlot(m_loaderAllocator, slot, slotType);
+
+ // RecordAndBackpatchEntryPointSlot() takes a lock that would exit and reenter cooperative GC mode
+ *pMayHaveReenteredCooperativeGCMode = true;
}
#endif
@@ -2797,7 +2825,8 @@ are the addresses the stub is to transfer to depending on the test with pMTExpec
DispatchHolder *VirtualCallStubManager::GenerateDispatchStubLong(PCODE addrOfCode,
PCODE addrOfFail,
void * pMTExpected,
- size_t dispatchToken)
+ size_t dispatchToken,
+ bool * pMayHaveReenteredCooperativeGCMode)
{
CONTRACT (DispatchHolder*) {
THROWS;
@@ -2806,6 +2835,8 @@ DispatchHolder *VirtualCallStubManager::GenerateDispatchStubLong(PCODE
PRECONDITION(addrOfCode != NULL);
PRECONDITION(addrOfFail != NULL);
PRECONDITION(CheckPointer(pMTExpected));
+ PRECONDITION(pMayHaveReenteredCooperativeGCMode != nullptr);
+ PRECONDITION(!*pMayHaveReenteredCooperativeGCMode);
POSTCONDITION(CheckPointer(RETVAL));
} CONTRACT_END;
@@ -2825,6 +2856,9 @@ DispatchHolder *VirtualCallStubManager::GenerateDispatchStubLong(PCODE
EntryPointSlots::SlotType slotType;
TADDR slot = holder->stub()->implTargetSlot(&slotType);
pMD->RecordAndBackpatchEntryPointSlot(m_loaderAllocator, slot, slotType);
+
+ // RecordAndBackpatchEntryPointSlot() takes a lock that would exit and reenter cooperative GC mode
+ *pMayHaveReenteredCooperativeGCMode = true;
}
#endif
@@ -2974,13 +3008,16 @@ LookupHolder *VirtualCallStubManager::GenerateLookupStub(PCODE addrOfResolver, s
*/
ResolveCacheElem *VirtualCallStubManager::GenerateResolveCacheElem(void *addrOfCode,
void *pMTExpected,
- size_t token)
+ size_t token,
+ bool *pMayHaveReenteredCooperativeGCMode)
{
CONTRACTL
{
THROWS;
GC_TRIGGERS;
INJECT_FAULT(COMPlusThrowOM(););
+ PRECONDITION(pMayHaveReenteredCooperativeGCMode != nullptr);
+ PRECONDITION(!*pMayHaveReenteredCooperativeGCMode);
}
CONTRACTL_END
@@ -3004,6 +3041,9 @@ ResolveCacheElem *VirtualCallStubManager::GenerateResolveCacheElem(void *addrOfC
m_loaderAllocator,
(TADDR)&e->target,
EntryPointSlots::SlotType_Normal);
+
+ // RecordAndBackpatchEntryPointSlot() takes a lock that would exit and reenter cooperative GC mode
+ *pMayHaveReenteredCooperativeGCMode = true;
}
#endif
diff --git a/src/vm/virtualcallstub.h b/src/vm/virtualcallstub.h
index 3cf096a47a..496d317cc5 100644
--- a/src/vm/virtualcallstub.h
+++ b/src/vm/virtualcallstub.h
@@ -495,7 +495,8 @@ private:
DispatchHolder *GenerateDispatchStub(PCODE addrOfCode,
PCODE addrOfFail,
void *pMTExpected,
- size_t dispatchToken);
+ size_t dispatchToken,
+ bool *pMayHaveReenteredCooperativeGCMode);
#ifdef _TARGET_AMD64_
// Used to allocate a long jump dispatch stub. See comment around
@@ -503,7 +504,8 @@ private:
DispatchHolder *GenerateDispatchStubLong(PCODE addrOfCode,
PCODE addrOfFail,
void *pMTExpected,
- size_t dispatchToken);
+ size_t dispatchToken,
+ bool *pMayHaveReenteredCooperativeGCMode);
#endif
ResolveHolder *GenerateResolveStub(PCODE addrOfResolver,
@@ -529,7 +531,8 @@ private:
// The resolve cache is static across all AppDomains
ResolveCacheElem *GenerateResolveCacheElem(void *addrOfCode,
void *pMTExpected,
- size_t token);
+ size_t token,
+ bool *pMayHaveReenteredCooperativeGCMode);
ResolveCacheElem *GetResolveCacheElem(void *pMT,
size_t token,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 19:38:07 +0000