drew/acadia
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

[Zion] Mark pages as not present before calling invlpg.

Browse source
This commit is contained in:
Drew Galbraith 2023-12-05 16:11:37 -08:00
parent 1f8085f791
commit 815a603c1c
6 changed files with 48 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
zion/object/address_space.cpp
View file

@ -29,7 +29,8 @@ glcr::ErrorOr<uint64_t> AddressSpace::AllocateUserStack() {
}
glcr::ErrorCode AddressSpace::FreeUserStack(uint64_t base) {
RET_ERR(FreeAddressRange(base, base + kUserStackSize));
RET_ERR(FreeAddressRange(base, base + kUserStackSize,
/* is_dying_proc= */ false));
user_stacks_.FreeUserStack(base);
return glcr::OK;
}
@ -66,19 +67,21 @@ glcr::ErrorOr<uint64_t> AddressSpace::MapInMemoryObject(
}
glcr::ErrorCode AddressSpace::FreeAddressRange(uint64_t vaddr_base,
uint64_t vaddr_limit) {
uint64_t vaddr_limit,
bool is_dying_proc) {
RET_ERR(mapping_tree_.FreeMemoryRange(vaddr_base, vaddr_limit));
// If this is the current address space we need to invalidate any pages.
if (is_dying_proc) {
return glcr::OK;
}
// TODO: Consider moving this to the Mapping Tree implmementation to only
// call this instruction for pages that we know are mapped.
if (cr3_ == CurrCr3()) {
for (uint64_t addr = vaddr_base; addr < vaddr_limit; addr += kPageSize) {
asm volatile("invlpg (%0)" : : "b"(addr) : "memory");
}
// Clobber vaddr_limit as well in case of an alignment issue.
asm volatile("invlpg (%0)" : : "b"(vaddr_limit) : "memory");
for (uint64_t addr = vaddr_base; addr < vaddr_limit; addr += kPageSize) {
UnmapPage(cr3_, addr);
}
// Clobber vaddr_limit as well in case of an alignment issue.
UnmapPage(cr3_, vaddr_limit);
return glcr::OK;
}

3
zion/object/address_space.h
View file

@ -82,7 +82,8 @@ class AddressSpace : public KernelObject {
const glcr::RefPtr<MemoryObject>& mem_obj, uint64_t align);
[[nodiscard]] glcr::ErrorCode FreeAddressRange(uint64_t vaddr_base,
uint64_t vaddr_limit);
uint64_t vaddr_limit,
bool is_dying_proc);
// Kernel Mappings.
uint64_t AllocateKernelStack();

5
zion/object/process.cpp
View file

@ -103,8 +103,9 @@ void Process::Cleanup() {
caps_.ReleaseAll();
// 3. Unmap all user memory.
PANIC_ON_ERR(vmas_->FreeAddressRange(0, kUserSpaceMax),
"Failed to cleanup userspace mappings in process exit.");
PANIC_ON_ERR(
vmas_->FreeAddressRange(0, kUserSpaceMax, /* is_dying_proc= */ true),
"Failed to cleanup userspace mappings in process exit.");
// 4. Release paging structures.
vmas_ = nullptr;