X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/9406e904ddad5db2ba2dd550e21bbb224899fd79..b0c2a4be2d1f4f93ab01d0858979a12ef0735ec1:/lunaix-os/kernel/mm/vmm.c

diff --git a/lunaix-os/kernel/mm/vmm.c b/lunaix-os/kernel/mm/vmm.c
index 63ff9ac..e1f769d 100644
--- a/lunaix-os/kernel/mm/vmm.c
+++ b/lunaix-os/kernel/mm/vmm.c
@@ -1,9 +1,9 @@
+#include <hal/cpu.h>
 #include <libc/string.h>
 #include <lunaix/mm/page.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/vmm.h>
-#include <lunaix/assert.h>
-#include <hal/cpu.h>
+#include <lunaix/spike.h>
 
 #include <stdbool.h>
 
@@ -13,45 +13,56 @@ vmm_init()
     // TODO: something here?
 }
 
-ptd_t*
+x86_page_table*
 vmm_init_pd()
 {
-    ptd_t* dir = pmm_alloc_page();
+    x86_page_table* dir = (x86_page_table*)pmm_alloc_page();
     for (size_t i = 0; i < PG_MAX_ENTRIES; i++) {
-        dir[i] = 0;
+        dir->entry[i] = PTE_NULL;
     }
 
     // 递归映射，方便我们在软件层面进行查表地址转换
-    dir[PG_MAX_ENTRIES - 1] = NEW_L1_ENTRY(T_SELF_REF_PERM, dir);
+    dir->entry[PG_MAX_ENTRIES - 1] = NEW_L1_ENTRY(T_SELF_REF_PERM, dir);
 
     return dir;
 }
 
 int
-__vmm_map_internal(uint32_t l1_inx, uint32_t l2_inx, uintptr_t pa, pt_attr attr, int forced) {
-    ptd_t* l1pt = (ptd_t*)L1_BASE_VADDR;
-    pt_t* l2pt = (pt_t*)L2_VADDR(l1_inx);
+__vmm_map_internal(uint32_t l1_inx,
+                   uint32_t l2_inx,
+                   uintptr_t pa,
+                   pt_attr attr,
+                   int forced)
+{
+    x86_page_table* l1pt = (x86_page_table*)L1_BASE_VADDR;
+    x86_page_table* l2pt = (x86_page_table*)L2_VADDR(l1_inx);
 
     // See if attr make sense
     assert(attr <= 128);
 
-    if(!l1pt[l1_inx]) {
-        uint8_t* new_l1pt_pa = pmm_alloc_page();
+    if (!l1pt->entry[l1_inx]) {
+        x86_page_table* new_l1pt_pa = pmm_alloc_page();
 
         // 物理内存已满！
         if (!new_l1pt_pa) {
             return 0;
         }
 
-        l1pt[l1_inx] = NEW_L1_ENTRY(attr, new_l1pt_pa);
+        l1pt->entry[l1_inx] = NEW_L1_ENTRY(attr, new_l1pt_pa);
         memset((void*)L2_VADDR(l1_inx), 0, PG_SIZE);
     }
 
-    if (!forced && l2pt[l2_inx]) {
-        return 0;
+    x86_pte_t l2pte = l2pt->entry[l2_inx];
+    if (l2pte) {
+        if (!forced) {
+            return 0;
+        }
+        if (HAS_FLAGS(l2pte, PG_PRESENT)) {
+            assert_msg(pmm_free_page(GET_PG_ADDR(l2pte)), "fail to release physical page");
+        }
     }
 
-    l2pt[l2_inx] = NEW_L2_ENTRY(attr, pa);
+    l2pt->entry[l2_inx] = NEW_L2_ENTRY(attr, pa);
 
     return 1;
 }
@@ -64,26 +75,25 @@ vmm_map_page(void* va, void* pa, pt_attr tattr)
         return NULL;
     }
 
-    assert(((uintptr_t)va & 0xFFFU) == 0)
-    assert(((uintptr_t)pa & 0xFFFU) == 0)
+    assert(((uintptr_t)va & 0xFFFU) == 0) assert(((uintptr_t)pa & 0xFFFU) == 0);
 
     uint32_t l1_index = L1_INDEX(va);
     uint32_t l2_index = L2_INDEX(va);
-    ptd_t* l1pt = (ptd_t*)L1_BASE_VADDR;
+    x86_page_table* l1pt = (x86_page_table*)L1_BASE_VADDR;
 
     // 在页表与页目录中找到一个可用的空位进行映射（位于va或其附近）
-    ptd_t l1pte = l1pt[l1_index];
-    pt_t* l2pt = (pt_t*)L2_VADDR(l1_index);
+    x86_pte_t l1pte = l1pt->entry[l1_index];
+    x86_page_table* l2pt = (x86_page_table*)L2_VADDR(l1_index);
     while (l1pte && l1_index < PG_MAX_ENTRIES) {
         if (l2_index == PG_MAX_ENTRIES) {
             l1_index++;
             l2_index = 0;
-            l1pte = l1pt[l1_index];
-            l2pt = (pt_t*)L2_VADDR(l1_index);
+            l1pte = l1pt->entry[l1_index];
+            l2pt = (x86_page_table*)L2_VADDR(l1_index);
         }
         // 页表有空位，只需要开辟一个新的 PTE (Level 2)
-        if (l2pt && !l2pt[l2_index]) {
-            l2pt[l2_index] = NEW_L2_ENTRY(tattr, pa);
+        if (l2pt && !l2pt->entry[l2_index]) {
+            l2pt->entry[l2_index] = NEW_L2_ENTRY(tattr, pa);
             return (void*)V_ADDR(l1_index, l2_index, PG_OFFSET(va));
         }
         l2_index++;
@@ -94,7 +104,7 @@ vmm_map_page(void* va, void* pa, pt_attr tattr)
         return NULL;
     }
 
-    if (!__vmm_map_internal(l1_index, l2_index, pa, tattr, false)) {
+    if (!__vmm_map_internal(l1_index, l2_index, (uintptr_t)pa, tattr, false)) {
         return NULL;
     }
 
@@ -102,18 +112,18 @@ vmm_map_page(void* va, void* pa, pt_attr tattr)
 }
 
 void*
-vmm_fmap_page(void* va, void* pa, pt_attr tattr) {
+vmm_fmap_page(void* va, void* pa, pt_attr tattr)
+{
     if (!pa || !va) {
         return NULL;
     }
 
-    assert(((uintptr_t)va & 0xFFFU) == 0)
-    assert(((uintptr_t)pa & 0xFFFU) == 0)
+    assert(((uintptr_t)va & 0xFFFU) == 0) assert(((uintptr_t)pa & 0xFFFU) == 0);
 
     uint32_t l1_index = L1_INDEX(va);
     uint32_t l2_index = L2_INDEX(va);
 
-    if (!__vmm_map_internal(l1_index, l2_index, pa, tattr, true)) {
+    if (!__vmm_map_internal(l1_index, l2_index, (uintptr_t)pa, tattr, true)) {
         return NULL;
     }
 
@@ -134,70 +144,68 @@ vmm_alloc_page(void* vpn, pt_attr tattr)
 }
 
 int
-vmm_alloc_pages(void* va, size_t sz, pt_attr tattr) {
-    assert((uintptr_t)va % PG_SIZE == 0)
-    assert(sz % PG_SIZE == 0)
-    
+vmm_alloc_pages(void* va, size_t sz, pt_attr tattr)
+{
+    assert((uintptr_t)va % PG_SIZE == 0) assert(sz % PG_SIZE == 0);
+
     void* va_ = va;
-    for (size_t i = 0; i < (sz >> PG_SIZE_BITS); i++, va_ += PG_SIZE)
-    {
+    for (size_t i = 0; i < (sz >> PG_SIZE_BITS); i++, va_ += PG_SIZE) {
         void* pp = pmm_alloc_page();
         uint32_t l1_index = L1_INDEX(va_);
         uint32_t l2_index = L2_INDEX(va_);
-        if (!pp || !__vmm_map_internal(l1_index, l2_index, pp, tattr, false)) {
+        if (!pp || !__vmm_map_internal(
+                     l1_index, l2_index, (uintptr_t)pp, tattr, false)) {
             // if one failed, release previous allocated pages.
             va_ = va;
-            for (size_t j = 0; j < i; j++, va_ += PG_SIZE)
-            {
+            for (size_t j = 0; j < i; j++, va_ += PG_SIZE) {
                 vmm_unmap_page(va_);
             }
-            
+
             return false;
         }
     }
-    
+
     return true;
 }
 
 void
 vmm_unmap_page(void* va)
 {
-    assert(((uintptr_t)va & 0xFFFU) == 0)
+    assert(((uintptr_t)va & 0xFFFU) == 0);
 
     uint32_t l1_index = L1_INDEX(va);
     uint32_t l2_index = L2_INDEX(va);
-    ptd_t* l1pt = (ptd_t*)L1_BASE_VADDR;
+    x86_page_table* l1pt = (x86_page_table*)L1_BASE_VADDR;
 
-    ptd_t l1pte = l1pt[l1_index];
+    x86_pte_t l1pte = l1pt->entry[l1_index];
 
     if (l1pte) {
-        pt_t* l2pt = (pt_t*)L2_VADDR(l1_index);
-        uint32_t l2pte = l2pt[l2_index];
+        x86_page_table* l2pt = (x86_page_table*)L2_VADDR(l1_index);
+        x86_pte_t l2pte = l2pt->entry[l2_index];
         if (IS_CACHED(l2pte)) {
             pmm_free_page((void*)l2pte);
         }
         cpu_invplg(va);
-        l2pt[l2_index] = 0;
+        l2pt->entry[l2_index] = PTE_NULL;
     }
 }
 
 v_mapping
 vmm_lookup(void* va)
 {
-    assert(((uintptr_t)va & 0xFFFU) == 0)
+    assert(((uintptr_t)va & 0xFFFU) == 0);
 
     uint32_t l1_index = L1_INDEX(va);
     uint32_t l2_index = L2_INDEX(va);
-    uint32_t po = PG_OFFSET(va);
-    ptd_t* l1pt = (ptd_t*)L1_BASE_VADDR;
 
-    ptd_t l1pte = l1pt[l1_index];
+    x86_page_table* l1pt = (x86_page_table*)L1_BASE_VADDR;
+    x86_pte_t l1pte = l1pt->entry[l1_index];
 
     v_mapping mapping = { .flags = 0, .pa = 0, .pn = 0 };
     if (l1pte) {
-        pt_t l2pte = ((pt_t*)L2_VADDR(l1_index))[l2_index];
+        x86_pte_t l2pte =
+          ((x86_page_table*)L2_VADDR(l1_index))->entry[l2_index];
         if (l2pte) {
-            uintptr_t ppn = l2pte >> PG_SIZE_BITS;
             mapping.flags = PG_ENTRY_FLAGS(l2pte);
             mapping.pa = PG_ENTRY_ADDR(l2pte);
             mapping.pn = mapping.pa >> PG_SIZE_BITS;
@@ -208,6 +216,7 @@ vmm_lookup(void* va)
 }
 
 void*
-vmm_v2p(void* va) {
-    return vmm_lookup(va).pa;
+vmm_v2p(void* va)
+{
+    return (void*)vmm_lookup(va).pa;
 }
\ No newline at end of file