Skip to content

Fix memory unmap for Risc/ARM #2466

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

Open
zyuiop wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix memory unmap for Risc/ARM #2466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab4f774
riscv: fix memory unmapping
zyuiop Jun 5, 2026
fbeb77e
aarch64: fix memory unmapping
zyuiop Jun 5, 2026
d5f27ea
aarch64: fix
zyuiop Jun 5, 2026
2274e53
riscv64: fix
zyuiop Jun 5, 2026
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
4 changes: 2 additions & 2 deletions src/arch/aarch64/mm/paging.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,8 @@ impl<L: PageTableLevel> PageTableMethods for PageTable<L> {
}

if flags == PageTableEntryFlags::BLANK {
// in this case we unmap the pages
self.entries[index].set(physical_address, flags);
// We already unmapped the page
return;
} else {
self.entries[index].set(physical_address, S::MAP_EXTRA_FLAG | flags);
}
Expand Down
18 changes: 14 additions & 4 deletions src/arch/riscv64/mm/paging.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,11 @@ impl PageTableEntry {
(self.physical_address_and_flags & PageTableEntryFlags::EXECUTABLE.bits()) != 0
}

/// Mark this as an invalid (not present) entry
fn unset(&mut self) {
self.physical_address_and_flags = PhysAddr::zero();
}

/// Mark this as a valid (present) entry and set address translation and flags.
///
/// # Arguments
Expand Down Expand Up @@ -377,10 +382,15 @@ impl<L: PageTableLevel> PageTableMethods for PageTable<L> {
let index = page.table_index::<L>();
let flush = self.entries[index].is_present();

self.entries[index].set(
physical_address,
S::MAP_EXTRA_FLAG | PageTableEntryFlags::ACCESSED | PageTableEntryFlags::DIRTY | flags,
);
if physical_address.is_null() && flags == PageTableEntryFlags::BLANK {
// Clear PTE
self.entries[index].unset();
} else {
self.entries[index].set(
physical_address,
S::MAP_EXTRA_FLAG | PageTableEntryFlags::ACCESSED | PageTableEntryFlags::DIRTY | flags,
);
}

if flush {
page.flush_from_tlb();
Expand Down
Loading