[Test Only] async safe point interrupts after NOP change#101151

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

Closed
VSadov wants to merge 26 commits into from
Closed

[Test Only] async safe point interrupts after NOP change #101151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
deb49c8
limited number of tests
VSadov Mar 28, 2023
0202981
port suspension algo from NativeAOT
VSadov Apr 27, 2024
c93962b
PING_JIT_TIMEOUT gone
VSadov Apr 27, 2024
67521fa
CatchAtSafePoint is always opportunistic
VSadov Apr 27, 2024
681ee52
current
VSadov Apr 27, 2024
5211e94
removed RareEnablePreemptiveGC
VSadov Apr 27, 2024
22eec41
cleanup RareDisablePreemptiveGC
VSadov Apr 28, 2024
3bcebef
fix for x86
VSadov Apr 28, 2024
fad9a38
factored out Thread::Hijack
VSadov Apr 28, 2024
ddbfd1d
fix build for non-x64 windows
VSadov Apr 28, 2024
1c8a1f2
assert noone holds TSL into coop mode
VSadov Apr 28, 2024
ba455ef
activation safety check is always for the current thread
VSadov Apr 28, 2024
f6854ad
undo comment
VSadov Apr 28, 2024
eb802e2
PulseGCMode should not check for CatchAtSafePointOpportunistic
VSadov Apr 28, 2024
f691e11
not disabling preempt while holding TSL
VSadov Apr 29, 2024
abd6a21
tweak
VSadov Apr 29, 2024
b9d0472
dead assert
VSadov Apr 29, 2024
c38d98c
tweak RareDisablePreemptiveGC
VSadov Apr 29, 2024
e00e19d
RareDisablePreemptiveGC avoid GetSuspensionThread()
VSadov Apr 29, 2024
f941fb6
updated Thread::Hijack
VSadov Apr 30, 2024
6793b21
fix typo
VSadov Apr 30, 2024
1a867fe
allow coop mode while holding TS lock
VSadov Apr 30, 2024
3178b7f
Refactored into SuspendAllThreads/ResumeAllThreads
VSadov Apr 30, 2024
1d6e816
SetThreadTrapForSuspension
VSadov May 1, 2024
7d5435f
deleted TS_GCSuspendPending
VSadov May 1, 2024
b6449b0
tweaks
VSadov May 1, 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
2 changes: 0 additions & 2 deletions docs/design/datacontracts/Thread.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@ enum ThreadState

TS_AbortRequested = 0x00000001, // Abort the thread

TS_GCSuspendPending = 0x00000002, // ThreadSuspend::SuspendRuntime watches this thread to leave coop mode.
TS_GCSuspendRedirected = 0x00000004, // ThreadSuspend::SuspendRuntime has redirected the thread to suspention routine.
TS_GCSuspendFlags = TS_GCSuspendPending | TS_GCSuspendRedirected, // used to track suspension progress. Only SuspendRuntime writes/resets these.

TS_DebugSuspendPending = 0x00000008, // Is the debugger suspending threads?
TS_GCOnTransitions = 0x00000010, // Force a GC on stub transitions (GCStress only)
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/debug/ee/debugger.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3807,7 +3807,7 @@ HANDLE OpenWin32EventOrThrow(
// debugger may not be expecting it. Instead, just leave the lock and retry.
// When we leave, we'll enter coop mode first and get suspended if a suspension is in progress.
// Afterwards, we'll transition back into preemptive mode, and we'll block because this thread
// has been suspended by the debugger (see code:Thread::RareEnablePreemptiveGC).
// has been suspended by the debugger (see code:Thread::RareDisablePreemptiveGC).
#define SENDIPCEVENT_BEGIN_EX(pDebugger, thread, gcxStmt) \
{ \
FireEtwDebugIPCEventStart(); \
Expand Down
8 changes: 0 additions & 8 deletions src/coreclr/nativeaot/Runtime/thread.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -328,14 +328,6 @@ bool Thread::IsGCSpecial()
return IsStateSet(TSF_IsGcSpecialThread);
}

bool Thread::CatchAtSafePoint()
{
// This is only called by the GC on a background GC worker thread that's explicitly interested in letting
// a foreground GC proceed at that point. So it's always safe to return true.
ASSERT(IsGCSpecial());
return true;
}

uint64_t Thread::GetPalThreadIdForLogging()
{
return m_threadId;
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/nativeaot/Runtime/thread.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,6 @@ class Thread : private ThreadBuffer
//
void SetGCSpecial();
bool IsGCSpecial();
bool CatchAtSafePoint();

//
// Managed/unmanaged interop transitions support APIs
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/pal/inc/pal.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3772,7 +3772,7 @@ PALAPI
FlushProcessWriteBuffers();

typedef void (*PAL_ActivationFunction)(CONTEXT *context);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip, BOOL checkingCurrentThread);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip);

PALIMPORT
VOID
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/pal/src/exception/signal.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -833,7 +833,7 @@ static void inject_activation_handler(int code, siginfo_t *siginfo, void *contex
&winContext,
contextFlags);

if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext), /* checkingCurrentThread */ TRUE))
if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext)))
{
g_inject_activation_context_locvar_offset = (int)((char*)&winContext - (char*)__builtin_frame_address(0));
int savedErrNo = errno; // Make sure that errno is not modified
Expand Down
4 changes: 1 addition & 3 deletions src/coreclr/vm/comtoclrcall.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ extern "C" UINT64 __stdcall COMToCLRWorker(Thread *pThread, ComMethodFrame* pFra
// we have additional checks for thread abort that are performed only when
// g_TrapReturningThreads is set.
pThread->m_fPreemptiveGCDisabled.StoreWithoutBarrier(1);
if (g_TrapReturningThreads.LoadWithoutBarrier())
if (g_TrapReturningThreads)
{
hr = StubRareDisableHRWorker(pThread);
if (S_OK != hr)
Expand DownExpand Up@@ -1339,14 +1339,12 @@ Stub* ComCall::CreateGenericComCallStub(BOOL isFieldAccess)
// ends up throwing an OOM exception.

CodeLabel* rgRareLabels[] = {
psl->NewCodeLabel(),
psl->NewCodeLabel(),
psl->NewCodeLabel()
};


CodeLabel* rgRejoinLabels[] = {
psl->NewCodeLabel(),
psl->NewCodeLabel(),
psl->NewCodeLabel()
};
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/eedbginterfaceimpl.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -652,7 +652,7 @@ void EEDbgInterfaceImpl::EnablePreemptiveGC(void)
CONTRACTL
{
NOTHROW;
DISABLED(GC_TRIGGERS); // Disabled because disabled in RareEnablePreemptiveGC()
GC_NOTRIGGER;
}
CONTRACTL_END;

Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/fcall.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ NOINLINE Object* FC_GCPoll(void* __me, Object* objToProtect)
INCONTRACT(FCallCheck __fCallCheck(__FILE__, __LINE__));

Thread *thread = GetThread();
if (thread->CatchAtSafePointOpportunistic()) // Does someone want this thread stopped?
if (thread->CatchAtSafePoint()) // Does someone want this thread stopped?
{
HELPER_METHOD_FRAME_BEGIN_RET_ATTRIB_1(Frame::FRAME_ATTR_CAPTURE_DEPTH_2, objToProtect);

Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/vm/fcall.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -809,7 +809,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
{ \
INCONTRACT(Thread::TriggersGC(GetThread());) \
INCONTRACT(__fCallCheck.SetDidPoll();) \
if (g_TrapReturningThreads.LoadWithoutBarrier()) \
if (g_TrapReturningThreads) \
{ \
if (FC_GCPoll(__me)) \
return ret; \
Expand All@@ -824,7 +824,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
{ \
INCONTRACT(__fCallCheck.SetDidPoll();) \
Object* __temp = OBJECTREFToObject(obj); \
if (g_TrapReturningThreads.LoadWithoutBarrier()) \
if (g_TrapReturningThreads) \
{ \
__temp = FC_GCPoll(__me, __temp); \
while (0 == FC_NO_TAILCALL) { }; /* side effect the compile can't remove */ \
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/frames.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1332,7 +1332,7 @@ class HelperMethodFrame : public Frame
FORCEINLINE void Poll()
{
WRAPPER_NO_CONTRACT;
if (m_pThread->CatchAtSafePointOpportunistic())
if (m_pThread->CatchAtSafePoint())
CommonTripThread();
}
#endif // DACCESS_COMPILE
Expand Down
25 changes: 0 additions & 25 deletions src/coreclr/vm/i386/asmhelpers.S
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,31 +126,6 @@ LEAF_ENTRY RestoreFPUContext, _TEXT
ret 4
LEAF_END RestoreFPUContext, _TEXT

// -----------------------------------------------------------------------
// The out-of-line portion of the code to enable preemptive GC.
// After the work is done, the code jumps back to the "pRejoinPoint"
// which should be emitted right after the inline part is generated.
//
// Assumptions:
// ebx = Thread
// Preserves
// all registers except ecx.
//
// -----------------------------------------------------------------------
NESTED_ENTRY StubRareEnable, _TEXT, NoHandler
push eax
push edx

push ebx

CHECK_STACK_ALIGNMENT
call C_FUNC(StubRareEnableWorker)

pop edx
pop eax
ret
NESTED_END StubRareEnable, _TEXT

NESTED_ENTRY StubRareDisableTHROW, _TEXT, NoHandler
push eax
push edx
Expand Down
24 changes: 0 additions & 24 deletions src/coreclr/vm/i386/asmhelpers.asm
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ EXTERN __imp__RtlUnwind@16:DWORD
ifdef _DEBUG
EXTERN _HelperMethodFrameConfirmState@20:PROC
endif
EXTERN _StubRareEnableWorker@4:PROC
ifdef FEATURE_COMINTEROP
EXTERN _StubRareDisableHRWorker@4:PROC
endif ; FEATURE_COMINTEROP
Expand DownExpand Up@@ -394,29 +393,6 @@ endif
retn 8
_CallJitEHFinallyHelper@8 ENDP

;-----------------------------------------------------------------------
; The out-of-line portion of the code to enable preemptive GC.
; After the work is done, the code jumps back to the "pRejoinPoint"
; which should be emitted right after the inline part is generated.
;
; Assumptions:
; ebx = Thread
; Preserves
; all registers except ecx.
;
;-----------------------------------------------------------------------
_StubRareEnable proc public
push eax
push edx

push ebx
call _StubRareEnableWorker@4

pop edx
pop eax
retn
_StubRareEnable ENDP

ifdef FEATURE_COMINTEROP
_StubRareDisableHR proc public
push edx
Expand Down
12 changes: 0 additions & 12 deletions src/coreclr/vm/i386/cgenx86.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -911,18 +911,6 @@ Stub *GenerateInitPInvokeFrameHelper()
RETURN psl->Link(SystemDomain::GetGlobalLoaderAllocator()->GetExecutableHeap());
}


extern "C" VOID STDCALL StubRareEnableWorker(Thread *pThread)
{
WRAPPER_NO_CONTRACT;

//printf("RareEnable\n");
pThread->RareEnablePreemptiveGC();
}




// Disable when calling into managed code from a place that fails via Exceptions
extern "C" VOID STDCALL StubRareDisableTHROWWorker(Thread *pThread)
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[Test Only] async safe point interrupts after NOP change#101151

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

 Closed

VSadov
wants to merge
26
commits into

from

 Closed


[Test Only] async safe point interrupts after NOP change
#101151
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
deb49c8

limited number of tests


VSadov Mar 28, 2023
0202981

port suspension algo from NativeAOT


VSadov Apr 27, 2024
c93962b

PING_JIT_TIMEOUT gone


VSadov Apr 27, 2024
67521fa

CatchAtSafePoint is always opportunistic


VSadov Apr 27, 2024
681ee52

current


VSadov Apr 27, 2024
5211e94

removed RareEnablePreemptiveGC


VSadov Apr 27, 2024
22eec41

cleanup RareDisablePreemptiveGC


VSadov Apr 28, 2024
3bcebef

fix for x86


VSadov Apr 28, 2024
fad9a38

factored out Thread::Hijack


VSadov Apr 28, 2024
ddbfd1d

fix build for non-x64 windows


VSadov Apr 28, 2024
1c8a1f2

assert noone holds TSL into coop mode


VSadov Apr 28, 2024
ba455ef

activation safety check is always for the current thread


VSadov Apr 28, 2024
f6854ad

undo comment


VSadov Apr 28, 2024
eb802e2

PulseGCMode should not check for CatchAtSafePointOpportunistic


VSadov Apr 28, 2024
f691e11

not disabling preempt while holding TSL


VSadov Apr 29, 2024
abd6a21

tweak


VSadov Apr 29, 2024
b9d0472

dead assert


VSadov Apr 29, 2024
c38d98c

tweak RareDisablePreemptiveGC


VSadov Apr 29, 2024
e00e19d

RareDisablePreemptiveGC avoid GetSuspensionThread()


VSadov Apr 29, 2024
f941fb6

updated Thread::Hijack


VSadov Apr 30, 2024
6793b21

fix typo


VSadov Apr 30, 2024
1a867fe

allow coop mode while holding TS lock


VSadov Apr 30, 2024
3178b7f

Refactored into SuspendAllThreads/ResumeAllThreads


VSadov Apr 30, 2024
1d6e816

SetThreadTrapForSuspension


VSadov May 1, 2024
7d5435f

deleted TS_GCSuspendPending


VSadov May 1, 2024
b6449b0

tweaks


VSadov May 1, 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


2 changes: 0 additions & 2 deletions
docs/design/datacontracts/Thread.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@ enum ThreadState

 TS_AbortRequested = 0x00000001, // Abort the thread

 TS_GCSuspendPending = 0x00000002, // ThreadSuspend::SuspendRuntime watches this thread to leave coop mode.
 TS_GCSuspendRedirected = 0x00000004, // ThreadSuspend::SuspendRuntime has redirected the thread to suspention routine.
 TS_GCSuspendFlags = TS_GCSuspendPending | TS_GCSuspendRedirected, // used to track suspension progress. Only SuspendRuntime writes/resets these.

 TS_DebugSuspendPending = 0x00000008, // Is the debugger suspending threads?
 TS_GCOnTransitions = 0x00000010, // Force a GC on stub transitions (GCStress only)
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/debug/ee/debugger.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3807,7 +3807,7 @@ HANDLE OpenWin32EventOrThrow(
// debugger may not be expecting it. Instead, just leave the lock and retry.
// When we leave, we'll enter coop mode first and get suspended if a suspension is in progress.
// Afterwards, we'll transition back into preemptive mode, and we'll block because this thread
// has been suspended by the debugger (see code:Thread::RareEnablePreemptiveGC).
// has been suspended by the debugger (see code:Thread::RareDisablePreemptiveGC).
#define SENDIPCEVENT_BEGIN_EX(pDebugger, thread, gcxStmt) \
 { \
 FireEtwDebugIPCEventStart(); \
Expand Down

8 changes: 0 additions & 8 deletions
src/coreclr/nativeaot/Runtime/thread.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,14 +328,6 @@ bool Thread::IsGCSpecial()
 return IsStateSet(TSF_IsGcSpecialThread);
}

bool Thread::CatchAtSafePoint()
{
 // This is only called by the GC on a background GC worker thread that's explicitly interested in letting
 // a foreground GC proceed at that point. So it's always safe to return true.
 ASSERT(IsGCSpecial());
 return true;
}

uint64_t Thread::GetPalThreadIdForLogging()
{
 return m_threadId;
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/nativeaot/Runtime/thread.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,6 @@ class Thread : private ThreadBuffer
 //
 void SetGCSpecial();
 bool IsGCSpecial();
 bool CatchAtSafePoint();

 //
 // Managed/unmanaged interop transitions support APIs
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/pal/inc/pal.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3772,7 +3772,7 @@ PALAPI
FlushProcessWriteBuffers();

typedef void (*PAL_ActivationFunction)(CONTEXT *context);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip, BOOL checkingCurrentThread);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip);

PALIMPORT
VOID
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/pal/src/exception/signal.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -833,7 +833,7 @@ static void inject_activation_handler(int code, siginfo_t *siginfo, void *contex
 &winContext,
 contextFlags);

 if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext), /* checkingCurrentThread */ TRUE))
 if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext)))
 {
 g_inject_activation_context_locvar_offset = (int)((char*)&winContext - (char*)__builtin_frame_address(0));
 int savedErrNo = errno; // Make sure that errno is not modified
Expand Down

4 changes: 1 addition & 3 deletions
src/coreclr/vm/comtoclrcall.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ extern "C" UINT64 __stdcall COMToCLRWorker(Thread *pThread, ComMethodFrame* pFra
 // we have additional checks for thread abort that are performed only when
 // g_TrapReturningThreads is set.
 pThread->m_fPreemptiveGCDisabled.StoreWithoutBarrier(1);
 if (g_TrapReturningThreads.LoadWithoutBarrier())
 if (g_TrapReturningThreads)
 {
 hr = StubRareDisableHRWorker(pThread);
 if (S_OK != hr)
Expand DownExpand Up@@ -1339,14 +1339,12 @@ Stub* ComCall::CreateGenericComCallStub(BOOL isFieldAccess)
 // ends up throwing an OOM exception.

 CodeLabel* rgRareLabels[] = {
 psl->NewCodeLabel(),
 psl->NewCodeLabel(),
 psl->NewCodeLabel()
 };


 CodeLabel* rgRejoinLabels[] = {
 psl->NewCodeLabel(),
 psl->NewCodeLabel(),
 psl->NewCodeLabel()
 };
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/eedbginterfaceimpl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,7 +652,7 @@ void EEDbgInterfaceImpl::EnablePreemptiveGC(void)
 CONTRACTL
 {
 NOTHROW;
DISABLED(GC_TRIGGERS); // Disabled because disabled in RareEnablePreemptiveGC()
GC_NOTRIGGER;
 }
 CONTRACTL_END;

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/fcall.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ NOINLINE Object* FC_GCPoll(void* __me, Object* objToProtect)
 INCONTRACT(FCallCheck __fCallCheck(__FILE__, __LINE__));

 Thread *thread = GetThread();
 if (thread->CatchAtSafePointOpportunistic()) // Does someone want this thread stopped?
 if (thread->CatchAtSafePoint()) // Does someone want this thread stopped?
 {
 HELPER_METHOD_FRAME_BEGIN_RET_ATTRIB_1(Frame::FRAME_ATTR_CAPTURE_DEPTH_2, objToProtect);

Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/vm/fcall.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -809,7 +809,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
 { \
 INCONTRACT(Thread::TriggersGC(GetThread());) \
 INCONTRACT(__fCallCheck.SetDidPoll();) \
 if (g_TrapReturningThreads.LoadWithoutBarrier()) \
 if (g_TrapReturningThreads) \
 { \
 if (FC_GCPoll(__me)) \
 return ret; \
Expand All@@ -824,7 +824,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
 { \
 INCONTRACT(__fCallCheck.SetDidPoll();) \
 Object* __temp = OBJECTREFToObject(obj); \
 if (g_TrapReturningThreads.LoadWithoutBarrier()) \
 if (g_TrapReturningThreads) \
 { \
 __temp = FC_GCPoll(__me, __temp); \
 while (0 == FC_NO_TAILCALL) { }; /* side effect the compile can't remove */ \
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/frames.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1332,7 +1332,7 @@ class HelperMethodFrame : public Frame
 FORCEINLINE void Poll()
 {
 WRAPPER_NO_CONTRACT;
 if (m_pThread->CatchAtSafePointOpportunistic())
 if (m_pThread->CatchAtSafePoint())
 CommonTripThread();
 }
#endif // DACCESS_COMPILE
Expand Down

25 changes: 0 additions & 25 deletions
src/coreclr/vm/i386/asmhelpers.S

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,31 +126,6 @@ LEAF_ENTRY RestoreFPUContext, _TEXT
 ret 4
LEAF_END RestoreFPUContext, _TEXT

// -----------------------------------------------------------------------
// The out-of-line portion of the code to enable preemptive GC.
// After the work is done, the code jumps back to the "pRejoinPoint"
// which should be emitted right after the inline part is generated.
//
// Assumptions:
// ebx = Thread
// Preserves
// all registers except ecx.
//
// -----------------------------------------------------------------------
NESTED_ENTRY StubRareEnable, _TEXT, NoHandler
 push eax
 push edx

 push ebx

 CHECK_STACK_ALIGNMENT
 call C_FUNC(StubRareEnableWorker)

 pop edx
 pop eax
 ret
NESTED_END StubRareEnable, _TEXT

NESTED_ENTRY StubRareDisableTHROW, _TEXT, NoHandler
 push eax
 push edx
Expand Down

24 changes: 0 additions & 24 deletions
src/coreclr/vm/i386/asmhelpers.asm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ EXTERN __imp__RtlUnwind@16:DWORD
ifdef _DEBUG
EXTERN _HelperMethodFrameConfirmState@20:PROC
endif
EXTERN _StubRareEnableWorker@4:PROC
ifdef FEATURE_COMINTEROP
EXTERN _StubRareDisableHRWorker@4:PROC
endif ; FEATURE_COMINTEROP
Expand DownExpand Up@@ -394,29 +393,6 @@ endif
 retn 8
_CallJitEHFinallyHelper@8 ENDP

;-----------------------------------------------------------------------
; The out-of-line portion of the code to enable preemptive GC.
; After the work is done, the code jumps back to the "pRejoinPoint"
; which should be emitted right after the inline part is generated.
;
; Assumptions:
; ebx = Thread
; Preserves
; all registers except ecx.
;
;-----------------------------------------------------------------------
_StubRareEnable proc public
 push eax
 push edx

 push ebx
 call _StubRareEnableWorker@4

 pop edx
 pop eax
 retn
_StubRareEnable ENDP

ifdef FEATURE_COMINTEROP
_StubRareDisableHR proc public
 push edx
Expand Down

12 changes: 0 additions & 12 deletions
src/coreclr/vm/i386/cgenx86.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -911,18 +911,6 @@ Stub *GenerateInitPInvokeFrameHelper()
 RETURN psl->Link(SystemDomain::GetGlobalLoaderAllocator()->GetExecutableHeap());
}


extern "C" VOID STDCALL StubRareEnableWorker(Thread *pThread)
{
 WRAPPER_NO_CONTRACT;

 //printf("RareEnable\n");
 pThread->RareEnablePreemptiveGC();
}




// Disable when calling into managed code from a place that fails via Exceptions
extern "C" VOID STDCALL StubRareDisableTHROWWorker(Thread *pThread)
{
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Test Only] async safe point interrupts after NOP change#101151

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

 Closed

VSadov
wants to merge
26
commits into

from

 Closed


[Test Only] async safe point interrupts after NOP change
#101151
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
deb49c8

limited number of tests


VSadov Mar 28, 2023
0202981

port suspension algo from NativeAOT


VSadov Apr 27, 2024
c93962b

PING_JIT_TIMEOUT gone


VSadov Apr 27, 2024
67521fa

CatchAtSafePoint is always opportunistic


VSadov Apr 27, 2024
681ee52

current


VSadov Apr 27, 2024
5211e94

removed RareEnablePreemptiveGC


VSadov Apr 27, 2024
22eec41

cleanup RareDisablePreemptiveGC


VSadov Apr 28, 2024
3bcebef

fix for x86


VSadov Apr 28, 2024
fad9a38

factored out Thread::Hijack


VSadov Apr 28, 2024
ddbfd1d

fix build for non-x64 windows


VSadov Apr 28, 2024
1c8a1f2

assert noone holds TSL into coop mode


VSadov Apr 28, 2024
ba455ef

activation safety check is always for the current thread


VSadov Apr 28, 2024
f6854ad

undo comment


VSadov Apr 28, 2024
eb802e2

PulseGCMode should not check for CatchAtSafePointOpportunistic


VSadov Apr 28, 2024
f691e11

not disabling preempt while holding TSL


VSadov Apr 29, 2024
abd6a21

tweak


VSadov Apr 29, 2024
b9d0472

dead assert


VSadov Apr 29, 2024
c38d98c

tweak RareDisablePreemptiveGC


VSadov Apr 29, 2024
e00e19d

RareDisablePreemptiveGC avoid GetSuspensionThread()


VSadov Apr 29, 2024
f941fb6

updated Thread::Hijack


VSadov Apr 30, 2024
6793b21

fix typo


VSadov Apr 30, 2024
1a867fe

allow coop mode while holding TS lock


VSadov Apr 30, 2024
3178b7f

Refactored into SuspendAllThreads/ResumeAllThreads


VSadov Apr 30, 2024
1d6e816

SetThreadTrapForSuspension


VSadov May 1, 2024
7d5435f

deleted TS_GCSuspendPending


VSadov May 1, 2024
b6449b0

tweaks


VSadov May 1, 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


2 changes: 0 additions & 2 deletions
docs/design/datacontracts/Thread.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@ enum ThreadState

 TS_AbortRequested = 0x00000001, // Abort the thread

 TS_GCSuspendPending = 0x00000002, // ThreadSuspend::SuspendRuntime watches this thread to leave coop mode.
 TS_GCSuspendRedirected = 0x00000004, // ThreadSuspend::SuspendRuntime has redirected the thread to suspention routine.
 TS_GCSuspendFlags = TS_GCSuspendPending | TS_GCSuspendRedirected, // used to track suspension progress. Only SuspendRuntime writes/resets these.

 TS_DebugSuspendPending = 0x00000008, // Is the debugger suspending threads?
 TS_GCOnTransitions = 0x00000010, // Force a GC on stub transitions (GCStress only)
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/debug/ee/debugger.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3807,7 +3807,7 @@ HANDLE OpenWin32EventOrThrow(
// debugger may not be expecting it. Instead, just leave the lock and retry.
// When we leave, we'll enter coop mode first and get suspended if a suspension is in progress.
// Afterwards, we'll transition back into preemptive mode, and we'll block because this thread
// has been suspended by the debugger (see code:Thread::RareEnablePreemptiveGC).
// has been suspended by the debugger (see code:Thread::RareDisablePreemptiveGC).
#define SENDIPCEVENT_BEGIN_EX(pDebugger, thread, gcxStmt) \
 { \
 FireEtwDebugIPCEventStart(); \
Expand Down

8 changes: 0 additions & 8 deletions
src/coreclr/nativeaot/Runtime/thread.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,14 +328,6 @@ bool Thread::IsGCSpecial()
 return IsStateSet(TSF_IsGcSpecialThread);
}

bool Thread::CatchAtSafePoint()
{
 // This is only called by the GC on a background GC worker thread that's explicitly interested in letting
 // a foreground GC proceed at that point. So it's always safe to return true.
 ASSERT(IsGCSpecial());
 return true;
}

uint64_t Thread::GetPalThreadIdForLogging()
{
 return m_threadId;
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/nativeaot/Runtime/thread.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,6 @@ class Thread : private ThreadBuffer
 //
 void SetGCSpecial();
 bool IsGCSpecial();
 bool CatchAtSafePoint();

 //
 // Managed/unmanaged interop transitions support APIs
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/pal/inc/pal.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3772,7 +3772,7 @@ PALAPI
FlushProcessWriteBuffers();

typedef void (*PAL_ActivationFunction)(CONTEXT *context);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip, BOOL checkingCurrentThread);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip);

PALIMPORT
VOID
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/pal/src/exception/signal.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -833,7 +833,7 @@ static void inject_activation_handler(int code, siginfo_t *siginfo, void *contex
 &winContext,
 contextFlags);

 if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext), /* checkingCurrentThread */ TRUE))
 if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext)))
 {
 g_inject_activation_context_locvar_offset = (int)((char*)&winContext - (char*)__builtin_frame_address(0));
 int savedErrNo = errno; // Make sure that errno is not modified
Expand Down

4 changes: 1 addition & 3 deletions
src/coreclr/vm/comtoclrcall.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ extern "C" UINT64 __stdcall COMToCLRWorker(Thread *pThread, ComMethodFrame* pFra
 // we have additional checks for thread abort that are performed only when
 // g_TrapReturningThreads is set.
 pThread->m_fPreemptiveGCDisabled.StoreWithoutBarrier(1);
 if (g_TrapReturningThreads.LoadWithoutBarrier())
 if (g_TrapReturningThreads)
 {
 hr = StubRareDisableHRWorker(pThread);
 if (S_OK != hr)
Expand DownExpand Up@@ -1339,14 +1339,12 @@ Stub* ComCall::CreateGenericComCallStub(BOOL isFieldAccess)
 // ends up throwing an OOM exception.

 CodeLabel* rgRareLabels[] = {
 psl->NewCodeLabel(),
 psl->NewCodeLabel(),
 psl->NewCodeLabel()
 };


 CodeLabel* rgRejoinLabels[] = {
 psl->NewCodeLabel(),
 psl->NewCodeLabel(),
 psl->NewCodeLabel()
 };
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/eedbginterfaceimpl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,7 +652,7 @@ void EEDbgInterfaceImpl::EnablePreemptiveGC(void)
 CONTRACTL
 {
 NOTHROW;
DISABLED(GC_TRIGGERS); // Disabled because disabled in RareEnablePreemptiveGC()
GC_NOTRIGGER;
 }
 CONTRACTL_END;

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/fcall.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ NOINLINE Object* FC_GCPoll(void* __me, Object* objToProtect)
 INCONTRACT(FCallCheck __fCallCheck(__FILE__, __LINE__));

 Thread *thread = GetThread();
 if (thread->CatchAtSafePointOpportunistic()) // Does someone want this thread stopped?
 if (thread->CatchAtSafePoint()) // Does someone want this thread stopped?
 {
 HELPER_METHOD_FRAME_BEGIN_RET_ATTRIB_1(Frame::FRAME_ATTR_CAPTURE_DEPTH_2, objToProtect);

Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/vm/fcall.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -809,7 +809,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
 { \
 INCONTRACT(Thread::TriggersGC(GetThread());) \
 INCONTRACT(__fCallCheck.SetDidPoll();) \
 if (g_TrapReturningThreads.LoadWithoutBarrier()) \
 if (g_TrapReturningThreads) \
 { \
 if (FC_GCPoll(__me)) \
 return ret; \
Expand All@@ -824,7 +824,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
 { \
 INCONTRACT(__fCallCheck.SetDidPoll();) \
 Object* __temp = OBJECTREFToObject(obj); \
 if (g_TrapReturningThreads.LoadWithoutBarrier()) \
 if (g_TrapReturningThreads) \
 { \
 __temp = FC_GCPoll(__me, __temp); \
 while (0 == FC_NO_TAILCALL) { }; /* side effect the compile can't remove */ \
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/frames.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1332,7 +1332,7 @@ class HelperMethodFrame : public Frame
 FORCEINLINE void Poll()
 {
 WRAPPER_NO_CONTRACT;
 if (m_pThread->CatchAtSafePointOpportunistic())
 if (m_pThread->CatchAtSafePoint())
 CommonTripThread();
 }
#endif // DACCESS_COMPILE
Expand Down

25 changes: 0 additions & 25 deletions
src/coreclr/vm/i386/asmhelpers.S

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,31 +126,6 @@ LEAF_ENTRY RestoreFPUContext, _TEXT
 ret 4
LEAF_END RestoreFPUContext, _TEXT

// -----------------------------------------------------------------------
// The out-of-line portion of the code to enable preemptive GC.
// After the work is done, the code jumps back to the "pRejoinPoint"
// which should be emitted right after the inline part is generated.
//
// Assumptions:
// ebx = Thread
// Preserves
// all registers except ecx.
//
// -----------------------------------------------------------------------
NESTED_ENTRY StubRareEnable, _TEXT, NoHandler
 push eax
 push edx

 push ebx

 CHECK_STACK_ALIGNMENT
 call C_FUNC(StubRareEnableWorker)

 pop edx
 pop eax
 ret
NESTED_END StubRareEnable, _TEXT

NESTED_ENTRY StubRareDisableTHROW, _TEXT, NoHandler
 push eax
 push edx
Expand Down

24 changes: 0 additions & 24 deletions
src/coreclr/vm/i386/asmhelpers.asm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ EXTERN __imp__RtlUnwind@16:DWORD
ifdef _DEBUG
EXTERN _HelperMethodFrameConfirmState@20:PROC
endif
EXTERN _StubRareEnableWorker@4:PROC
ifdef FEATURE_COMINTEROP
EXTERN _StubRareDisableHRWorker@4:PROC
endif ; FEATURE_COMINTEROP
Expand DownExpand Up@@ -394,29 +393,6 @@ endif
 retn 8
_CallJitEHFinallyHelper@8 ENDP

;-----------------------------------------------------------------------
; The out-of-line portion of the code to enable preemptive GC.
; After the work is done, the code jumps back to the "pRejoinPoint"
; which should be emitted right after the inline part is generated.
;
; Assumptions:
; ebx = Thread
; Preserves
; all registers except ecx.
;
;-----------------------------------------------------------------------
_StubRareEnable proc public
 push eax
 push edx

 push ebx
 call _StubRareEnableWorker@4

 pop edx
 pop eax
 retn
_StubRareEnable ENDP

ifdef FEATURE_COMINTEROP
_StubRareDisableHR proc public
 push edx
Expand Down

12 changes: 0 additions & 12 deletions
src/coreclr/vm/i386/cgenx86.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -911,18 +911,6 @@ Stub *GenerateInitPInvokeFrameHelper()
 RETURN psl->Link(SystemDomain::GetGlobalLoaderAllocator()->GetExecutableHeap());
}


extern "C" VOID STDCALL StubRareEnableWorker(Thread *pThread)
{
 WRAPPER_NO_CONTRACT;

 //printf("RareEnable\n");
 pThread->RareEnablePreemptiveGC();
}




// Disable when calling into managed code from a place that fails via Exceptions
extern "C" VOID STDCALL StubRareDisableTHROWWorker(Thread *pThread)
{
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Test Only] async safe point interrupts after NOP change#101151

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

 Closed

VSadov
wants to merge
26
commits into

from

 Closed


[Test Only] async safe point interrupts after NOP change
#101151
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
deb49c8

limited number of tests


VSadov Mar 28, 2023
0202981

port suspension algo from NativeAOT


VSadov Apr 27, 2024
c93962b

PING_JIT_TIMEOUT gone


VSadov Apr 27, 2024
67521fa

CatchAtSafePoint is always opportunistic


VSadov Apr 27, 2024
681ee52

current


VSadov Apr 27, 2024
5211e94

removed RareEnablePreemptiveGC


VSadov Apr 27, 2024
22eec41

cleanup RareDisablePreemptiveGC


VSadov Apr 28, 2024
3bcebef

fix for x86


VSadov Apr 28, 2024
fad9a38

factored out Thread::Hijack


VSadov Apr 28, 2024
ddbfd1d

fix build for non-x64 windows


VSadov Apr 28, 2024
1c8a1f2

assert noone holds TSL into coop mode


VSadov Apr 28, 2024
ba455ef

activation safety check is always for the current thread


VSadov Apr 28, 2024
f6854ad

undo comment


VSadov Apr 28, 2024
eb802e2

PulseGCMode should not check for CatchAtSafePointOpportunistic


VSadov Apr 28, 2024
f691e11

not disabling preempt while holding TSL


VSadov Apr 29, 2024
abd6a21

tweak


VSadov Apr 29, 2024
b9d0472

dead assert


VSadov Apr 29, 2024
c38d98c

tweak RareDisablePreemptiveGC


VSadov Apr 29, 2024
e00e19d

RareDisablePreemptiveGC avoid GetSuspensionThread()


VSadov Apr 29, 2024
f941fb6

updated Thread::Hijack


VSadov Apr 30, 2024
6793b21

fix typo


VSadov Apr 30, 2024
1a867fe

allow coop mode while holding TS lock


VSadov Apr 30, 2024
3178b7f

Refactored into SuspendAllThreads/ResumeAllThreads


VSadov Apr 30, 2024
1d6e816

SetThreadTrapForSuspension


VSadov May 1, 2024
7d5435f

deleted TS_GCSuspendPending


VSadov May 1, 2024
b6449b0

tweaks


VSadov May 1, 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


2 changes: 0 additions & 2 deletions
docs/design/datacontracts/Thread.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@ enum ThreadState

 TS_AbortRequested = 0x00000001, // Abort the thread

 TS_GCSuspendPending = 0x00000002, // ThreadSuspend::SuspendRuntime watches this thread to leave coop mode.
 TS_GCSuspendRedirected = 0x00000004, // ThreadSuspend::SuspendRuntime has redirected the thread to suspention routine.
 TS_GCSuspendFlags = TS_GCSuspendPending | TS_GCSuspendRedirected, // used to track suspension progress. Only SuspendRuntime writes/resets these.

 TS_DebugSuspendPending = 0x00000008, // Is the debugger suspending threads?
 TS_GCOnTransitions = 0x00000010, // Force a GC on stub transitions (GCStress only)
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/debug/ee/debugger.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3807,7 +3807,7 @@ HANDLE OpenWin32EventOrThrow(
// debugger may not be expecting it. Instead, just leave the lock and retry.
// When we leave, we'll enter coop mode first and get suspended if a suspension is in progress.
// Afterwards, we'll transition back into preemptive mode, and we'll block because this thread
// has been suspended by the debugger (see code:Thread::RareEnablePreemptiveGC).
// has been suspended by the debugger (see code:Thread::RareDisablePreemptiveGC).
#define SENDIPCEVENT_BEGIN_EX(pDebugger, thread, gcxStmt) \
 { \
 FireEtwDebugIPCEventStart(); \
Expand Down

8 changes: 0 additions & 8 deletions
src/coreclr/nativeaot/Runtime/thread.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,14 +328,6 @@ bool Thread::IsGCSpecial()
 return IsStateSet(TSF_IsGcSpecialThread);
}

bool Thread::CatchAtSafePoint()
{
 // This is only called by the GC on a background GC worker thread that's explicitly interested in letting
 // a foreground GC proceed at that point. So it's always safe to return true.
 ASSERT(IsGCSpecial());
 return true;
}

uint64_t Thread::GetPalThreadIdForLogging()
{
 return m_threadId;
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/nativeaot/Runtime/thread.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,6 @@ class Thread : private ThreadBuffer
 //
 void SetGCSpecial();
 bool IsGCSpecial();
 bool CatchAtSafePoint();

 //
 // Managed/unmanaged interop transitions support APIs
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/pal/inc/pal.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3772,7 +3772,7 @@ PALAPI
FlushProcessWriteBuffers();

typedef void (*PAL_ActivationFunction)(CONTEXT *context);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip, BOOL checkingCurrentThread);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip);

PALIMPORT
VOID
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/pal/src/exception/signal.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -833,7 +833,7 @@ static void inject_activation_handler(int code, siginfo_t *siginfo, void *contex
 &winContext,
 contextFlags);

 if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext), /* checkingCurrentThread */ TRUE))
 if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext)))
 {
 g_inject_activation_context_locvar_offset = (int)((char*)&winContext - (char*)__builtin_frame_address(0));
 int savedErrNo = errno; // Make sure that errno is not modified
Expand Down

4 changes: 1 addition & 3 deletions
src/coreclr/vm/comtoclrcall.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ extern "C" UINT64 __stdcall COMToCLRWorker(Thread *pThread, ComMethodFrame* pFra
 // we have additional checks for thread abort that are performed only when
 // g_TrapReturningThreads is set.
 pThread->m_fPreemptiveGCDisabled.StoreWithoutBarrier(1);
 if (g_TrapReturningThreads.LoadWithoutBarrier())
 if (g_TrapReturningThreads)
 {
 hr = StubRareDisableHRWorker(pThread);
 if (S_OK != hr)
Expand DownExpand Up@@ -1339,14 +1339,12 @@ Stub* ComCall::CreateGenericComCallStub(BOOL isFieldAccess)
 // ends up throwing an OOM exception.

 CodeLabel* rgRareLabels[] = {
 psl->NewCodeLabel(),
 psl->NewCodeLabel(),
 psl->NewCodeLabel()
 };


 CodeLabel* rgRejoinLabels[] = {
 psl->NewCodeLabel(),
 psl->NewCodeLabel(),
 psl->NewCodeLabel()
 };
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/eedbginterfaceimpl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,7 +652,7 @@ void EEDbgInterfaceImpl::EnablePreemptiveGC(void)
 CONTRACTL
 {
 NOTHROW;
DISABLED(GC_TRIGGERS); // Disabled because disabled in RareEnablePreemptiveGC()
GC_NOTRIGGER;
 }
 CONTRACTL_END;

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/fcall.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ NOINLINE Object* FC_GCPoll(void* __me, Object* objToProtect)
 INCONTRACT(FCallCheck __fCallCheck(__FILE__, __LINE__));

 Thread *thread = GetThread();
 if (thread->CatchAtSafePointOpportunistic()) // Does someone want this thread stopped?
 if (thread->CatchAtSafePoint()) // Does someone want this thread stopped?
 {
 HELPER_METHOD_FRAME_BEGIN_RET_ATTRIB_1(Frame::FRAME_ATTR_CAPTURE_DEPTH_2, objToProtect);

Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/vm/fcall.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -809,7 +809,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
 { \
 INCONTRACT(Thread::TriggersGC(GetThread());) \
 INCONTRACT(__fCallCheck.SetDidPoll();) \
 if (g_TrapReturningThreads.LoadWithoutBarrier()) \
 if (g_TrapReturningThreads) \
 { \
 if (FC_GCPoll(__me)) \
 return ret; \
Expand All@@ -824,7 +824,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
 { \
 INCONTRACT(__fCallCheck.SetDidPoll();) \
 Object* __temp = OBJECTREFToObject(obj); \
 if (g_TrapReturningThreads.LoadWithoutBarrier()) \
 if (g_TrapReturningThreads) \
 { \
 __temp = FC_GCPoll(__me, __temp); \
 while (0 == FC_NO_TAILCALL) { }; /* side effect the compile can't remove */ \
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/frames.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1332,7 +1332,7 @@ class HelperMethodFrame : public Frame
 FORCEINLINE void Poll()
 {
 WRAPPER_NO_CONTRACT;
 if (m_pThread->CatchAtSafePointOpportunistic())
 if (m_pThread->CatchAtSafePoint())
 CommonTripThread();
 }
#endif // DACCESS_COMPILE
Expand Down

25 changes: 0 additions & 25 deletions
src/coreclr/vm/i386/asmhelpers.S

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,31 +126,6 @@ LEAF_ENTRY RestoreFPUContext, _TEXT
 ret 4
LEAF_END RestoreFPUContext, _TEXT

// -----------------------------------------------------------------------
// The out-of-line portion of the code to enable preemptive GC.
// After the work is done, the code jumps back to the "pRejoinPoint"
// which should be emitted right after the inline part is generated.
//
// Assumptions:
// ebx = Thread
// Preserves
// all registers except ecx.
//
// -----------------------------------------------------------------------
NESTED_ENTRY StubRareEnable, _TEXT, NoHandler
 push eax
 push edx

 push ebx

 CHECK_STACK_ALIGNMENT
 call C_FUNC(StubRareEnableWorker)

 pop edx
 pop eax
 ret
NESTED_END StubRareEnable, _TEXT

NESTED_ENTRY StubRareDisableTHROW, _TEXT, NoHandler
 push eax
 push edx
Expand Down

24 changes: 0 additions & 24 deletions
src/coreclr/vm/i386/asmhelpers.asm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ EXTERN __imp__RtlUnwind@16:DWORD
ifdef _DEBUG
EXTERN _HelperMethodFrameConfirmState@20:PROC
endif
EXTERN _StubRareEnableWorker@4:PROC
ifdef FEATURE_COMINTEROP
EXTERN _StubRareDisableHRWorker@4:PROC
endif ; FEATURE_COMINTEROP
Expand DownExpand Up@@ -394,29 +393,6 @@ endif
 retn 8
_CallJitEHFinallyHelper@8 ENDP

;-----------------------------------------------------------------------
; The out-of-line portion of the code to enable preemptive GC.
; After the work is done, the code jumps back to the "pRejoinPoint"
; which should be emitted right after the inline part is generated.
;
; Assumptions:
; ebx = Thread
; Preserves
; all registers except ecx.
;
;-----------------------------------------------------------------------
_StubRareEnable proc public
 push eax
 push edx

 push ebx
 call _StubRareEnableWorker@4

 pop edx
 pop eax
 retn
_StubRareEnable ENDP

ifdef FEATURE_COMINTEROP
_StubRareDisableHR proc public
 push edx
Expand Down

12 changes: 0 additions & 12 deletions
src/coreclr/vm/i386/cgenx86.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -911,18 +911,6 @@ Stub *GenerateInitPInvokeFrameHelper()
 RETURN psl->Link(SystemDomain::GetGlobalLoaderAllocator()->GetExecutableHeap());
}


extern "C" VOID STDCALL StubRareEnableWorker(Thread *pThread)
{
 WRAPPER_NO_CONTRACT;

 //printf("RareEnable\n");
 pThread->RareEnablePreemptiveGC();
}




// Disable when calling into managed code from a place that fails via Exceptions
extern "C" VOID STDCALL StubRareDisableTHROWWorker(Thread *pThread)
{
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[Test Only] async safe point interrupts after NOP change#101151

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

 Closed

VSadov
wants to merge
26
commits into

from

 Closed


[Test Only] async safe point interrupts after NOP change
#101151
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
deb49c8

limited number of tests


VSadov Mar 28, 2023
0202981

port suspension algo from NativeAOT


VSadov Apr 27, 2024
c93962b

PING_JIT_TIMEOUT gone


VSadov Apr 27, 2024
67521fa

CatchAtSafePoint is always opportunistic


VSadov Apr 27, 2024
681ee52

current


VSadov Apr 27, 2024
5211e94

removed RareEnablePreemptiveGC


VSadov Apr 27, 2024
22eec41

cleanup RareDisablePreemptiveGC


VSadov Apr 28, 2024
3bcebef

fix for x86


VSadov Apr 28, 2024
fad9a38

factored out Thread::Hijack


VSadov Apr 28, 2024
ddbfd1d

fix build for non-x64 windows


VSadov Apr 28, 2024
1c8a1f2

assert noone holds TSL into coop mode


VSadov Apr 28, 2024
ba455ef

activation safety check is always for the current thread


VSadov Apr 28, 2024
f6854ad

undo comment


VSadov Apr 28, 2024
eb802e2

PulseGCMode should not check for CatchAtSafePointOpportunistic


VSadov Apr 28, 2024
f691e11

not disabling preempt while holding TSL


VSadov Apr 29, 2024
abd6a21

tweak


VSadov Apr 29, 2024
b9d0472

dead assert


VSadov Apr 29, 2024
c38d98c

tweak RareDisablePreemptiveGC


VSadov Apr 29, 2024
e00e19d

RareDisablePreemptiveGC avoid GetSuspensionThread()


VSadov Apr 29, 2024
f941fb6

updated Thread::Hijack


VSadov Apr 30, 2024
6793b21

fix typo


VSadov Apr 30, 2024
1a867fe

allow coop mode while holding TS lock


VSadov Apr 30, 2024
3178b7f

Refactored into SuspendAllThreads/ResumeAllThreads


VSadov Apr 30, 2024
1d6e816

SetThreadTrapForSuspension


VSadov May 1, 2024
7d5435f

deleted TS_GCSuspendPending


VSadov May 1, 2024
b6449b0

tweaks


VSadov May 1, 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


2 changes: 0 additions & 2 deletions
docs/design/datacontracts/Thread.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@ enum ThreadState

 TS_AbortRequested = 0x00000001, // Abort the thread

 TS_GCSuspendPending = 0x00000002, // ThreadSuspend::SuspendRuntime watches this thread to leave coop mode.
 TS_GCSuspendRedirected = 0x00000004, // ThreadSuspend::SuspendRuntime has redirected the thread to suspention routine.
 TS_GCSuspendFlags = TS_GCSuspendPending | TS_GCSuspendRedirected, // used to track suspension progress. Only SuspendRuntime writes/resets these.

 TS_DebugSuspendPending = 0x00000008, // Is the debugger suspending threads?
 TS_GCOnTransitions = 0x00000010, // Force a GC on stub transitions (GCStress only)
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/debug/ee/debugger.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3807,7 +3807,7 @@ HANDLE OpenWin32EventOrThrow(
// debugger may not be expecting it. Instead, just leave the lock and retry.
// When we leave, we'll enter coop mode first and get suspended if a suspension is in progress.
// Afterwards, we'll transition back into preemptive mode, and we'll block because this thread
// has been suspended by the debugger (see code:Thread::RareEnablePreemptiveGC).
// has been suspended by the debugger (see code:Thread::RareDisablePreemptiveGC).
#define SENDIPCEVENT_BEGIN_EX(pDebugger, thread, gcxStmt) \
 { \
 FireEtwDebugIPCEventStart(); \
Expand Down

8 changes: 0 additions & 8 deletions
src/coreclr/nativeaot/Runtime/thread.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,14 +328,6 @@ bool Thread::IsGCSpecial()
 return IsStateSet(TSF_IsGcSpecialThread);
}

bool Thread::CatchAtSafePoint()
{
 // This is only called by the GC on a background GC worker thread that's explicitly interested in letting
 // a foreground GC proceed at that point. So it's always safe to return true.
 ASSERT(IsGCSpecial());
 return true;
}

uint64_t Thread::GetPalThreadIdForLogging()
{
 return m_threadId;
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/nativeaot/Runtime/thread.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,6 @@ class Thread : private ThreadBuffer
 //
 void SetGCSpecial();
 bool IsGCSpecial();
 bool CatchAtSafePoint();

 //
 // Managed/unmanaged interop transitions support APIs
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/pal/inc/pal.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3772,7 +3772,7 @@ PALAPI
FlushProcessWriteBuffers();

typedef void (*PAL_ActivationFunction)(CONTEXT *context);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip, BOOL checkingCurrentThread);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip);

PALIMPORT
VOID
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/pal/src/exception/signal.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -833,7 +833,7 @@ static void inject_activation_handler(int code, siginfo_t *siginfo, void *contex
 &winContext,
 contextFlags);

 if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext), /* checkingCurrentThread */ TRUE))
 if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext)))
 {
 g_inject_activation_context_locvar_offset = (int)((char*)&winContext - (char*)__builtin_frame_address(0));
 int savedErrNo = errno; // Make sure that errno is not modified
Expand Down

4 changes: 1 addition & 3 deletions
src/coreclr/vm/comtoclrcall.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ extern "C" UINT64 __stdcall COMToCLRWorker(Thread *pThread, ComMethodFrame* pFra
 // we have additional checks for thread abort that are performed only when
 // g_TrapReturningThreads is set.
 pThread->m_fPreemptiveGCDisabled.StoreWithoutBarrier(1);
 if (g_TrapReturningThreads.LoadWithoutBarrier())
 if (g_TrapReturningThreads)
 {
 hr = StubRareDisableHRWorker(pThread);
 if (S_OK != hr)
Expand DownExpand Up@@ -1339,14 +1339,12 @@ Stub* ComCall::CreateGenericComCallStub(BOOL isFieldAccess)
 // ends up throwing an OOM exception.

 CodeLabel* rgRareLabels[] = {
 psl->NewCodeLabel(),
 psl->NewCodeLabel(),
 psl->NewCodeLabel()
 };


 CodeLabel* rgRejoinLabels[] = {
 psl->NewCodeLabel(),
 psl->NewCodeLabel(),
 psl->NewCodeLabel()
 };
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/eedbginterfaceimpl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,7 +652,7 @@ void EEDbgInterfaceImpl::EnablePreemptiveGC(void)
 CONTRACTL
 {
 NOTHROW;
DISABLED(GC_TRIGGERS); // Disabled because disabled in RareEnablePreemptiveGC()
GC_NOTRIGGER;
 }
 CONTRACTL_END;

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/fcall.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ NOINLINE Object* FC_GCPoll(void* __me, Object* objToProtect)
 INCONTRACT(FCallCheck __fCallCheck(__FILE__, __LINE__));

 Thread *thread = GetThread();
 if (thread->CatchAtSafePointOpportunistic()) // Does someone want this thread stopped?
 if (thread->CatchAtSafePoint()) // Does someone want this thread stopped?
 {
 HELPER_METHOD_FRAME_BEGIN_RET_ATTRIB_1(Frame::FRAME_ATTR_CAPTURE_DEPTH_2, objToProtect);

Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/vm/fcall.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -809,7 +809,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
 { \
 INCONTRACT(Thread::TriggersGC(GetThread());) \
 INCONTRACT(__fCallCheck.SetDidPoll();) \
 if (g_TrapReturningThreads.LoadWithoutBarrier()) \
 if (g_TrapReturningThreads) \
 { \
 if (FC_GCPoll(__me)) \
 return ret; \
Expand All@@ -824,7 +824,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
 { \
 INCONTRACT(__fCallCheck.SetDidPoll();) \
 Object* __temp = OBJECTREFToObject(obj); \
 if (g_TrapReturningThreads.LoadWithoutBarrier()) \
 if (g_TrapReturningThreads) \
 { \
 __temp = FC_GCPoll(__me, __temp); \
 while (0 == FC_NO_TAILCALL) { }; /* side effect the compile can't remove */ \
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/frames.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1332,7 +1332,7 @@ class HelperMethodFrame : public Frame
 FORCEINLINE void Poll()
 {
 WRAPPER_NO_CONTRACT;
 if (m_pThread->CatchAtSafePointOpportunistic())
 if (m_pThread->CatchAtSafePoint())
 CommonTripThread();
 }
#endif // DACCESS_COMPILE
Expand Down

25 changes: 0 additions & 25 deletions
src/coreclr/vm/i386/asmhelpers.S

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,31 +126,6 @@ LEAF_ENTRY RestoreFPUContext, _TEXT
 ret 4
LEAF_END RestoreFPUContext, _TEXT

// -----------------------------------------------------------------------
// The out-of-line portion of the code to enable preemptive GC.
// After the work is done, the code jumps back to the "pRejoinPoint"
// which should be emitted right after the inline part is generated.
//
// Assumptions:
// ebx = Thread
// Preserves
// all registers except ecx.
//
// -----------------------------------------------------------------------
NESTED_ENTRY StubRareEnable, _TEXT, NoHandler
 push eax
 push edx

 push ebx

 CHECK_STACK_ALIGNMENT
 call C_FUNC(StubRareEnableWorker)

 pop edx
 pop eax
 ret
NESTED_END StubRareEnable, _TEXT

NESTED_ENTRY StubRareDisableTHROW, _TEXT, NoHandler
 push eax
 push edx
Expand Down

24 changes: 0 additions & 24 deletions
src/coreclr/vm/i386/asmhelpers.asm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ EXTERN __imp__RtlUnwind@16:DWORD
ifdef _DEBUG
EXTERN _HelperMethodFrameConfirmState@20:PROC
endif
EXTERN _StubRareEnableWorker@4:PROC
ifdef FEATURE_COMINTEROP
EXTERN _StubRareDisableHRWorker@4:PROC
endif ; FEATURE_COMINTEROP
Expand DownExpand Up@@ -394,29 +393,6 @@ endif
 retn 8
_CallJitEHFinallyHelper@8 ENDP

;-----------------------------------------------------------------------
; The out-of-line portion of the code to enable preemptive GC.
; After the work is done, the code jumps back to the "pRejoinPoint"
; which should be emitted right after the inline part is generated.
;
; Assumptions:
; ebx = Thread
; Preserves
; all registers except ecx.
;
;-----------------------------------------------------------------------
_StubRareEnable proc public
 push eax
 push edx

 push ebx
 call _StubRareEnableWorker@4

 pop edx
 pop eax
 retn
_StubRareEnable ENDP

ifdef FEATURE_COMINTEROP
_StubRareDisableHR proc public
 push edx
Expand Down

12 changes: 0 additions & 12 deletions
src/coreclr/vm/i386/cgenx86.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -911,18 +911,6 @@ Stub *GenerateInitPInvokeFrameHelper()
 RETURN psl->Link(SystemDomain::GetGlobalLoaderAllocator()->GetExecutableHeap());
}


extern "C" VOID STDCALL StubRareEnableWorker(Thread *pThread)
{
 WRAPPER_NO_CONTRACT;

 //printf("RareEnable\n");
 pThread->RareEnablePreemptiveGC();
}




// Disable when calling into managed code from a place that fails via Exceptions
extern "C" VOID STDCALL StubRareDisableTHROWWorker(Thread *pThread)
{
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Test Only] async safe point interrupts after NOP change#101151

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

 Closed

VSadov
wants to merge
26
commits into

from

 Closed


[Test Only] async safe point interrupts after NOP change
#101151
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
deb49c8

limited number of tests


VSadov Mar 28, 2023
0202981

port suspension algo from NativeAOT


VSadov Apr 27, 2024
c93962b

PING_JIT_TIMEOUT gone


VSadov Apr 27, 2024
67521fa

CatchAtSafePoint is always opportunistic


VSadov Apr 27, 2024
681ee52

current


VSadov Apr 27, 2024
5211e94

removed RareEnablePreemptiveGC


VSadov Apr 27, 2024
22eec41

cleanup RareDisablePreemptiveGC


VSadov Apr 28, 2024
3bcebef

fix for x86


VSadov Apr 28, 2024
fad9a38

factored out Thread::Hijack


VSadov Apr 28, 2024
ddbfd1d

fix build for non-x64 windows


VSadov Apr 28, 2024
1c8a1f2

assert noone holds TSL into coop mode


VSadov Apr 28, 2024
ba455ef

activation safety check is always for the current thread


VSadov Apr 28, 2024
f6854ad

undo comment


VSadov Apr 28, 2024
eb802e2

PulseGCMode should not check for CatchAtSafePointOpportunistic


VSadov Apr 28, 2024
f691e11

not disabling preempt while holding TSL


VSadov Apr 29, 2024
abd6a21

tweak


VSadov Apr 29, 2024
b9d0472

dead assert


VSadov Apr 29, 2024
c38d98c

tweak RareDisablePreemptiveGC


VSadov Apr 29, 2024
e00e19d

RareDisablePreemptiveGC avoid GetSuspensionThread()


VSadov Apr 29, 2024
f941fb6

updated Thread::Hijack


VSadov Apr 30, 2024
6793b21

fix typo


VSadov Apr 30, 2024
1a867fe

allow coop mode while holding TS lock


VSadov Apr 30, 2024
3178b7f

Refactored into SuspendAllThreads/ResumeAllThreads


VSadov Apr 30, 2024
1d6e816

SetThreadTrapForSuspension


VSadov May 1, 2024
7d5435f

deleted TS_GCSuspendPending


VSadov May 1, 2024
b6449b0

tweaks


VSadov May 1, 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


2 changes: 0 additions & 2 deletions
docs/design/datacontracts/Thread.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@ enum ThreadState

 TS_AbortRequested = 0x00000001, // Abort the thread

 TS_GCSuspendPending = 0x00000002, // ThreadSuspend::SuspendRuntime watches this thread to leave coop mode.
 TS_GCSuspendRedirected = 0x00000004, // ThreadSuspend::SuspendRuntime has redirected the thread to suspention routine.
 TS_GCSuspendFlags = TS_GCSuspendPending | TS_GCSuspendRedirected, // used to track suspension progress. Only SuspendRuntime writes/resets these.

 TS_DebugSuspendPending = 0x00000008, // Is the debugger suspending threads?
 TS_GCOnTransitions = 0x00000010, // Force a GC on stub transitions (GCStress only)
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/debug/ee/debugger.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3807,7 +3807,7 @@ HANDLE OpenWin32EventOrThrow(
// debugger may not be expecting it. Instead, just leave the lock and retry.
// When we leave, we'll enter coop mode first and get suspended if a suspension is in progress.
// Afterwards, we'll transition back into preemptive mode, and we'll block because this thread
// has been suspended by the debugger (see code:Thread::RareEnablePreemptiveGC).
// has been suspended by the debugger (see code:Thread::RareDisablePreemptiveGC).
#define SENDIPCEVENT_BEGIN_EX(pDebugger, thread, gcxStmt) \
 { \
 FireEtwDebugIPCEventStart(); \
Expand Down

8 changes: 0 additions & 8 deletions
src/coreclr/nativeaot/Runtime/thread.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,14 +328,6 @@ bool Thread::IsGCSpecial()
 return IsStateSet(TSF_IsGcSpecialThread);
}

bool Thread::CatchAtSafePoint()
{
 // This is only called by the GC on a background GC worker thread that's explicitly interested in letting
 // a foreground GC proceed at that point. So it's always safe to return true.
 ASSERT(IsGCSpecial());
 return true;
}

uint64_t Thread::GetPalThreadIdForLogging()
{
 return m_threadId;
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/nativeaot/Runtime/thread.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,6 @@ class Thread : private ThreadBuffer
 //
 void SetGCSpecial();
 bool IsGCSpecial();
 bool CatchAtSafePoint();

 //
 // Managed/unmanaged interop transitions support APIs
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/pal/inc/pal.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3772,7 +3772,7 @@ PALAPI
FlushProcessWriteBuffers();

typedef void (*PAL_ActivationFunction)(CONTEXT *context);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip, BOOL checkingCurrentThread);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip);

PALIMPORT
VOID
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/pal/src/exception/signal.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -833,7 +833,7 @@ static void inject_activation_handler(int code, siginfo_t *siginfo, void *contex
 &winContext,
 contextFlags);

 if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext), /* checkingCurrentThread */ TRUE))
 if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext)))
 {
 g_inject_activation_context_locvar_offset = (int)((char*)&winContext - (char*)__builtin_frame_address(0));
 int savedErrNo = errno; // Make sure that errno is not modified
Expand Down

4 changes: 1 addition & 3 deletions
src/coreclr/vm/comtoclrcall.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ extern "C" UINT64 __stdcall COMToCLRWorker(Thread *pThread, ComMethodFrame* pFra
 // we have additional checks for thread abort that are performed only when
 // g_TrapReturningThreads is set.
 pThread->m_fPreemptiveGCDisabled.StoreWithoutBarrier(1);
 if (g_TrapReturningThreads.LoadWithoutBarrier())
 if (g_TrapReturningThreads)
 {
 hr = StubRareDisableHRWorker(pThread);
 if (S_OK != hr)
Expand DownExpand Up@@ -1339,14 +1339,12 @@ Stub* ComCall::CreateGenericComCallStub(BOOL isFieldAccess)
 // ends up throwing an OOM exception.

 CodeLabel* rgRareLabels[] = {
 psl->NewCodeLabel(),
 psl->NewCodeLabel(),
 psl->NewCodeLabel()
 };


 CodeLabel* rgRejoinLabels[] = {
 psl->NewCodeLabel(),
 psl->NewCodeLabel(),
 psl->NewCodeLabel()
 };
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/eedbginterfaceimpl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,7 +652,7 @@ void EEDbgInterfaceImpl::EnablePreemptiveGC(void)
 CONTRACTL
 {
 NOTHROW;
DISABLED(GC_TRIGGERS); // Disabled because disabled in RareEnablePreemptiveGC()
GC_NOTRIGGER;
 }
 CONTRACTL_END;

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/fcall.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ NOINLINE Object* FC_GCPoll(void* __me, Object* objToProtect)
 INCONTRACT(FCallCheck __fCallCheck(__FILE__, __LINE__));

 Thread *thread = GetThread();
 if (thread->CatchAtSafePointOpportunistic()) // Does someone want this thread stopped?
 if (thread->CatchAtSafePoint()) // Does someone want this thread stopped?
 {
 HELPER_METHOD_FRAME_BEGIN_RET_ATTRIB_1(Frame::FRAME_ATTR_CAPTURE_DEPTH_2, objToProtect);

Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/vm/fcall.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -809,7 +809,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
 { \
 INCONTRACT(Thread::TriggersGC(GetThread());) \
 INCONTRACT(__fCallCheck.SetDidPoll();) \
 if (g_TrapReturningThreads.LoadWithoutBarrier()) \
 if (g_TrapReturningThreads) \
 { \
 if (FC_GCPoll(__me)) \
 return ret; \
Expand All@@ -824,7 +824,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
 { \
 INCONTRACT(__fCallCheck.SetDidPoll();) \
 Object* __temp = OBJECTREFToObject(obj); \
 if (g_TrapReturningThreads.LoadWithoutBarrier()) \
 if (g_TrapReturningThreads) \
 { \
 __temp = FC_GCPoll(__me, __temp); \
 while (0 == FC_NO_TAILCALL) { }; /* side effect the compile can't remove */ \
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/frames.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1332,7 +1332,7 @@ class HelperMethodFrame : public Frame
 FORCEINLINE void Poll()
 {
 WRAPPER_NO_CONTRACT;
 if (m_pThread->CatchAtSafePointOpportunistic())
 if (m_pThread->CatchAtSafePoint())
 CommonTripThread();
 }
#endif // DACCESS_COMPILE
Expand Down

25 changes: 0 additions & 25 deletions
src/coreclr/vm/i386/asmhelpers.S

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,31 +126,6 @@ LEAF_ENTRY RestoreFPUContext, _TEXT
 ret 4
LEAF_END RestoreFPUContext, _TEXT

// -----------------------------------------------------------------------
// The out-of-line portion of the code to enable preemptive GC.
// After the work is done, the code jumps back to the "pRejoinPoint"
// which should be emitted right after the inline part is generated.
//
// Assumptions:
// ebx = Thread
// Preserves
// all registers except ecx.
//
// -----------------------------------------------------------------------
NESTED_ENTRY StubRareEnable, _TEXT, NoHandler
 push eax
 push edx

 push ebx

 CHECK_STACK_ALIGNMENT
 call C_FUNC(StubRareEnableWorker)

 pop edx
 pop eax
 ret
NESTED_END StubRareEnable, _TEXT

NESTED_ENTRY StubRareDisableTHROW, _TEXT, NoHandler
 push eax
 push edx
Expand Down

24 changes: 0 additions & 24 deletions
src/coreclr/vm/i386/asmhelpers.asm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ EXTERN __imp__RtlUnwind@16:DWORD
ifdef _DEBUG
EXTERN _HelperMethodFrameConfirmState@20:PROC
endif
EXTERN _StubRareEnableWorker@4:PROC
ifdef FEATURE_COMINTEROP
EXTERN _StubRareDisableHRWorker@4:PROC
endif ; FEATURE_COMINTEROP
Expand DownExpand Up@@ -394,29 +393,6 @@ endif
 retn 8
_CallJitEHFinallyHelper@8 ENDP

;-----------------------------------------------------------------------
; The out-of-line portion of the code to enable preemptive GC.
; After the work is done, the code jumps back to the "pRejoinPoint"
; which should be emitted right after the inline part is generated.
;
; Assumptions:
; ebx = Thread
; Preserves
; all registers except ecx.
;
;-----------------------------------------------------------------------
_StubRareEnable proc public
 push eax
 push edx

 push ebx
 call _StubRareEnableWorker@4

 pop edx
 pop eax
 retn
_StubRareEnable ENDP

ifdef FEATURE_COMINTEROP
_StubRareDisableHR proc public
 push edx
Expand Down

12 changes: 0 additions & 12 deletions
src/coreclr/vm/i386/cgenx86.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -911,18 +911,6 @@ Stub *GenerateInitPInvokeFrameHelper()
 RETURN psl->Link(SystemDomain::GetGlobalLoaderAllocator()->GetExecutableHeap());
}


extern "C" VOID STDCALL StubRareEnableWorker(Thread *pThread)
{
 WRAPPER_NO_CONTRACT;

 //printf("RareEnable\n");
 pThread->RareEnablePreemptiveGC();
}




// Disable when calling into managed code from a place that fails via Exceptions
extern "C" VOID STDCALL StubRareDisableTHROWWorker(Thread *pThread)
{
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Test Only] async safe point interrupts after NOP change#101151

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

 Closed

VSadov
wants to merge
26
commits into

from

 Closed


[Test Only] async safe point interrupts after NOP change
#101151
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
deb49c8

limited number of tests


VSadov Mar 28, 2023
0202981

port suspension algo from NativeAOT


VSadov Apr 27, 2024
c93962b

PING_JIT_TIMEOUT gone


VSadov Apr 27, 2024
67521fa

CatchAtSafePoint is always opportunistic


VSadov Apr 27, 2024
681ee52

current


VSadov Apr 27, 2024
5211e94

removed RareEnablePreemptiveGC


VSadov Apr 27, 2024
22eec41

cleanup RareDisablePreemptiveGC


VSadov Apr 28, 2024
3bcebef

fix for x86


VSadov Apr 28, 2024
fad9a38

factored out Thread::Hijack


VSadov Apr 28, 2024
ddbfd1d

fix build for non-x64 windows


VSadov Apr 28, 2024
1c8a1f2

assert noone holds TSL into coop mode


VSadov Apr 28, 2024
ba455ef

activation safety check is always for the current thread


VSadov Apr 28, 2024
f6854ad

undo comment


VSadov Apr 28, 2024
eb802e2

PulseGCMode should not check for CatchAtSafePointOpportunistic


VSadov Apr 28, 2024
f691e11

not disabling preempt while holding TSL


VSadov Apr 29, 2024
abd6a21

tweak


VSadov Apr 29, 2024
b9d0472

dead assert


VSadov Apr 29, 2024
c38d98c

tweak RareDisablePreemptiveGC


VSadov Apr 29, 2024
e00e19d

RareDisablePreemptiveGC avoid GetSuspensionThread()


VSadov Apr 29, 2024
f941fb6

updated Thread::Hijack


VSadov Apr 30, 2024
6793b21

fix typo


VSadov Apr 30, 2024
1a867fe

allow coop mode while holding TS lock


VSadov Apr 30, 2024
3178b7f

Refactored into SuspendAllThreads/ResumeAllThreads


VSadov Apr 30, 2024
1d6e816

SetThreadTrapForSuspension


VSadov May 1, 2024
7d5435f

deleted TS_GCSuspendPending


VSadov May 1, 2024
b6449b0

tweaks


VSadov May 1, 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


2 changes: 0 additions & 2 deletions
docs/design/datacontracts/Thread.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@ enum ThreadState

 TS_AbortRequested = 0x00000001, // Abort the thread

 TS_GCSuspendPending = 0x00000002, // ThreadSuspend::SuspendRuntime watches this thread to leave coop mode.
 TS_GCSuspendRedirected = 0x00000004, // ThreadSuspend::SuspendRuntime has redirected the thread to suspention routine.
 TS_GCSuspendFlags = TS_GCSuspendPending | TS_GCSuspendRedirected, // used to track suspension progress. Only SuspendRuntime writes/resets these.

 TS_DebugSuspendPending = 0x00000008, // Is the debugger suspending threads?
 TS_GCOnTransitions = 0x00000010, // Force a GC on stub transitions (GCStress only)
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/debug/ee/debugger.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3807,7 +3807,7 @@ HANDLE OpenWin32EventOrThrow(
// debugger may not be expecting it. Instead, just leave the lock and retry.
// When we leave, we'll enter coop mode first and get suspended if a suspension is in progress.
// Afterwards, we'll transition back into preemptive mode, and we'll block because this thread
// has been suspended by the debugger (see code:Thread::RareEnablePreemptiveGC).
// has been suspended by the debugger (see code:Thread::RareDisablePreemptiveGC).
#define SENDIPCEVENT_BEGIN_EX(pDebugger, thread, gcxStmt) \
 { \
 FireEtwDebugIPCEventStart(); \
Expand Down

8 changes: 0 additions & 8 deletions
src/coreclr/nativeaot/Runtime/thread.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,14 +328,6 @@ bool Thread::IsGCSpecial()
 return IsStateSet(TSF_IsGcSpecialThread);
}

bool Thread::CatchAtSafePoint()
{
 // This is only called by the GC on a background GC worker thread that's explicitly interested in letting
 // a foreground GC proceed at that point. So it's always safe to return true.
 ASSERT(IsGCSpecial());
 return true;
}

uint64_t Thread::GetPalThreadIdForLogging()
{
 return m_threadId;
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/nativeaot/Runtime/thread.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,6 @@ class Thread : private ThreadBuffer
 //
 void SetGCSpecial();
 bool IsGCSpecial();
 bool CatchAtSafePoint();

 //
 // Managed/unmanaged interop transitions support APIs
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/pal/inc/pal.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3772,7 +3772,7 @@ PALAPI
FlushProcessWriteBuffers();

typedef void (*PAL_ActivationFunction)(CONTEXT *context);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip, BOOL checkingCurrentThread);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip);

PALIMPORT
VOID
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/pal/src/exception/signal.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -833,7 +833,7 @@ static void inject_activation_handler(int code, siginfo_t *siginfo, void *contex
 &winContext,
 contextFlags);

 if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext), /* checkingCurrentThread */ TRUE))
 if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext)))
 {
 g_inject_activation_context_locvar_offset = (int)((char*)&winContext - (char*)__builtin_frame_address(0));
 int savedErrNo = errno; // Make sure that errno is not modified
Expand Down

4 changes: 1 addition & 3 deletions
src/coreclr/vm/comtoclrcall.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ extern "C" UINT64 __stdcall COMToCLRWorker(Thread *pThread, ComMethodFrame* pFra
 // we have additional checks for thread abort that are performed only when
 // g_TrapReturningThreads is set.
 pThread->m_fPreemptiveGCDisabled.StoreWithoutBarrier(1);
 if (g_TrapReturningThreads.LoadWithoutBarrier())
 if (g_TrapReturningThreads)
 {
 hr = StubRareDisableHRWorker(pThread);
 if (S_OK != hr)
Expand DownExpand Up@@ -1339,14 +1339,12 @@ Stub* ComCall::CreateGenericComCallStub(BOOL isFieldAccess)
 // ends up throwing an OOM exception.

 CodeLabel* rgRareLabels[] = {
 psl->NewCodeLabel(),
 psl->NewCodeLabel(),
 psl->NewCodeLabel()
 };


 CodeLabel* rgRejoinLabels[] = {
 psl->NewCodeLabel(),
 psl->NewCodeLabel(),
 psl->NewCodeLabel()
 };
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/eedbginterfaceimpl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,7 +652,7 @@ void EEDbgInterfaceImpl::EnablePreemptiveGC(void)
 CONTRACTL
 {
 NOTHROW;
DISABLED(GC_TRIGGERS); // Disabled because disabled in RareEnablePreemptiveGC()
GC_NOTRIGGER;
 }
 CONTRACTL_END;

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/fcall.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ NOINLINE Object* FC_GCPoll(void* __me, Object* objToProtect)
 INCONTRACT(FCallCheck __fCallCheck(__FILE__, __LINE__));

 Thread *thread = GetThread();
 if (thread->CatchAtSafePointOpportunistic()) // Does someone want this thread stopped?
 if (thread->CatchAtSafePoint()) // Does someone want this thread stopped?
 {
 HELPER_METHOD_FRAME_BEGIN_RET_ATTRIB_1(Frame::FRAME_ATTR_CAPTURE_DEPTH_2, objToProtect);

Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/vm/fcall.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -809,7 +809,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
 { \
 INCONTRACT(Thread::TriggersGC(GetThread());) \
 INCONTRACT(__fCallCheck.SetDidPoll();) \
 if (g_TrapReturningThreads.LoadWithoutBarrier()) \
 if (g_TrapReturningThreads) \
 { \
 if (FC_GCPoll(__me)) \
 return ret; \
Expand All@@ -824,7 +824,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
 { \
 INCONTRACT(__fCallCheck.SetDidPoll();) \
 Object* __temp = OBJECTREFToObject(obj); \
 if (g_TrapReturningThreads.LoadWithoutBarrier()) \
 if (g_TrapReturningThreads) \
 { \
 __temp = FC_GCPoll(__me, __temp); \
 while (0 == FC_NO_TAILCALL) { }; /* side effect the compile can't remove */ \
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/frames.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1332,7 +1332,7 @@ class HelperMethodFrame : public Frame
 FORCEINLINE void Poll()
 {
 WRAPPER_NO_CONTRACT;
 if (m_pThread->CatchAtSafePointOpportunistic())
 if (m_pThread->CatchAtSafePoint())
 CommonTripThread();
 }
#endif // DACCESS_COMPILE
Expand Down

25 changes: 0 additions & 25 deletions
src/coreclr/vm/i386/asmhelpers.S

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,31 +126,6 @@ LEAF_ENTRY RestoreFPUContext, _TEXT
 ret 4
LEAF_END RestoreFPUContext, _TEXT

// -----------------------------------------------------------------------
// The out-of-line portion of the code to enable preemptive GC.
// After the work is done, the code jumps back to the "pRejoinPoint"
// which should be emitted right after the inline part is generated.
//
// Assumptions:
// ebx = Thread
// Preserves
// all registers except ecx.
//
// -----------------------------------------------------------------------
NESTED_ENTRY StubRareEnable, _TEXT, NoHandler
 push eax
 push edx

 push ebx

 CHECK_STACK_ALIGNMENT
 call C_FUNC(StubRareEnableWorker)

 pop edx
 pop eax
 ret
NESTED_END StubRareEnable, _TEXT

NESTED_ENTRY StubRareDisableTHROW, _TEXT, NoHandler
 push eax
 push edx
Expand Down

24 changes: 0 additions & 24 deletions
src/coreclr/vm/i386/asmhelpers.asm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ EXTERN __imp__RtlUnwind@16:DWORD
ifdef _DEBUG
EXTERN _HelperMethodFrameConfirmState@20:PROC
endif
EXTERN _StubRareEnableWorker@4:PROC
ifdef FEATURE_COMINTEROP
EXTERN _StubRareDisableHRWorker@4:PROC
endif ; FEATURE_COMINTEROP
Expand DownExpand Up@@ -394,29 +393,6 @@ endif
 retn 8
_CallJitEHFinallyHelper@8 ENDP

;-----------------------------------------------------------------------
; The out-of-line portion of the code to enable preemptive GC.
; After the work is done, the code jumps back to the "pRejoinPoint"
; which should be emitted right after the inline part is generated.
;
; Assumptions:
; ebx = Thread
; Preserves
; all registers except ecx.
;
;-----------------------------------------------------------------------
_StubRareEnable proc public
 push eax
 push edx

 push ebx
 call _StubRareEnableWorker@4

 pop edx
 pop eax
 retn
_StubRareEnable ENDP

ifdef FEATURE_COMINTEROP
_StubRareDisableHR proc public
 push edx
Expand Down

12 changes: 0 additions & 12 deletions
src/coreclr/vm/i386/cgenx86.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -911,18 +911,6 @@ Stub *GenerateInitPInvokeFrameHelper()
 RETURN psl->Link(SystemDomain::GetGlobalLoaderAllocator()->GetExecutableHeap());
}


extern "C" VOID STDCALL StubRareEnableWorker(Thread *pThread)
{
 WRAPPER_NO_CONTRACT;

 //printf("RareEnable\n");
 pThread->RareEnablePreemptiveGC();
}




// Disable when calling into managed code from a place that fails via Exceptions
extern "C" VOID STDCALL StubRareDisableTHROWWorker(Thread *pThread)
{
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[Test Only] async safe point interrupts after NOP change#101151

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

 Closed

VSadov
wants to merge
26
commits into

from

 Closed


[Test Only] async safe point interrupts after NOP change
#101151
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
deb49c8

limited number of tests


VSadov Mar 28, 2023
0202981

port suspension algo from NativeAOT


VSadov Apr 27, 2024
c93962b

PING_JIT_TIMEOUT gone


VSadov Apr 27, 2024
67521fa

CatchAtSafePoint is always opportunistic


VSadov Apr 27, 2024
681ee52

current


VSadov Apr 27, 2024
5211e94

removed RareEnablePreemptiveGC


VSadov Apr 27, 2024
22eec41

cleanup RareDisablePreemptiveGC


VSadov Apr 28, 2024
3bcebef

fix for x86


VSadov Apr 28, 2024
fad9a38

factored out Thread::Hijack


VSadov Apr 28, 2024
ddbfd1d

fix build for non-x64 windows


VSadov Apr 28, 2024
1c8a1f2

assert noone holds TSL into coop mode


VSadov Apr 28, 2024
ba455ef

activation safety check is always for the current thread


VSadov Apr 28, 2024
f6854ad

undo comment


VSadov Apr 28, 2024
eb802e2

PulseGCMode should not check for CatchAtSafePointOpportunistic


VSadov Apr 28, 2024
f691e11

not disabling preempt while holding TSL


VSadov Apr 29, 2024
abd6a21

tweak


VSadov Apr 29, 2024
b9d0472

dead assert


VSadov Apr 29, 2024
c38d98c

tweak RareDisablePreemptiveGC


VSadov Apr 29, 2024
e00e19d

RareDisablePreemptiveGC avoid GetSuspensionThread()


VSadov Apr 29, 2024
f941fb6

updated Thread::Hijack


VSadov Apr 30, 2024
6793b21

fix typo


VSadov Apr 30, 2024
1a867fe

allow coop mode while holding TS lock


VSadov Apr 30, 2024
3178b7f

Refactored into SuspendAllThreads/ResumeAllThreads


VSadov Apr 30, 2024
1d6e816

SetThreadTrapForSuspension


VSadov May 1, 2024
7d5435f

deleted TS_GCSuspendPending


VSadov May 1, 2024
b6449b0

tweaks


VSadov May 1, 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


2 changes: 0 additions & 2 deletions
docs/design/datacontracts/Thread.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,7 @@ enum ThreadState

 TS_AbortRequested = 0x00000001, // Abort the thread

 TS_GCSuspendPending = 0x00000002, // ThreadSuspend::SuspendRuntime watches this thread to leave coop mode.
 TS_GCSuspendRedirected = 0x00000004, // ThreadSuspend::SuspendRuntime has redirected the thread to suspention routine.
 TS_GCSuspendFlags = TS_GCSuspendPending | TS_GCSuspendRedirected, // used to track suspension progress. Only SuspendRuntime writes/resets these.

 TS_DebugSuspendPending = 0x00000008, // Is the debugger suspending threads?
 TS_GCOnTransitions = 0x00000010, // Force a GC on stub transitions (GCStress only)
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/debug/ee/debugger.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3807,7 +3807,7 @@ HANDLE OpenWin32EventOrThrow(
// debugger may not be expecting it. Instead, just leave the lock and retry.
// When we leave, we'll enter coop mode first and get suspended if a suspension is in progress.
// Afterwards, we'll transition back into preemptive mode, and we'll block because this thread
// has been suspended by the debugger (see code:Thread::RareEnablePreemptiveGC).
// has been suspended by the debugger (see code:Thread::RareDisablePreemptiveGC).
#define SENDIPCEVENT_BEGIN_EX(pDebugger, thread, gcxStmt) \
 { \
 FireEtwDebugIPCEventStart(); \
Expand Down

8 changes: 0 additions & 8 deletions
src/coreclr/nativeaot/Runtime/thread.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,14 +328,6 @@ bool Thread::IsGCSpecial()
 return IsStateSet(TSF_IsGcSpecialThread);
}

bool Thread::CatchAtSafePoint()
{
 // This is only called by the GC on a background GC worker thread that's explicitly interested in letting
 // a foreground GC proceed at that point. So it's always safe to return true.
 ASSERT(IsGCSpecial());
 return true;
}

uint64_t Thread::GetPalThreadIdForLogging()
{
 return m_threadId;
Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/nativeaot/Runtime/thread.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,6 @@ class Thread : private ThreadBuffer
 //
 void SetGCSpecial();
 bool IsGCSpecial();
 bool CatchAtSafePoint();

 //
 // Managed/unmanaged interop transitions support APIs
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/pal/inc/pal.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3772,7 +3772,7 @@ PALAPI
FlushProcessWriteBuffers();

typedef void (*PAL_ActivationFunction)(CONTEXT *context);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip, BOOL checkingCurrentThread);
typedef BOOL (*PAL_SafeActivationCheckFunction)(SIZE_T ip);

PALIMPORT
VOID
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/pal/src/exception/signal.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -833,7 +833,7 @@ static void inject_activation_handler(int code, siginfo_t *siginfo, void *contex
 &winContext,
 contextFlags);

 if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext), /* checkingCurrentThread */ TRUE))
 if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext)))
 {
 g_inject_activation_context_locvar_offset = (int)((char*)&winContext - (char*)__builtin_frame_address(0));
 int savedErrNo = errno; // Make sure that errno is not modified
Expand Down

4 changes: 1 addition & 3 deletions
src/coreclr/vm/comtoclrcall.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ extern "C" UINT64 __stdcall COMToCLRWorker(Thread *pThread, ComMethodFrame* pFra
 // we have additional checks for thread abort that are performed only when
 // g_TrapReturningThreads is set.
 pThread->m_fPreemptiveGCDisabled.StoreWithoutBarrier(1);
 if (g_TrapReturningThreads.LoadWithoutBarrier())
 if (g_TrapReturningThreads)
 {
 hr = StubRareDisableHRWorker(pThread);
 if (S_OK != hr)
Expand DownExpand Up@@ -1339,14 +1339,12 @@ Stub* ComCall::CreateGenericComCallStub(BOOL isFieldAccess)
 // ends up throwing an OOM exception.

 CodeLabel* rgRareLabels[] = {
 psl->NewCodeLabel(),
 psl->NewCodeLabel(),
 psl->NewCodeLabel()
 };


 CodeLabel* rgRejoinLabels[] = {
 psl->NewCodeLabel(),
 psl->NewCodeLabel(),
 psl->NewCodeLabel()
 };
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/eedbginterfaceimpl.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,7 +652,7 @@ void EEDbgInterfaceImpl::EnablePreemptiveGC(void)
 CONTRACTL
 {
 NOTHROW;
DISABLED(GC_TRIGGERS); // Disabled because disabled in RareEnablePreemptiveGC()
GC_NOTRIGGER;
 }
 CONTRACTL_END;

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/fcall.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,7 @@ NOINLINE Object* FC_GCPoll(void* __me, Object* objToProtect)
 INCONTRACT(FCallCheck __fCallCheck(__FILE__, __LINE__));

 Thread *thread = GetThread();
 if (thread->CatchAtSafePointOpportunistic()) // Does someone want this thread stopped?
 if (thread->CatchAtSafePoint()) // Does someone want this thread stopped?
 {
 HELPER_METHOD_FRAME_BEGIN_RET_ATTRIB_1(Frame::FRAME_ATTR_CAPTURE_DEPTH_2, objToProtect);

Expand Down

4 changes: 2 additions & 2 deletions
src/coreclr/vm/fcall.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -809,7 +809,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
 { \
 INCONTRACT(Thread::TriggersGC(GetThread());) \
 INCONTRACT(__fCallCheck.SetDidPoll();) \
 if (g_TrapReturningThreads.LoadWithoutBarrier()) \
 if (g_TrapReturningThreads) \
 { \
 if (FC_GCPoll(__me)) \
 return ret; \
Expand All@@ -824,7 +824,7 @@ Object* FC_GCPoll(void* me, Object* objToProtect = NULL);
 { \
 INCONTRACT(__fCallCheck.SetDidPoll();) \
 Object* __temp = OBJECTREFToObject(obj); \
 if (g_TrapReturningThreads.LoadWithoutBarrier()) \
 if (g_TrapReturningThreads) \
 { \
 __temp = FC_GCPoll(__me, __temp); \
 while (0 == FC_NO_TAILCALL) { }; /* side effect the compile can't remove */ \
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/vm/frames.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1332,7 +1332,7 @@ class HelperMethodFrame : public Frame
 FORCEINLINE void Poll()
 {
 WRAPPER_NO_CONTRACT;
 if (m_pThread->CatchAtSafePointOpportunistic())
 if (m_pThread->CatchAtSafePoint())
 CommonTripThread();
 }
#endif // DACCESS_COMPILE
Expand Down

25 changes: 0 additions & 25 deletions
src/coreclr/vm/i386/asmhelpers.S

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,31 +126,6 @@ LEAF_ENTRY RestoreFPUContext, _TEXT
 ret 4
LEAF_END RestoreFPUContext, _TEXT

// -----------------------------------------------------------------------
// The out-of-line portion of the code to enable preemptive GC.
// After the work is done, the code jumps back to the "pRejoinPoint"
// which should be emitted right after the inline part is generated.
//
// Assumptions:
// ebx = Thread
// Preserves
// all registers except ecx.
//
// -----------------------------------------------------------------------
NESTED_ENTRY StubRareEnable, _TEXT, NoHandler
 push eax
 push edx

 push ebx

 CHECK_STACK_ALIGNMENT
 call C_FUNC(StubRareEnableWorker)

 pop edx
 pop eax
 ret
NESTED_END StubRareEnable, _TEXT

NESTED_ENTRY StubRareDisableTHROW, _TEXT, NoHandler
 push eax
 push edx
Expand Down

24 changes: 0 additions & 24 deletions
src/coreclr/vm/i386/asmhelpers.asm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ EXTERN __imp__RtlUnwind@16:DWORD
ifdef _DEBUG
EXTERN _HelperMethodFrameConfirmState@20:PROC
endif
EXTERN _StubRareEnableWorker@4:PROC
ifdef FEATURE_COMINTEROP
EXTERN _StubRareDisableHRWorker@4:PROC
endif ; FEATURE_COMINTEROP
Expand DownExpand Up@@ -394,29 +393,6 @@ endif
 retn 8
_CallJitEHFinallyHelper@8 ENDP

;-----------------------------------------------------------------------
; The out-of-line portion of the code to enable preemptive GC.
; After the work is done, the code jumps back to the "pRejoinPoint"
; which should be emitted right after the inline part is generated.
;
; Assumptions:
; ebx = Thread
; Preserves
; all registers except ecx.
;
;-----------------------------------------------------------------------
_StubRareEnable proc public
 push eax
 push edx

 push ebx
 call _StubRareEnableWorker@4

 pop edx
 pop eax
 retn
_StubRareEnable ENDP

ifdef FEATURE_COMINTEROP
_StubRareDisableHR proc public
 push edx
Expand Down

12 changes: 0 additions & 12 deletions
src/coreclr/vm/i386/cgenx86.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -911,18 +911,6 @@ Stub *GenerateInitPInvokeFrameHelper()
 RETURN psl->Link(SystemDomain::GetGlobalLoaderAllocator()->GetExecutableHeap());
}


extern "C" VOID STDCALL StubRareEnableWorker(Thread *pThread)
{
 WRAPPER_NO_CONTRACT;

 //printf("RareEnable\n");
 pThread->RareEnablePreemptiveGC();
}




// Disable when calling into managed code from a place that fails via Exceptions
extern "C" VOID STDCALL StubRareDisableTHROWWorker(Thread *pThread)
{
Expand Down
Loading