Skip to content

[release/10.0] Fix GC hole when method return is hijacked for GC suspension #131708

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

Open
steveisok wants to merge 1 commit into
base: release/10.0
Choose a base branch
from
+15 −0
Open

[release/10.0] Fix GC hole when method return is hijacked for GC suspension #131708

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions src/coreclr/vm/threadsuspend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#include "exinfo.h"
#endif

bool IsCallDescrWorkerInternalReturnAddress(PCODE pCode);

#define HIJACK_NONINTERRUPTIBLE_THREADS

bool ThreadSuspend::s_fSuspendRuntimeInProgress = false;
Expand Down Expand Up @@ -4597,6 +4599,19 @@ void Thread::HijackThread(ExecutionState *esb X86_ARG(ReturnKind returnKind) X86
// Remember the place that the return would have gone
m_pvHJRetAddr = *esb->m_ppvRetAddrPtr;

#ifndef TARGET_X86
// Except for x86, no registers are scanned as part of the HijackFrame on top of the stack.
// This still allows scanning of the return value because the registers in question are
// scanned as part of the calling method's roots. The problem arises if we are returning to
// CallDescrWorkerInternal, which is hand written assembly with no GC info, so a returned
// objectref would be neither reported nor updated by a GC.
if (IsCallDescrWorkerInternalReturnAddress((PCODE)(TADDR)m_pvHJRetAddr))
{
STRESS_LOG2(LF_SYNC, LL_INFO100, "Thread::HijackThread(%p): Early out - return address %p is CallDescrWorkerInternal.\n", this, m_pvHJRetAddr);
return;
}
#endif // !TARGET_X86

IS_VALID_CODE_PTR((FARPROC) (TADDR)m_pvHJRetAddr);
// TODO [DAVBR]: For the full fix for VsWhidbey 450273, the below
// may be uncommented once isLegalManagedCodeCaller works properly
Expand Down
Loading