diff options
Diffstat (limited to 'kc/core/memory.c')
| -rw-r--r-- | kc/core/memory.c | 367 |
1 files changed, 169 insertions, 198 deletions
diff --git a/kc/core/memory.c b/kc/core/memory.c index 87395ba..0efdf81 100644 --- a/kc/core/memory.c +++ b/kc/core/memory.c @@ -1,6 +1,7 @@ #include "memory.h" #include "kprint.h" #include "panic.h" +#include "vm_tree.h" #include <stdint.h> @@ -30,7 +31,7 @@ enum memory_space_flags OBJECT_MEMORY_SPACE = 0x03, // a mapping managed by an underlying object MEMORY_SPACE_TYPE_MASK = 0x0f, // - + NOFAULT_MEMORY_FLAG = 0x10, // a mapping that cannot be resolved during a page fault NOSWAP_MEMORY_FLAG = 0x20, // a mapping that cannot be swapped out COW_MEMORY_FLAG = 0x40, // a mapping that is copy-on-write @@ -40,16 +41,6 @@ enum memory_space_flags INVALID_MEMORY_SPACE = 0xff }; -struct memory_space -{ - enum memory_space_flags flags; - page_fault_handler_func handler; - void *base; - void *head; - struct memory_space *next; - struct memory_space *prev; -}; - struct page { uint32_t next: 31; @@ -64,38 +55,32 @@ static size_t page_array_entries = 0; static size_t free_pages = 0; // the temporary mapping place. never use this permanently. -static void *const temp = (void *)0xffffffffffa00000; +static void *const vm_temp = (void *)0xffffffffffa00000; static uint64_t *const kernel_pm1 = (uint64_t *)0xffffffffffc00000; static uint64_t *const kernel_pm2 = (uint64_t *)0xffffffffffffe000; static uint64_t *get_kernel_pm1e(void *vaddr); static uint64_t *get_kernel_pm2e(void *vaddr); -static void *get_virtual_page(enum page_map_flags flags); static void *page_map_at(void *vaddr, phys_addr_t paddr, enum page_map_flags flags); -// handlers for memory space types -int anonymous_page_handler(uint32_t code, void *address); - -// the system memory_space's that are always present - -// NULL if the system address spaces are not set up -static struct memory_space *root_memory_space; -static struct memory_space core_code_space; // kernel core code -static struct memory_space core_static_space; // kernel core static data/bss -static struct memory_space core_object_space; // kernel core dynamic space +struct vm_tree core_vm_tree; +struct vm_tree_node core_pagestack_node; +struct vm_tree_node core_image_node; +struct vm_tree_node core_object_node; +struct vm_tree_node core_pagemaps_node; static struct memory_range init_grab_pages(struct memory_range *ranges, - int count, - size_t size) + int count, + size_t size) { struct memory_range request = {SYSTEM_MEMORY, - 0, - align_next(size, page_size(1))}; - + 0, + align_next(size, page_size(1))}; + for (int i = 0; i < count; i++) { if (ranges[i].type != AVAILABLE_MEMORY || - ranges[i].base < (1 << 20)) // leave pages below 1MiB alone. + ranges[i].base < (1 << 20)) // leave pages below 1MiB alone. { continue; } @@ -107,7 +92,7 @@ static struct memory_range init_grab_pages(struct memory_range *ranges, return request; } } - + request.type = INVALID_MEMORY; return request; } @@ -123,13 +108,13 @@ static size_t init_get_max_paddr(struct memory_range *ranges, int count) { continue; } - + if ((ranges[i].base + ranges[i].size - 1) > max_paddr) { max_paddr = ranges[i].base + ranges[i].size - 1; } } - + return max_paddr; } @@ -137,10 +122,10 @@ static phys_addr_t get_kernel_pm4_phys(void) { phys_addr_t pm4_phys; __asm__ ( - "mov %%cr3, %0\n\t" - : "=r"(pm4_phys) - ); - + "mov %%cr3, %0\n\t" + : "=r"(pm4_phys) + ); + return page_address(pm4_phys, 1); } @@ -148,15 +133,15 @@ static phys_addr_t get_kernel_pm3_phys(void) { phys_addr_t pm3_phys; // make a temporary mapping to read pm4 - uint64_t *pm4 = page_map_at(temp, - get_kernel_pm4_phys(), - CONTENT_RODATA|SIZE_2M); - + uint64_t *pm4 = page_map_at(vm_temp, + get_kernel_pm4_phys(), + CONTENT_RODATA|SIZE_2M); + // pm3_phys is in pm4. pm3_phys = page_address(pm4[pte_index(&kc_image_base, 4)], 1); // never leave a temporary mapping page_unmap(pm4); - + return pm3_phys; } @@ -164,41 +149,43 @@ static void init_map_page_array_pm2(struct memory_range *pm2_pages) { // now we need to write the physical address of each pm2 page for the // page_array in the kernel's pm3. - uint64_t *pm3 = page_map_at(temp, - get_kernel_pm3_phys(), - CONTENT_RWDATA|SIZE_2M); - + uint64_t *pm3 = page_map_at(vm_temp, + get_kernel_pm3_phys(), + CONTENT_RWDATA|SIZE_2M); + // the first index is NOT zero! for (size_t i = 0; i < (pm2_pages->size / PAGE_SIZE); i++) { - pm3[pte_index(page_array, 3) + i] = (pm2_pages->base + i * - PAGE_SIZE)|PAGE_NX|PAGE_WR|PAGE_PR; + pm3[pte_index(page_array, 3) + i] = ( + pm2_pages->base + i * + PAGE_SIZE)|PAGE_NX|PAGE_WR|PAGE_PR; } // never forget to unmap temporary mappings. page_unmap(pm3); } static void init_create_page_array_map(struct memory_range *pages, - struct memory_range *maps) + struct memory_range *maps) { // indices for page_array always start at 0 size_t entry_count = pages->size / PAGE_SIZE; - + // every 512 entries we need to re-map and clean. for (size_t i = 0; i < entry_count; i += PAGE_TABLE_INDEX_MASK) { - uint64_t *pm1 = page_map_at(temp, - maps->base + i * PAGE_SIZE, - CONTENT_RWDATA|SIZE_2M); + uint64_t *pm1 = page_map_at( + vm_temp, + maps->base + i * PAGE_SIZE, + CONTENT_RWDATA|SIZE_2M); memset(pm1, 0, PAGE_SIZE); for (size_t j = 0; - (j < PAGE_TABLE_INDEX_MASK) && ((j + i) < entry_count); - j++) + (j < PAGE_TABLE_INDEX_MASK) && ((j + i) < entry_count); + j++) { pm1[j] = (pages->base + (i + j) * PAGE_SIZE)| - PAGE_NX|PAGE_WR|PAGE_PR; + PAGE_NX|PAGE_WR|PAGE_PR; } - + page_unmap(pm1); } } @@ -211,7 +198,7 @@ static void init_set_memory_range(struct memory_range *range) { return; } - + if (range->type == AVAILABLE_MEMORY) { page_free(range->base + PAGE_SIZE * i); @@ -238,72 +225,46 @@ static void init_create_page_array(struct memory_range *ranges, int count) size_t max_paddr = init_get_max_paddr(ranges, count); page_array_entries = max_paddr / page_size(1); size_t page_array_size = page_array_entries * sizeof(struct page); - + // the physical pages that will contain page_array struct memory_range pa_pages = init_grab_pages(ranges, count, page_array_size); - + // the number of page tables needed to map pa_pages // this will be 1 on systems with less than 2GB of memory. size_t pm1_count = page_count(pa_pages.size, 2); struct memory_range pm1_pages = init_grab_pages(ranges, - count, - pm1_count * page_size(1)); - + count, + pm1_count * page_size(1)); + init_create_page_array_map(&pa_pages, &pm1_pages); - + // the number of page directories needed to map pa_pages // this will be 1 on systems with less than 1TB of memory. // who the fuck has 1TB of memory lol size_t pm2_count = page_count(pa_pages.size, 3); struct memory_range pm2_pages = init_grab_pages(ranges, - count, - pm2_count * page_size(1)); - + count, + pm2_count * page_size(1)); + init_create_page_array_map(&pm1_pages, &pm2_pages); - + // ok here goes init_map_page_array_pm2(&pm2_pages); - + memset(page_array, 0, page_array_size); - + init_populate_page_array(ranges, count); init_populate_page_array(&pa_pages, 1); init_populate_page_array(&pm1_pages, 1); init_populate_page_array(&pm2_pages, 1); } -static struct memory_space init_system_space(void *base, void *head) -{ - struct memory_space space = {TRANSLATION_MEMORY_SPACE| - NOFAULT_MEMORY_FLAG| - NOSWAP_MEMORY_FLAG, - NULL, - base, - head, - NULL, - NULL}; - return space; -} - -static struct memory_space init_anonymous_space(void *base, void *head) -{ - struct memory_space space = {ANONYMOUS_MEMORY_SPACE| - NOSWAP_MEMORY_FLAG, - &anonymous_page_handler, - base, - head, - NULL, - NULL}; - - return space; -} - static void *page_map_at(void *vaddr, - phys_addr_t paddr, - enum page_map_flags flags) + phys_addr_t paddr, + enum page_map_flags flags) { uint64_t entry = PAGE_PR; - + switch (flags & CONTENT_MASK) { case CONTENT_RODATA: @@ -315,10 +276,10 @@ static void *page_map_at(void *vaddr, default: break; } - + size_t offset; uint64_t *pte; - + switch (flags & SIZE_MASK) { case SIZE_2M: @@ -335,52 +296,85 @@ static void *page_map_at(void *vaddr, offset = 0; pte = NULL; } - + if (!pte) { return NULL; } - + *pte = entry; return (char *)vaddr + offset; } #define KERNEL_OBJECT_SPACE_EXTENT 0x1000000 // 16MiB for kernel object space? +static void init_vm_node(struct vm_tree_node *node, void *base, void *head) +{ + node->key = + (struct vm_tree_key) + { + (uintptr_t)base, + (size_t)head - (size_t)base + }; + + if (!vmt_search_key(&core_vm_tree, &node->key)) + { + kputs("inserting node\n"); + struct vm_tree_node *p = vmn_predecessor_key( + core_vm_tree.root, + &node->key); + vmt_insert( + &core_vm_tree, + node, + p, + vmn_child_direction(node, p)); + } + else + { + kputs("fatal: overlap on static vm node\n"); + } +} + void memory_init(struct kc_boot_data *boot_data) { - init_create_page_array(boot_data->phys_memory_map.base, + init_create_page_array( + boot_data->phys_memory_map.base, boot_data->phys_memory_map.entries); - core_code_space = init_system_space(&kc_text_begin, &kc_text_end); - core_static_space = init_system_space(&kc_data_begin, &kc_data_end); - core_object_space = init_anonymous_space(boot_data->object_space.base, - (void *)page_align(&kc_data_end + KERNEL_OBJECT_SPACE_EXTENT, 2)); - - root_memory_space = &core_code_space; + void * object_space_head = (void *)page_align( + boot_data->object_space.size + + (uintptr_t)boot_data->object_space.base, 1); - core_code_space.prev = NULL; - core_code_space.next = &core_static_space; - core_static_space.prev = &core_code_space; - core_static_space.next = &core_object_space; - core_object_space.prev = &core_static_space; - core_object_space.next = NULL; + kputs("vm node 1\n"); + init_vm_node( + &core_image_node, + &kc_image_base, + (void *)page_align(&kc_data_end, 1)); + kputs("vm node 2\n"); + init_vm_node( + &core_object_node, + (void *)page_align(&kc_data_end, 1), + object_space_head); + kputs("vm node 3\n"); + init_vm_node(&core_pagemaps_node, vm_temp, (void *)-1); } void *page_map(phys_addr_t paddr, enum page_map_flags flags) { - return page_map_at(get_virtual_page(flags), paddr, flags); + (void)paddr; + (void)flags; + return NULL; } void page_unmap(void *vaddr) { uint64_t *pte = get_kernel_pm2e(vaddr); - + if (pte && !(*pte & PAGE_LG)) { pte = get_kernel_pm1e(vaddr); } - + if (pte) { *pte = 0; @@ -391,26 +385,26 @@ void page_unmap(void *vaddr) phys_addr_t page_alloc(void) { int index = first_free_page_index; - + if (index > 0) { page_array[index].used = 1; first_free_page_index = page_array[index].next; free_pages--; } - + return (phys_addr_t)index * page_size(1); } void page_free(phys_addr_t paddr) { int index = paddr / page_size(1); - + if ((size_t)index > page_array_entries) { return; } - + page_array[index].used = 0; page_array[index].next = first_free_page_index; first_free_page_index = index; @@ -449,91 +443,69 @@ static uint64_t *get_kernel_pm2e(void *vaddr) return &kernel_pm2[kpm2_index(vaddr)]; } -static void *get_virtual_page(enum page_map_flags flags) -{ - (void)flags; - return NULL; +/* + int anonymous_page_handler(uint32_t code, void *address) + { + kputs("anonymous space fault\n"); + if (code & PAGE_PR) + { +// there's no reason a protection violation should happen +// in anonymous space +panic(UNHANDLED_FAULT); } +// kernel page mappings are built different +if (address >= (void *)&kc_image_base) +{ +uint64_t *pm2e = get_kernel_pm2e(address); -static struct memory_space *get_memory_space(void *address) +if (!page_address(*pm2e, 1)) { - // walk the memory space list - struct memory_space *space = root_memory_space; - - while (space) - { - kputs("checking a space\n"); - if ((space->base <= address) && (address < space->head)) - { - kputs("space matched\n"); - return space; - } - space = space->next; - } +// create a page table and install it +phys_addr_t pm1_phys = page_alloc(); +if (pm1_phys) +{ +uint64_t *pm1; +pm1 = page_map_at(temp, pm1_phys, CONTENT_RWDATA|SIZE_2M); +// zero the page +memset(pm1, 0, PAGE_SIZE); +// put the table where it goes + *pm2e = page_address(pm1_phys, 1)|PAGE_WR|PAGE_PR; + page_unmap(pm1); + } + else + { + panic(OUT_OF_MEMORY); + } + } - return NULL; + uint64_t *pm1e = get_kernel_pm1e(address); + + if (pm1e) + { + phys_addr_t page_phys = page_alloc(); + if (page_phys) + { + *pm1e = page_address(page_phys, 1)|PAGE_WR|PAGE_PR; +// clear a potentially dirty page. +memset((void *)page_address(address, 1), 0, page_size(1)); +} +} } -int anonymous_page_handler(uint32_t code, void *address) -{ - kputs("anonymous space fault\n"); - if (code & PAGE_PR) - { - // there's no reason a protection violation should happen - // in anonymous space - panic(UNHANDLED_FAULT); - } - // kernel page mappings are built different - if (address >= (void *)&kc_image_base) - { - uint64_t *pm2e = get_kernel_pm2e(address); - - if (!page_address(*pm2e, 1)) - { - // create a page table and install it - phys_addr_t pm1_phys = page_alloc(); - if (pm1_phys) - { - uint64_t *pm1; - pm1 = page_map_at(temp, pm1_phys, CONTENT_RWDATA|SIZE_2M); - // zero the page - memset(pm1, 0, PAGE_SIZE); - // put the table where it goes - *pm2e = page_address(pm1_phys, 1)|PAGE_WR|PAGE_PR; - page_unmap(pm1); - } - else - { - panic(OUT_OF_MEMORY); - } - } - - uint64_t *pm1e = get_kernel_pm1e(address); - - if (pm1e) - { - phys_addr_t page_phys = page_alloc(); - if (page_phys) - { - *pm1e = page_address(page_phys, 1)|PAGE_WR|PAGE_PR; - // clear a potentially dirty page. - memset((void *)page_address(address, 1), 0, page_size(1)); - } - } - } - - return 0; +return 0; } +*/ int page_fault_handler(uint32_t code, void *address) { - kputs("page faulmt\n"); - struct memory_space *space = get_memory_space(address); - if (space && space->handler) + (void)code; + kputs("page fault\n"); + struct vm_tree_key key = {(uintptr_t)address, 1}; + struct vm_tree_node *node = vmt_search_key(&core_vm_tree, &key); + if (node) { - kputs("found memory space\n"); - int result = space->handler(code, address); - + kputs("found memory object\n"); + int result = 1; if (result) { panic(UNHANDLED_FAULT); @@ -541,10 +513,9 @@ int page_fault_handler(uint32_t code, void *address) } else { - kputs("didn't found memory space\n"); + kputs("didn't find memory object\n"); panic(UNHANDLED_FAULT); } - return 0; } |