Skip to content

Use alternatives to redirecting threads via IP changes in the context, for a few cases on Windows #55649

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
kouvel merged 6 commits into from
Jul 15, 2021
Merged

Use alternatives to redirecting threads via IP changes in the context, for a few cases on Windows #55649

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
89a7736
Use alternatives to redirecting threads via IP changes in the context…
Jun 23, 2021
f321fcc
Remove usage of GetModuleHandle
Jul 14, 2021
f831ec4
Update LoadLibrary call with suggestion
Jul 14, 2021
75ad363
Fix Unix build
Jul 14, 2021
ce5375e
Fix x86 build, add getter for activation callback stub, actually go t…
Jul 14, 2021
540e1e5
Small fix to account for GCStress not being changed yet
Jul 14, 2021
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
Next Next commit
Fix x86 build, add getter for activation callback stub, actually go t… 
…hrough the stub
  • Loading branch information
Koundinya Veluri committed Jul 14, 2021
commit ce5375eb5c8f8f4441691903472bd739b3604369
45 changes: 33 additions & 12 deletions src/coreclr/vm/threadsuspend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,20 @@ ThreadSuspend::SUSPEND_REASON ThreadSuspend::m_suspendReason;
extern "C" void RedirectedHandledJITCaseForGCThreadControl_Stub(void);
extern "C" void RedirectedHandledJITCaseForDbgThreadControl_Stub(void);
extern "C" void RedirectedHandledJITCaseForUserSuspend_Stub(void);
#ifdef FEATURE_SPECIAL_USER_MODE_APC
extern "C" void NTAPI ApcActivationCallbackStub(ULONG_PTR Parameter);
#endif

#define GetRedirectHandlerForGCThreadControl() \
((PFN_REDIRECTTARGET) GetEEFuncEntryPoint(RedirectedHandledJITCaseForGCThreadControl_Stub))
#define GetRedirectHandlerForDbgThreadControl() \
((PFN_REDIRECTTARGET) GetEEFuncEntryPoint(RedirectedHandledJITCaseForDbgThreadControl_Stub))
#define GetRedirectHandlerForUserSuspend() \
((PFN_REDIRECTTARGET) GetEEFuncEntryPoint(RedirectedHandledJITCaseForUserSuspend_Stub))
#ifdef FEATURE_SPECIAL_USER_MODE_APC
#define GetRedirectHandlerForApcActivation() \
((PAPCFUNC) GetEEFuncEntryPoint(ApcActivationCallbackStub))
#endif

#if defined(TARGET_AMD64) || defined(TARGET_ARM) || defined(TARGET_ARM64)
#if defined(HAVE_GCCOVER) && defined(USE_REDIRECT_FOR_GCSTRESS) // GCCOVER
Expand All @@ -50,10 +57,6 @@ extern "C" void RedirectedHandledJITCaseForGCStress_Stub(void);
#endif // HAVE_GCCOVER && USE_REDIRECT_FOR_GCSTRESS
#endif // TARGET_AMD64 || TARGET_ARM

#ifdef FEATURE_SPECIAL_USER_MODE_APC
extern "C" void NTAPI ApcActivationCallbackStub(ULONG_PTR Parameter);
#endif

// Every PING_JIT_TIMEOUT ms, check to see if a thread in JITted code has wandered
// into some fully interruptible code (or should have a different hijack to improve
// our chances of snagging it at a safe spot).
Expand Down Expand Up @@ -2490,10 +2493,14 @@ void RedirectedThreadFrame::ExceptionUnwind()

STRESS_LOG1(LF_SYNC, LL_INFO1000, "In RedirectedThreadFrame::ExceptionUnwind pFrame = %p\n", this);

Thread* pThread = GetThread();
if (Thread::UseContextBasedThreadRedirection())
{
Thread* pThread = GetThread();

// Allow future use to avoid repeatedly new'ing
pThread->UnmarkRedirectContextInUse(m_Regs);
}

// Allow future use to avoid repeatedly new'ing
pThread->UnmarkRedirectContextInUse(m_Regs);
m_Regs = NULL;
}

Expand Down Expand Up @@ -3049,11 +3056,21 @@ BOOL Thread::IsAddrOfRedirectFunc(void * pFuncAddr)
return TRUE;
#endif // HAVE_GCCOVER && USE_REDIRECT_FOR_GCSTRESS

return
(pFuncAddr == GetRedirectHandlerForGCThreadControl()) ||
if ((pFuncAddr == GetRedirectHandlerForGCThreadControl()) ||
(pFuncAddr == GetRedirectHandlerForDbgThreadControl()) ||
(pFuncAddr == GetRedirectHandlerForUserSuspend()) ||
(pFuncAddr == ApcActivationCallbackStub);
(pFuncAddr == GetRedirectHandlerForUserSuspend()))
{
return TRUE;
}

#ifdef FEATURE_SPECIAL_USER_MODE_APC
if (pFuncAddr == GetRedirectHandlerForApcActivation())
{
return TRUE;
}
#endif

return FALSE;
}

//************************************************************************
Expand Down Expand Up @@ -5933,7 +5950,11 @@ bool Thread::InjectActivation(ActivationReason reason)

m_hasPendingActivation = true;
BOOL success =
(*s_pfnQueueUserAPC2Proc)(ApcActivationCallback, hThread, (ULONG_PTR)reason, SpecialUserModeApcWithContextFlags);
(*s_pfnQueueUserAPC2Proc)(
GetRedirectHandlerForApcActivation(),
hThread,
(ULONG_PTR)reason,
SpecialUserModeApcWithContextFlags);
_ASSERTE(success);
return true;
#elif defined(TARGET_UNIX)
Expand Down