Skip to content

Enable DOTNET_ThreadGuardPages opt-in config setting on 32-bit #117466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 10, 2025
Merged

Enable DOTNET_ThreadGuardPages opt-in config setting on 32-bit #117466

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c09821
Enable DOTNET_ThreadGuardPages opt-in config setting on 32-bit
tommcdon Jul 9, 2025
5f53226
Merge branch 'main' into dev/tommcdon/make_32bit_ThreadGuardPages_con…
tommcdon Jul 9, 2025
92e65c0
Simplify page guard computation
tommcdon Jul 10, 2025
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
17 changes: 9 additions & 8 deletions src/coreclr/vm/threads.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6134,21 +6134,22 @@ HRESULT Thread::CLRSetThreadStackGuarantee(SetThreadStackGuaranteeScope fScope)
//
EXTRA_PAGES = 3;
INDEBUG(EXTRA_PAGES += 1);
#else // HOST_64BIT
#ifdef _DEBUG
uGuardSize += (1 * GetOsPageSize()); // one extra page for debug infrastructure
#endif // _DEBUG
#endif // HOST_64BIT

int ThreadGuardPages = CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_ThreadGuardPages);
if (ThreadGuardPages == 0)
if (ThreadGuardPages != 0)
{
uGuardSize += (EXTRA_PAGES * GetOsPageSize());
uGuardSize += (ThreadGuardPages * GetOsPageSize());
}
#if defined(HOST_64BIT)
else
{
uGuardSize += (ThreadGuardPages * GetOsPageSize());
uGuardSize += (EXTRA_PAGES * GetOsPageSize());
}

#else // HOST_64BIT
#ifdef _DEBUG
uGuardSize += (1 * GetOsPageSize()); // one extra page for debug infrastructure
#endif // _DEBUG
#endif // HOST_64BIT

LOG((LF_EH, LL_INFO10000, "STACKOVERFLOW: setting thread stack guarantee to 0x%x\n", uGuardSize));
Expand Down
Loading