Skip to content
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

Jump to bottom

Guard against -1 Returned from sysconf for the Cache Sizes Causing Large Gen0 Sizes and Budgets for Certain Linux Distributions. #100502

Merged
merged 14 commits into from
Apr 3, 2024
Merged

Guard against -1 Returned from sysconf for the Cache Sizes Causing Large Gen0 Sizes and Budgets for Certain Linux Distributions. #100502

Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
198931a
Logging.
mrsharm Apr 1, 2024
b499a3a
Fixed comparison check
mrsharm Apr 1, 2024
3177f87
Fix logical operations
mrsharm Apr 1, 2024
a7bc64f
Completely guard against the cacheSize as UINTMAX_MAX
mrsharm Apr 1, 2024
a6677b1
Fix for right macro
mrsharm Apr 1, 2024
5868885
Ensure we are guarded against all cases where cacheSize == SIZE_MAX
mrsharm Apr 1, 2024
fadec3f
Added an extra guard and removed redundant case
mrsharm Apr 2, 2024
3f8edd8
Comment clean
mrsharm Apr 2, 2024
5e947b6
Added some additional asserts
mrsharm Apr 2, 2024
b442a1b
Removed unnecessary checks for cacheSize == SIZE_MAX
mrsharm Apr 2, 2024
692dd91
Cleaned up logic
mrsharm Apr 2, 2024
d765203
Fix type casting comparison
mrsharm Apr 2, 2024
c40ebd3
Removed redundant comment
mrsharm Apr 3, 2024
3469c01
Removed one more unneccesary guard
mrsharm Apr 3, 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
12 changes: 8 additions & 4 deletions src/coreclr/gc/unix/gcenv.unix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ bool ReadMemoryValueFromFile(const char* filename, uint64_t* val)
return result;
}

#define UPDATE_CACHE_SIZE_AND_LEVEL(NEW_CACHE_SIZE, NEW_CACHE_LEVEL) if (NEW_CACHE_SIZE > cacheSize) { cacheSize = NEW_CACHE_SIZE; cacheLevel = NEW_CACHE_LEVEL; }
#define UPDATE_CACHE_SIZE_AND_LEVEL(NEW_CACHE_SIZE, NEW_CACHE_LEVEL) if ((NEW_CACHE_SIZE != SIZE_MAX) && (NEW_CACHE_SIZE > cacheSize)) { cacheSize = NEW_CACHE_SIZE; cacheLevel = NEW_CACHE_LEVEL; }
mrsharm marked this conversation as resolved.
Show resolved Hide resolved

static size_t GetLogicalProcessorCacheSizeFromOS()
{
Expand Down Expand Up @@ -912,7 +912,9 @@ static size_t GetLogicalProcessorCacheSizeFromOS()
{
path_to_size_file[index] = (char)(48 + i);

if (ReadMemoryValueFromFile(path_to_size_file, &size))
// Only accept reading cache sizes from size files if they are
// non-bogus values i.e., non-zero and != SIZE_MAX.
if (ReadMemoryValueFromFile(path_to_size_file, &size) && ((size != SIZE_MAX) || (size != 0)))
mrsharm marked this conversation as resolved.
Show resolved Hide resolved
{
path_to_level_file[index] = (char)(48 + i);

Expand All @@ -930,7 +932,7 @@ static size_t GetLogicalProcessorCacheSizeFromOS()
#endif

#if (defined(HOST_ARM64) || defined(HOST_LOONGARCH64)) && !defined(TARGET_APPLE)
if (cacheSize == 0)
if (cacheSize == 0 || cacheSize == SIZE_MAX)
{
// We expect to get the L3 cache size for Arm64 but currently expected to be missing that info
// from most of the machines.
Expand Down Expand Up @@ -958,7 +960,7 @@ static size_t GetLogicalProcessorCacheSizeFromOS()
#endif

#if HAVE_SYSCTLBYNAME
if (cacheSize == 0)
if (cacheSize == 0 || cacheSize == SIZE_MAX)
{
int64_t cacheSizeFromSysctl = 0;
size_t sz = sizeof(cacheSizeFromSysctl);
Expand All @@ -974,6 +976,7 @@ static size_t GetLogicalProcessorCacheSizeFromOS()
if (success)
{
assert(cacheSizeFromSysctl > 0);
assert(cacheSizeFromSysctl != SIZE_MAX);
cacheSize = ( size_t) cacheSizeFromSysctl;
}
}
Expand Down Expand Up @@ -1011,6 +1014,7 @@ static size_t GetLogicalProcessorCacheSizeFromOS()
}
#endif

assert (cacheSize != SIZE_MAX);
return cacheSize;
}

Expand Down
Loading