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

8253332: ZGC: Make heap views reservation platform independent #236

Closed
wants to merge 4 commits into from
+58 −74
Closed

8253332: ZGC: Make heap views reservation platform independent #236

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a071cb
8253332: ZGC: Make heap views reservation platform independent
stefank Sep 18, 2020
2509713
Review 1
stefank Sep 18, 2020
bb10b9c
Review 2
stefank Sep 18, 2020
4830837
Review 3
stefank Sep 21, 2020
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: 1 addition & 1 deletion src/hotspot/os/posix/gc/z/zVirtualMemory_posix.cpp
View file
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ uintptr_t ZVirtualMemoryManager::os_reserve(uintptr_t addr, size_t size) {

if (res != addr) {
// Failed to reserve memory at the requested address
os_unreserve(res, size);
munmap((void*)res, size);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No assert for munmap result? I don't care either way, but it would probably be nice to capture this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, hold on a sec. Shouldn't this path return 0 too? Otherwise callers get the non-zero address that is effectively unusable.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this particular function, the calling code is responsible for dealing with that. That is, I adopted the style used by the windows reserve_contiguous_platform, instead of using the posix implementation. But it's probably nicer to not leak out that address unnecessarily. I'll change this to the posix version instead.

}

return res;
6 changes: 3 additions & 3 deletions src/hotspot/share/gc/z/zVirtualMemory.cpp
View file
Original file line number Diff line number Diff line change
@@ -123,9 +123,9 @@ bool ZVirtualMemoryManager::reserve_contiguous_inner(uintptr_t start, size_t siz
}

// Register address views with native memory tracker
nmt_reserve(ZAddress::marked0(start), size);
nmt_reserve(ZAddress::marked1(start), size);
nmt_reserve(ZAddress::remapped(start), size);
nmt_reserve(marked0, size);
nmt_reserve(marked1, size);
nmt_reserve(remapped, size);

return true;
}