Skip to content

loader: keep the page table region off a large page boundary #4382

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
Ben Hillis (benhillis) wants to merge 1 commit into from
Closed

loader: keep the page table region off a large page boundary #4382

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions vm/loader/src/paravisor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,13 @@ where
)?;
offset += heap_size;

// Relocating loaders only fix up identity map entries that overlap the
// relocation region, so keep the page table region sharing a large page
// with it. Otherwise the relocated cr3 is unmapped and VTL2 triple faults.
if offset.is_multiple_of(X64_LARGE_PAGE_SIZE) {
offset += HV_PAGE_SIZE;
}
Comment on lines +486 to +491

// The end of memory used by the loader, excluding pagetables.
let end_of_underhill_mem = offset;

Expand Down Expand Up @@ -1242,6 +1249,12 @@ where
)?;
next_addr += heap_size;

// Keep the page table region sharing a large page with the relocation
// region, so the identity map entry covering it is relocated with it.
if next_addr.is_multiple_of(u64::from(Arm64PageSize::Large)) {
next_addr += HV_PAGE_SIZE;
}

// The end of memory used by the loader, excluding pagetables.
let end_of_underhill_mem = next_addr;

Expand Down
Loading