EMK/emk
1
0
Fork 0
Code Issues Activity

fix/kernel: Fixed broken table allocation for amd64 pagining API

Browse source
This commit is contained in:
Kevin Alavik 2025-05-14 19:51:36 +02:00
parent ea1156334e
commit 785972d708
Signed by: cmpsb
GPG key ID: 10D1CC0526FDC6D7
1 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
kernel/src/arch/paging.c
View file

@ -44,13 +44,14 @@ static inline uint64_t *get_or_alloc_table(uint64_t *table, uint64_t index, uint
if (!(table[index] & VMM_PRESENT))
{
uint64_t *new_table = palloc(1, true);
if (!new_table || ((uint64_t)new_table & (PAGE_SIZE - 1)))
if (!new_table || IS_PAGE_ALIGNED((uint64_t)new_table))
{
return NULL;
}
memset(new_table, 0, PAGE_SIZE);
table[index] = (uint64_t)PHYSICAL(new_table) | VMM_PRESENT | VMM_WRITE | (flags & VMM_USER);
table[index] = (uint64_t)PHYSICAL(new_table) | 0b111;
}
table[index] |= flags & 0xFF;
return (uint64_t *)HIGHER_HALF(table[index] & PAGE_MASK);
}
@ -95,14 +96,10 @@ uint64_t virt_to_phys(uint64_t *pagemap, uint64_t virt)
/* Set active pagemap (load CR3) */
void pmset(uint64_t *pagemap)
{
if (!pagemap || ((uint64_t)PHYSICAL(pagemap) & (PAGE_SIZE - 1)))
if (!pagemap || !IS_PAGE_ALIGNED((uint64_t)PHYSICAL(pagemap)))
{
kpanic(NULL, "Invalid pagemap");
}
if (!virt_to_phys(pagemap, (uint64_t)pagemap))
{
kpanic(NULL, "Pagemap not self-mapped");
}
__asm__ volatile("movq %0, %%cr3" ::"r"((uint64_t)PHYSICAL(pagemap)) : "memory");
}
@ -195,13 +192,6 @@ void paging_init(void)
}
memset(kernel_pagemap, 0, PAGE_SIZE);
/* Self-map pagemap */
uint64_t pagemap_phys = (uint64_t)PHYSICAL(kernel_pagemap);
if (vmap(kernel_pagemap, (uint64_t)kernel_pagemap, pagemap_phys, VMM_PRESENT | VMM_WRITE | VMM_NX))
{
kpanic(NULL, "Failed to self-map pagemap");
}
/* Map kernel sections */
uint64_t text_start = ALIGN_DOWN((uint64_t)__text_start, PAGE_SIZE);
uint64_t text_end = ALIGN_UP((uint64_t)__text_end, PAGE_SIZE);