oops

core/mem/init.c

@@ -3,9 +3,9 @@
 #include <zinnia/init.h>
 #include <zinnia/panic.h>
 #include <zinnia/print.h>
+#include <zinnia/string.h>
 #include <zinnia/utils.h>
 #include <zinnia/vma.h>
-#include <zinnia/string.h>
 
 extern uint8_t __ld_text_start[];
 extern uint8_t __ld_text_end[];
@@ -48,11 +48,12 @@ void mem_init(struct phys_mem* map, size_t map_len, uintptr_t kernel_virt, phys_
     }
 
     // Set up the bootstrap allocator.
-    struct phys_mem* largest = map;
+    struct phys_mem* largest = nullptr;
     for (size_t i = 0; i < map_len; i++) {
-        if (map[i].length > largest->length && map[i].usage == PHYS_USABLE)
+        if (map[i].usage == PHYS_USABLE && (!largest || map[i].length > largest->length))
             largest = &map[i];
     }
+    assert(largest && largest->length >= pgsz, "No usable memory for bootstrap allocator");
     mem_phys_bootstrap(largest);
     log("mem: Using region [%p - %p] for bootstrap allocator\n",
         (void*)largest->address,
@@ -150,7 +151,10 @@ void mem_init(struct phys_mem* map, size_t map_len, uintptr_t kernel_virt, phys_
         for (size_t page = 0; page < length; page += pgsz) {
             phys_t paddr;
             assert(!mem_phys_alloc(1, 0, &paddr), "Failed to allocate memory for PFNDB!\n");
-            pmap_map(&kernel_vma.pmap, vaddr + page, paddr, PTE_READ | PTE_WRITE, CACHE_ANY);
+            assert(
+                !pmap_map(&kernel_vma.pmap, vaddr + page, paddr, PTE_READ | PTE_WRITE, CACHE_ANY),
+                "Failed to map PFNDB memory"
+            );
         }
     }
     vm_pfndb = (struct page*)arch_mem_pfndb_addr();

core/mem/vmo.c

@@ -213,7 +213,7 @@ errno_t vmo_new_phys(struct paged_vmo** out) {
 
 void vmo_truncate_paged(struct paged_vmo* paged, size_t length) {
     const size_t page_size = arch_mem_page_size();
-    const size_t keep_pages = ROUND_UP(length, page_size) / page_size;
+    const size_t keep_pages = ROUND_UP(length, page_size);
 
     spin_lock(&paged->lock);
     struct page_list** pp = &list_first(&paged->cache);