mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 06:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: fix more logic bugs

Browse Source
This commit is contained in:
Qwinci
2025-01-13 16:17:15 +02:00
parent 4e98bcf99d
commit d3c79c06a4
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/mm/vmm.c
+7 -4
View File
@@ -169,6 +169,9 @@ static void insertrange(vmmspace_t *space, vmmrange_t *newrange) {
while (range->next) { while (range->next) {
if (newrange->start >= RANGE_TOP(range) && newrange->start < range->next->start) { // space inbetween two other ranges if (newrange->start >= RANGE_TOP(range) && newrange->start < range->next->start) { // space inbetween two other ranges
newrange->next = range->next; newrange->next = range->next;
if (newrange->next)
newrange->next->prev = newrange;
newrange->prev = range; newrange->prev = range;
range->next = newrange; range->next = newrange;
goto fragcheck; goto fragcheck;
@@ -659,21 +662,21 @@ bool vmm_pagefault(void *addr, bool user, int actions) {
} }
void *vmm_getphysical(void *addr, bool hold) { void *vmm_getphysical(void *addr, bool hold) {
addr = (void *)ROUND_DOWN((uintptr_t)addr, PAGE_SIZE); void *aligned_addr = (void *)ROUND_DOWN((uintptr_t)addr, PAGE_SIZE);
vmmspace_t *space = getspace(addr); vmmspace_t *space = getspace(aligned_addr);
if (space == NULL) if (space == NULL)
return NULL; return NULL;
MUTEX_ACQUIRE(&space->lock); MUTEX_ACQUIRE(&space->lock);
void *physical = arch_mmu_getphysical(current_vmm_context()->pagetable, addr); void *physical = arch_mmu_getphysical(current_vmm_context()->pagetable, aligned_addr);
if (hold) if (hold)
pmm_hold(physical); pmm_hold(physical);
MUTEX_RELEASE(&space->lock); MUTEX_RELEASE(&space->lock);
return physical + ((uintptr_t)addr - ROUND_DOWN((uintptr_t)addr, PAGE_SIZE)); return physical + ((uintptr_t)addr - (uintptr_t)aligned_addr);
} }