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

vmm: add a pflock mutex to synchronize pagefaults

Browse Source
This commit is contained in:
Matheus
2023-07-26 22:47:00 -03:00
parent f5c5b01d85
commit 8ca2360991
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/include/kernel/vmm.h
+1
View File
@@ -58,6 +58,7 @@ typedef struct vmmcache_t {
typedef struct { typedef struct {
mutex_t lock; mutex_t lock;
mutex_t pflock;
vmmrange_t *ranges; vmmrange_t *ranges;
void *start; void *start;
void *end; void *end;
kernel-src/mm/vmm.c
+11 -4
View File
@@ -202,7 +202,6 @@ static void insertrange(vmmspace_t *space, vmmrange_t *newrange) {
freerange(newrange); freerange(newrange);
} }
} }
static void destroyrange(vmmrange_t *range, uintmax_t _offset, size_t size, int flags) { static void destroyrange(vmmrange_t *range, uintmax_t _offset, size_t size, int flags) {
@@ -297,7 +296,7 @@ bool vmm_pagefault(void *addr, bool user, int actions) {
if (space == NULL || (space == &kernelspace && user)) if (space == NULL || (space == &kernelspace && user))
return false; return false;
MUTEX_ACQUIRE(&space->lock, false); MUTEX_ACQUIRE(&space->pflock, false);
vmmrange_t *range = getrange(space, addr); vmmrange_t *range = getrange(space, addr);
bool status = false; bool status = false;
@@ -339,7 +338,7 @@ bool vmm_pagefault(void *addr, bool user, int actions) {
} }
cleanup: cleanup:
MUTEX_RELEASE(&space->lock); MUTEX_RELEASE(&space->pflock);
return status; return status;
} }
@@ -449,10 +448,16 @@ void vmm_unmap(void *addr, size_t size, int flags) {
if (space == NULL) if (space == NULL)
return; return;
// the pagefault handler lock is acquired
// in order to prevent some consistency issues
// when other threads are running on the same address space.
// the lock ordering is still pflock -> lock on both
// vmm_pagefault and vmm_unmap.
MUTEX_ACQUIRE(&space->pflock, false);
MUTEX_ACQUIRE(&space->lock, false); MUTEX_ACQUIRE(&space->lock, false);
unmap(space, addr, size); unmap(space, addr, size);
MUTEX_RELEASE(&space->lock); MUTEX_RELEASE(&space->lock);
MUTEX_RELEASE(&space->pflock);
} }
static scache_t *ctxcache; static scache_t *ctxcache;
@@ -462,6 +467,7 @@ static void ctxctor(scache_t *cache, void *obj) {
ctx->space.start = USERSPACE_START; ctx->space.start = USERSPACE_START;
ctx->space.end = USERSPACE_END; ctx->space.end = USERSPACE_END;
MUTEX_INIT(&ctx->space.lock); MUTEX_INIT(&ctx->space.lock);
MUTEX_INIT(&ctx->space.pflock);
ctx->space.ranges = NULL; ctx->space.ranges = NULL;
} }
@@ -572,6 +578,7 @@ extern volatile struct limine_memmap_request pmm_liminemap;
void vmm_init() { void vmm_init() {
__assert(sizeof(vmmcache_t) <= PAGE_SIZE); __assert(sizeof(vmmcache_t) <= PAGE_SIZE);
MUTEX_INIT(&kernelspace.lock); MUTEX_INIT(&kernelspace.lock);
MUTEX_INIT(&kernelspace.pflock);
cachelist = newcache(); cachelist = newcache();
vmm_kernelctx.pagetable = arch_mmu_newtable(); vmm_kernelctx.pagetable = arch_mmu_newtable();