Skip to content

[WIP] Fix to move to using GC pal within coreclr on Linux #78521

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
mangod9 wants to merge 5 commits into from
Closed

[WIP] Fix to move to using GC pal within coreclr on Linux #78521

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef751dc
Modify __int64 definition in PAL to match the OS definition (#77056)
janvorli Oct 18, 2022
8183541
Fix the __int64 to be long long on macOS only (#77268)
janvorli Oct 20, 2022
16495db
statically linking GC PAL on linux (#76985)
mangod9 Oct 25, 2022
540ea21
check the right return value for mmap (#77952)
mangod9 Nov 7, 2022
520c8c3
fixing alignment check which affects MacOS
mangod9 Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
check the right return value for mmap (#77952)
  • Loading branch information
@mangod9
mangod9 committed Nov 10, 2022
commit 540ea21691c214bcbbf58e1330d6ec8bc3fcd233
5 changes: 3 additions & 2 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 @@ -641,7 +641,7 @@ static void* VirtualReserveInner(size_t size, size_t alignment, uint32_t flags,
size_t alignedSize = size + (alignment - OS_PAGE_SIZE);
void * pRetVal = mmap(nullptr, alignedSize, PROT_NONE, MAP_ANON | MAP_PRIVATE | hugePagesFlag, -1, 0);

if (pRetVal != NULL)
if (pRetVal != MAP_FAILED)
{
void * pAlignedRetVal = (void *)(((size_t)pRetVal + (alignment - 1)) & ~(alignment - 1));
size_t startPadding = (size_t)pAlignedRetVal - (size_t)pRetVal;
Expand All @@ -663,9 +663,10 @@ static void* VirtualReserveInner(size_t size, size_t alignment, uint32_t flags,
// Do not include reserved memory in coredump.
madvise(pRetVal, size, MADV_DONTDUMP);
#endif
return pRetVal;
}

return pRetVal;
return NULL; // return NULL if mmap failed
}

// Reserve virtual memory range.
Expand Down