Kernel: Keep fast page always reserved
There was a bug where 32 bit target's reserve_free_page was allocating the fast page address
This commit is contained in:
@@ -485,6 +485,7 @@ namespace Kernel
|
||||
constexpr uint64_t pml4e = (uc_vaddr >> 39) & 0x1FF;
|
||||
constexpr uint64_t pdpte = (uc_vaddr >> 30) & 0x1FF;
|
||||
constexpr uint64_t pde = (uc_vaddr >> 21) & 0x1FF;
|
||||
constexpr uint64_t pte = (uc_vaddr >> 12) & 0x1FF;
|
||||
|
||||
uint64_t* pml4 = P2V(m_highest_paging_struct);
|
||||
ASSERT(!(pml4[pml4e] & Flags::Present));
|
||||
@@ -497,6 +498,10 @@ namespace Kernel
|
||||
uint64_t* pd = P2V(pdpt[pdpte] & s_page_addr_mask);
|
||||
ASSERT(!(pd[pde] & Flags::Present));
|
||||
pd[pde] = allocate_zeroed_page_aligned_page() | Flags::ReadWrite | Flags::Present;
|
||||
|
||||
uint64_t* pt = P2V(pd[pde] & s_page_addr_mask);
|
||||
ASSERT(pt[pte] == 0);
|
||||
pt[pte] = Flags::Reserved;
|
||||
}
|
||||
|
||||
void PageTable::map_fast_page(paddr_t paddr)
|
||||
@@ -542,7 +547,7 @@ namespace Kernel
|
||||
uint64_t* pt = P2V(pd[pde] & s_page_addr_mask);
|
||||
|
||||
ASSERT(pt[pte] & Flags::Present);
|
||||
pt[pte] = 0;
|
||||
pt[pte] = Flags::Reserved;
|
||||
|
||||
asm volatile("invlpg (%0)" :: "r"(fast_page()) : "memory");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user