Aren
/
toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmu: be annoying about making sure we aren't leaking pages?

This commit is contained in:
K. Lange 2021-06-01 22:36:54 +09:00
parent 01070fb2d0
commit e9d34d669b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/arch/x86_64/mmu.c
View File

@ -16,7 +16,7 @@
/**
* bitmap page allocator for 4KiB pages
*/
static uint32_t *frames;
static volatile uint32_t *frames;
static uint32_t nframes;
#define PAGE_SHIFT 12
@ -57,6 +57,7 @@ void mmu_frame_set(uintptr_t frame_addr) {
uint64_t index = INDEX_FROM_BIT(frame);
uint32_t offset = OFFSET_FROM_BIT(frame);
frames[index] |= ((uint32_t)1 << offset);
asm ("" ::: "memory");
}
}
@ -67,6 +68,7 @@ void mmu_frame_clear(uintptr_t frame_addr) {
uint64_t index = INDEX_FROM_BIT(frame);
uint32_t offset = OFFSET_FROM_BIT(frame);
frames[index] &= ~((uint32_t)1 << offset);
asm ("" ::: "memory");
}
}
@ -75,6 +77,7 @@ int mmu_frame_test(uintptr_t frame_addr) {
uint64_t frame = frame_addr >> PAGE_SHIFT;
uint64_t index = INDEX_FROM_BIT(frame);
uint32_t offset = OFFSET_FROM_BIT(frame);
asm ("" ::: "memory");
return !!(frames[index] & ((uint32_t)1 << offset));
}
@ -713,7 +716,7 @@ void mmu_init(size_t memsize, uintptr_t firstFreePage) {
/* We are now in the new stuff. */
frames = (void*)((uintptr_t)KERNEL_HEAP_START);
memset(frames, 0, bytesOfFrames);
memset((void*)frames, 0, bytesOfFrames);
/* Now mark everything up to (firstFreePage + bytesOfFrames) as in use */
for (uintptr_t i = 0; i < firstFreePage + bytesOfFrames; i += PAGE_SIZE) {
@ -763,6 +766,8 @@ void * sbrk(size_t bytes) {
mmu_invalidate(p);
}
memset(out, 0xAA, bytes);
heapStart += bytes;
spin_unlock(kheap_lock);
return out;