wash/mango
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented more memory manager and btree tests in sandbox

Browse Source
This commit is contained in:
max 🍓
2023-01-19 20:52:56 +00:00
parent a53edf230f
commit 1bd9576a8d
7 changed files with 152 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sandbox/vm/include/socks/vm.h
View File

@@ -4,6 +4,9 @@
#include <stddef.h>
#include <socks/types.h>
#include <socks/status.h>
#include <socks/queue.h>
#define VM_PAGE_SIZE 0x1000
typedef enum vm_zone_id {
VM_ZONE_DMA = 1u,
@@ -24,7 +27,7 @@ typedef struct vm_zone_descriptor {
} vm_zone_descriptor_t;
typedef struct vm_zone {
unsigned z_reserved[32];
unsigned char z_reserved[32];
} vm_zone_t;
typedef struct vm_pg_data {
@@ -43,9 +46,15 @@ typedef enum vm_page_flags {
typedef struct vm_page {
uint32_t p_flags; /* vm_page_flags_t bitfield */
/* buddy allocator free page list head */
queue_entry_t p_buddy_list;
/* order of the page block that this page belongs too */
unsigned int p_order;
} __attribute__((packed)) vm_page_t;
extern kern_status_t vm_bootstrap(const vm_region_t *mem_map, size_t nr_mem_map_entries);
extern kern_status_t vm_bootstrap(void);
extern void vm_page_init(vm_page_t *pg);

41
sandbox/vm/vm_bootstrap.c
View File

@@ -1,33 +1,44 @@
#include <socks/status.h>
#include <limits.h>
#include <socks/vm.h>
#include <socks/memblock.h>
#include <stddef.h>
#include <limits.h>
#include <stdio.h>
/* One vm_pg_data_t per NUMA node. Right now we're only worrying about a single node */
static vm_pg_data_t node_data = {};
/* One vm_pg_data_t per NUMA node. */
static vm_pg_data_t *node_data = NULL;
kern_status_t vm_bootstrap(const vm_region_t *mem_map, size_t nr_mem_map_entries)
/* array of pages, one for each physical page frame present in RAM */
static vm_page_t *page_array = NULL;
kern_status_t vm_bootstrap()
{
uintptr_t pmap_min = UINTPTR_MAX, pmap_max = 0x0;
int numa_count = 1;
for (size_t i = 0; i < nr_mem_map_entries; i++) {
if (mem_map[i].r_base < pmap_min) {
pmap_min = mem_map[i].r_base;
}
/* we're only worrying about UMA systems for now */
node_data = memblock_alloc(sizeof(vm_pg_data_t) * numa_count);
if (mem_map[i].r_limit > pmap_max) {
pmap_max = mem_map[i].r_limit;
size_t pmem_size = 0;
memblock_iter_t it;
for_each_mem_range (&it, 0x0, UINTPTR_MAX) {
if (pmem_size < it.it_limit + 1) {
pmem_size = it.it_limit + 1;
}
}
memblock_add(pmap_min, pmap_max);
size_t nr_pages = pmem_size / VM_PAGE_SIZE;
if (pmem_size % VM_PAGE_SIZE) {
nr_pages++;
}
page_array = memblock_alloc(sizeof(vm_page_t) * nr_pages);
printf("page_array covers 0x%zx bytes, %zu page frames\n", pmem_size, pmem_size / 0x1000);
printf("page_array is %zu bytes long\n", sizeof(vm_page_t) * nr_pages);
for (size_t i = 0; i < nr_mem_map_entries; i++) {
if (mem_map[i].r_status == VM_REGION_RESERVED) {
memblock_reserve(mem_map[i].r_base, mem_map[i].r_limit);
}
for (size_t i = 0; i < nr_pages; i++) {
vm_page_init(&page_array[i]);
}
return KERN_OK;

7
sandbox/vm/vm_page.c Normal file
View File

@@ -0,0 +1,7 @@
#include <socks/vm.h>
#include <string.h>
void vm_page_init(vm_page_t *pg)
{
memset(pg, 0x0, sizeof *pg);
}