[PAGE_ALLOC] access page data from high

Author: Diego Ferrari

kernel/hw/hw.c

@@ -92,7 +92,7 @@ void detect_hardware(){
 void hw_high_va(){
     if (UART0_BASE) UART0_BASE |= HIGH_VA;
     if (MMIO_BASE) MMIO_BASE |= HIGH_VA;
-    if (BOARD_TYPE != 1 && PCI_BASE)//virt is probably doing some weird PCI address stuff already
+    if (BOARD_TYPE != 1 && PCI_BASE)
         PCI_BASE |= HIGH_VA;
     if (GICD_BASE) GICD_BASE |= HIGH_VA;
     if (GICC_BASE) GICC_BASE |= HIGH_VA;

kernel/memory/mmu.c

@@ -301,7 +301,7 @@ void debug_mmu_address(uint64_t va){
     uint64_t l2_index = (va >> 21) & 0x1FF;
     uint64_t l3_index = (va >> 12) & 0x1FF;
 
-    kprintf("Address %x is meant to be mapped to [%i][%i][%i][%i]",va, l0_index,l1_index,l2_index,l3_index);
+    kprintf("Address %llx is meant to be mapped to [%i][%i][%i][%i]",va, l0_index,l1_index,l2_index,l3_index);
 
     if (!(table[l0_index] & 1)) {
         kprintf("L1 Table missing");

kernel/memory/page_allocator.c

@@ -217,7 +217,7 @@ void* kalloc_inner(void *page, uint64_t size, uint16_t alignment, uint8_t level,
 
     kprintfv("[in_page_alloc] Requested size: %x", size);
 
-    mem_page *info = (mem_page*)page;
+    mem_page *info = (mem_page*)PHYS_TO_VIRT_P(page);
 
     if (size >= PAGE_SIZE){
         void* ptr = palloc(size, level, info->attributes, true);
@@ -246,22 +246,24 @@ void* kalloc_inner(void *page, uint64_t size, uint16_t alignment, uint8_t level,
         return ptr;
     }
 
-    FreeBlock** curr = &info->free_list;
-    while (*curr && (uintptr_t)(*curr) != 0xDEADBEEF && (uintptr_t)(*curr) != 0xDEADBEEFDEADBEEF) {
-        if ((*curr)->size >= size) {
+    FreeBlock** curr = PHYS_TO_VIRT_P(&info->free_list);
+    FreeBlock *cblock = *curr;
+    while (cblock && (uintptr_t)cblock != 0xDEADBEEF && (uintptr_t)cblock != 0xDEADBEEFDEADBEEF) {
+        if (cblock->size >= size) {
             kprintfv("[in_page_alloc] Reusing free block at %x",(uintptr_t)*curr);
 
-            uint64_t result = (uint64_t)*curr;
-            *curr = (*curr)->next;
+            uint64_t result = (uint64_t)cblock;
+            *curr = VIRT_TO_PHYS_P(cblock->next);
             memset((void*)result, 0, size);
             info->size += size;
             if (page_va){
                 return (void*)(page_va | (result & 0xFFF));
             } 
             return (void*)result;
         }
-        kprintfv("-> %x",(uintptr_t)&(*curr)->next);
-        curr = &(*curr)->next;
+        kprintfv("-> %x",(uintptr_t)&cblock->next);
+        curr = &(cblock)->next;
+        cblock = *curr;
     }
 
     kprintfv("[in_page_alloc] Current next pointer %x",info->next_free_mem_ptr);