vmm - allow remapping

[lunaix-os.git] / lunaix-os / kernel / mm / vmm.c

diff --git a/lunaix-os/kernel/mm/vmm.c b/lunaix-os/kernel/mm/vmm.c
index a076a976cbbe2fa9f495bc9cafcc6af932f7b328..2f8d726ef86c669c23d100ac729f7765c1b00211 100644 (file)
--- a/lunaix-os/kernel/mm/vmm.c
+++ b/lunaix-os/kernel/mm/vmm.c
@@ -2,32 +2,8 @@
 #include <lunaix/mm/page.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/mm/page.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/vmm.h>

-
-// TODO: Move these nasty inline asm stuff into hal
-//      These should be arch dependent
-ptd_t*
-get_pd()
-{
-    ptd_t* pd;
-#ifdef __ARCH_IA32
-    __asm__("movl %%cr3, %0\n"
-            "andl $0xfffff000, %0"
-            : "=r"(pd));
-#endif
-    return (ptd_t*)P2V(pd);
-}
-
-void
-set_pd(ptd_t* pd)
-{
-#ifdef __ARCH_IA32
-    __asm__("movl %0, %%eax\n"
-            "andl $0xfffff000, %%eax\n"
-            "movl %%eax, %%cr3\n"
-            :
-            : "r"(pd));
-#endif
-}
+#include <lunaix/assert.h>
+#include <hal/cpu.h>

 
 void
 vmm_init()
 
 void
 vmm_init()


@@ -39,72 +15,112 @@ ptd_t*
 vmm_init_pd()
 {
     ptd_t* dir = pmm_alloc_page();
 vmm_init_pd()
 {
     ptd_t* dir = pmm_alloc_page();

-    for (size_t i = 0; i < 1024; i++) {
+    for (size_t i = 0; i < PG_MAX_ENTRIES; i++) {

         dir[i] = 0;
     }
 
         dir[i] = 0;
     }
 

-    // 自己映射自己，方便我们在软件层面进行查表地址转换
-    dir[1023] = PDE(T_SELF_REF_PERM, dir);
+    // 递归映射，方便我们在软件层面进行查表地址转换
+    dir[PG_MAX_ENTRIES - 1] = NEW_L1_ENTRY(T_SELF_REF_PERM, dir);

 
     return dir;
 }
 
 
     return dir;
 }
 

+int
+__vmm_map_internal(uint32_t l1_inx, uint32_t l2_inx, uintptr_t pa, pt_attr attr) {
+    ptd_t* l1pt = (ptd_t*)L1_BASE_VADDR;
+    pt_t* l2pt = (pt_t*)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 (!new_l1pt_pa) {
+            return 0;
+        }
+
+        l1pt[l1_inx] = NEW_L1_ENTRY(attr, new_l1pt_pa);
+        memset((void*)L2_VADDR(l1_inx), 0, PM_PAGE_SIZE);
+    }
+
+    l2pt[l2_inx] = NEW_L2_ENTRY(attr, pa);
+
+    return 1;
+}
+

 void*
 void*

-vmm_map_page(void* va, void* pa, pt_attr dattr, pt_attr tattr)
+vmm_map_page(void* va, void* pa, pt_attr tattr)

 {
     // 显然，对空指针进行映射没有意义。
     if (!pa || !va) {
         return NULL;
     }
 
 {
     // 显然，对空指针进行映射没有意义。
     if (!pa || !va) {
         return NULL;
     }
 

-    uintptr_t pd_offset = PD_INDEX(va);
-    uintptr_t pt_offset = PT_INDEX(va);
-    ptd_t* ptd = (ptd_t*)PTD_BASE_VADDR;
+    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;

 
     // 在页表与页目录中找到一个可用的空位进行映射（位于va或其附近）
 
     // 在页表与页目录中找到一个可用的空位进行映射（位于va或其附近）

-    ptd_t pde = ptd[pd_offset];
-    pt_t* pt = (pt_t*)PT_VADDR(pd_offset);
-    while (pde && pd_offset < 1024) {
-        if (pt_offset == 1024) {
-            pd_offset++;
-            pt_offset = 0;
-            pde = ptd[pd_offset];
-            pt = (pt_t*)PT_VADDR(pd_offset);
+    ptd_t l1pte = l1pt[l1_index];
+    pt_t* l2pt = (pt_t*)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);

         }
         }

-        // 页表有空位，只需要开辟一个新的 PTE
-        if (pt && !pt[pt_offset]) {
-            pt[pt_offset] = PTE(tattr, pa);
-            return (void*)V_ADDR(pd_offset, pt_offset, PG_OFFSET(va));
+        // 页表有空位，只需要开辟一个新的 PTE (Level 2)
+        if (l2pt && !l2pt[l2_index]) {
+            l2pt[l2_index] = NEW_L2_ENTRY(tattr, pa);
+            return (void*)V_ADDR(l1_index, l2_index, PG_OFFSET(va));

         }
         }

-        pt_offset++;
+        l2_index++;

     }
 
     // 页目录与所有页表已满！
     }
 
     // 页目录与所有页表已满！

-    if (pd_offset > 1024) {
+    if (l1_index > PG_MAX_ENTRIES) {

         return NULL;
     }
 
         return NULL;
     }
 

-    // 页目录有空位，需要开辟一个新的 PDE
-    uint8_t* new_pt_pa = pmm_alloc_page();
+    if (!__vmm_map_internal(l1_index, l2_index, pa, tattr)) {
+        return NULL;
+    }
+
+    return (void*)V_ADDR(l1_index, l2_index, PG_OFFSET(va));
+}

 
 

-    // 物理内存已满！
-    if (!new_pt_pa) {
+void*
+vmm_fmap_page(void* va, void* pa, pt_attr tattr) {
+    if (!pa || !va) {

         return NULL;
     }
 
         return NULL;
     }
 

-    ptd[pd_offset] = PDE(dattr, new_pt_pa);
+    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)) {
+        return NULL;
+    }

 
 

-    memset((void*)PT_VADDR(pd_offset), 0, PM_PAGE_SIZE);
-    pt[pt_offset] = PTE(tattr, pa);
+    cpu_invplg(va);

 
 

-    return (void*)V_ADDR(pd_offset, pt_offset, PG_OFFSET(va));
+    return (void*)V_ADDR(l1_index, l2_index, PG_OFFSET(va));

 }
 
 void*
 }
 
 void*

-vmm_alloc_page(void* vpn, pt_attr dattr, pt_attr tattr)
+vmm_alloc_page(void* vpn, pt_attr tattr)

 {
     void* pp = pmm_alloc_page();
 {
     void* pp = pmm_alloc_page();

-    void* result = vmm_map_page(vpn, pp, dattr, tattr);
+    void* result = vmm_map_page(vpn, pp, tattr);

     if (!result) {
         pmm_free_page(pp);
     }
     if (!result) {
         pmm_free_page(pp);
     }


@@ -112,43 +128,53 @@ vmm_alloc_page(void* vpn, pt_attr dattr, pt_attr tattr)
 }
 
 void
 }
 
 void

-vmm_unmap_page(void* vpn)
+vmm_unmap_page(void* va)

 {
 {

-    uintptr_t pd_offset = PD_INDEX(vpn);
-    uintptr_t pt_offset = PT_INDEX(vpn);
-    ptd_t* self_pde = (ptd_t*)PTD_BASE_VADDR;
-
-    ptd_t pde = self_pde[pd_offset];
-
-    if (pde) {
-        pt_t* pt = (pt_t*)PT_VADDR(pd_offset);
-        uint32_t pte = pt[pt_offset];
-        if (IS_CACHED(pte) && pmm_free_page((void*)pte)) {
-// 刷新TLB
-#ifdef __ARCH_IA32
-            __asm__("invlpg (%0)" ::"r"((uintptr_t)vpn) : "memory");
-#endif
+    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;
+
+    ptd_t l1pte = l1pt[l1_index];
+
+    if (l1pte) {
+        pt_t* l2pt = (pt_t*)L2_VADDR(l1_index);
+        uint32_t l2pte = l2pt[l2_index];
+        if (IS_CACHED(l2pte) && pmm_free_page((void*)l2pte)) {
+            cpu_invplg(va);

         }
         }

-        pt[pt_offset] = 0;
+        l2pt[l2_index] = 0;

     }
 }
 
     }
 }
 

-void*
-vmm_v2p(void* va)
+v_mapping
+vmm_lookup(void* va)

 {
 {

-    uintptr_t pd_offset = PD_INDEX(va);
-    uintptr_t pt_offset = PT_INDEX(va);
-    uintptr_t po = PG_OFFSET(va);
-    ptd_t* self_pde = (ptd_t*)PTD_BASE_VADDR;
-
-    ptd_t pde = self_pde[pd_offset];
-    if (pde) {
-        pt_t pte = ((pt_t*)PT_VADDR(pd_offset))[pt_offset];
-        if (pte) {
-            uintptr_t ppn = pte >> 12;
-            return (void*)P_ADDR(ppn, po);
+    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];
+
+    v_mapping mapping = { .flags = 0, .pa = 0, .pn = 0 };
+    if (l1pte) {
+        pt_t l2pte = ((pt_t*)L2_VADDR(l1_index))[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;

         }
     }
 
         }
     }
 

-    return NULL;
+    return mapping;
+}
+
+void*
+vmm_v2p(void* va) {
+    return vmm_lookup(va).pa;

 }
\ No newline at end of file
 }
\ No newline at end of file