Code-base clean-up and refactoring (#47)

[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 928c289f86f4fc6c03017ab104574a7990ecc8e5..180d7f40fb55e93a52b33eddb76414026b1eeb8d 100644 (file)
--- a/lunaix-os/kernel/mm/vmm.c
+++ b/lunaix-os/kernel/mm/vmm.c
@@ -1,243 +1,88 @@
-#include <hal/cpu.h>

 #include <klibc/string.h>
 #include <lunaix/mm/page.h>
 #include <klibc/string.h>
 #include <lunaix/mm/page.h>

-#include <lunaix/mm/pmm.h>
-#include <lunaix/mm/vmm.h>

 #include <lunaix/spike.h>
 #include <lunaix/spike.h>

+#include <lunaix/syslog.h>

 
 

-#include <stdbool.h>
+#include <asm/cpu.h>
+#include <asm/mm_defs.h>

 
 

-void
-vmm_init()
-{
-    // TODO: something here?
-}
+LOG_MODULE("VM")

 
 

-x86_page_table*
-vmm_init_pd()
+pte_t
+vmm_tryptep(pte_t* ptep, size_t lvl_size)

 {
 {

-    x86_page_table* dir = (x86_page_table*)pmm_alloc_page();
-    for (size_t i = 0; i < PG_MAX_ENTRIES; i++) {
-        dir->entry[i] = PTE_NULL;
-    }
-
-    // 递归映射，方便我们在软件层面进行查表地址转换
-    dir->entry[PG_MAX_ENTRIES - 1] = NEW_L1_ENTRY(T_SELF_REF_PERM, dir);
-
-    return dir;
+    ptr_t va = ptep_va(ptep, lvl_size);
+    pte_t* _ptep = mkl0tep(ptep);
+    pte_t pte;
+
+    if (pte_isnull(pte = *_ptep) || _ptep == ptep) 
+        return pte;
+
+#if LnT_ENABLED(1)
+    _ptep = getl1tep(_ptep, va);
+    if (_ptep == ptep || pte_isnull(pte = *_ptep)) 
+        return pte;
+#endif
+#if LnT_ENABLED(2)
+    _ptep = getl2tep(_ptep, va);
+    if (_ptep == ptep || pte_isnull(pte = *_ptep)) 
+        return pte;
+#endif
+#if LnT_ENABLED(3)
+    _ptep = getl3tep(_ptep, va);
+    if (_ptep == ptep || pte_isnull(pte = *_ptep)) 
+        return pte;
+#endif
+    _ptep = getlftep(_ptep, va);
+    return *_ptep;

 }
 
 }
 

-int
-__vmm_map_internal(uint32_t l1_inx,
-                   uint32_t l2_inx,
-                   uintptr_t pa,
-                   pt_attr attr,
-                   int forced)
+ptr_t
+vms_mount(ptr_t mnt, ptr_t vms_root)

 {
 {

-    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->entry[l1_inx]) {
-        x86_page_table* new_l1pt_pa = pmm_alloc_page();
-
-        // 物理内存已满！
-        if (!new_l1pt_pa) {
-            return 0;
-        }
-
-        l1pt->entry[l1_inx] = NEW_L1_ENTRY(attr, new_l1pt_pa);
-        memset((void*)L2_VADDR(l1_inx), 0, PG_SIZE);
-    }
-
-    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->entry[l2_inx] = NEW_L2_ENTRY(attr, pa);
-
-    return 1;
-}
-
-void*
-vmm_map_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);
-
-    uint32_t l1_index = L1_INDEX(va);
-    uint32_t l2_index = L2_INDEX(va);
-    x86_page_table* l1pt = (x86_page_table*)L1_BASE_VADDR;
-
-    // 在页表与页目录中找到一个可用的空位进行映射（位于va或其附近）
-    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->entry[l1_index];
-            l2pt = (x86_page_table*)L2_VADDR(l1_index);
-        }
-        // 页表有空位，只需要开辟一个新的 PTE (Level 2)
-        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++;
-    }
-
-    // 页目录与所有页表已满！
-    if (l1_index > PG_MAX_ENTRIES) {
-        return NULL;
-    }
-
-    if (!__vmm_map_internal(l1_index, l2_index, (uintptr_t)pa, tattr, false)) {
-        return NULL;
-    }
-
-    return (void*)V_ADDR(l1_index, l2_index, PG_OFFSET(va));
-}
-
-void*
-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(vms_root);

 
 

-    uint32_t l1_index = L1_INDEX(va);
-    uint32_t l2_index = L2_INDEX(va);
-
-    if (!__vmm_map_internal(l1_index, l2_index, (uintptr_t)pa, tattr, true)) {
-        return NULL;
-    }
-
-    cpu_invplg(va);
-
-    return (void*)V_ADDR(l1_index, l2_index, PG_OFFSET(va));
+    pte_t* ptep = mkl0tep_va(VMS_SELF, mnt);
+    set_pte(ptep, mkpte(vms_root, KERNEL_PGTAB));
+    tlb_flush_kernel(mnt);
+    return mnt;

 }
 
 }
 

-void*
-vmm_alloc_page(void* vpn, pt_attr tattr)
+ptr_t
+vms_unmount(ptr_t mnt)

 {
 {

-    void* pp = pmm_alloc_page();
-    void* result = vmm_map_page(vpn, pp, tattr);
-    if (!result) {
-        pmm_free_page(pp);
-    }
-    return result;
+    pte_t* ptep = mkl0tep_va(VMS_SELF, mnt);
+    set_pte(ptep, null_pte);
+    tlb_flush_kernel(mnt);
+    return mnt;

 }
 
 }
 

-int
-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) {
-        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, (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) {
-                vmm_unmap_page(va_);
-            }
-
-            return false;
-        }
-    }
-
-    return true;
-}

 
 void
 
 void

-vmm_set_mapping(void* va, void* pa, pt_attr attr) {
-    assert(((uintptr_t)va & 0xFFFU) == 0);
-
-    uint32_t l1_index = L1_INDEX(va);
-    uint32_t l2_index = L2_INDEX(va);
-
-    // prevent map of recursive mapping region
-    if (l1_index == 1023) {
+ptep_alloc_hierarchy(pte_t* ptep, ptr_t va, pte_attr_t prot)
+{
+    pte_t* _ptep;
+    
+    _ptep = mkl0tep(ptep);
+    if (_ptep == ptep) {

         return;
     }
         return;
     }

-    
-    __vmm_map_internal(l1_index, l2_index, (uintptr_t)pa, attr, false);
-}

 
 

-void
-vmm_unmap_page(void* va)
-{
-    assert(((uintptr_t)va & 0xFFFU) == 0);
-
-    uint32_t l1_index = L1_INDEX(va);
-    uint32_t l2_index = L2_INDEX(va);
-
-    // prevent unmap of recursive mapping region
-    if (l1_index == 1023) {
+    _ptep = mkl1t(_ptep, va, prot);
+    if (_ptep == ptep) {

         return;
     }
 
         return;
     }
 

-    x86_page_table* l1pt = (x86_page_table*)L1_BASE_VADDR;
-
-    x86_pte_t l1pte = l1pt->entry[l1_index];
-
-    if (l1pte) {
-        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->entry[l2_index] = PTE_NULL;
+    _ptep = mkl2t(_ptep, va, prot);
+    if (_ptep == ptep) {
+        return;

     }
     }

-}

 
 

-v_mapping
-vmm_lookup(void* va)
-{
-    assert(((uintptr_t)va & 0xFFFU) == 0);
-
-    uint32_t l1_index = L1_INDEX(va);
-    uint32_t l2_index = L2_INDEX(va);
-
-    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) {
-        x86_pte_t l2pte =
-          ((x86_page_table*)L2_VADDR(l1_index))->entry[l2_index];
-        if (l2pte) {
-            mapping.flags = PG_ENTRY_FLAGS(l2pte);
-            mapping.pa = PG_ENTRY_ADDR(l2pte);
-            mapping.pn = mapping.pa >> PG_SIZE_BITS;
-        }
+    _ptep = mkl3t(_ptep, va, prot);
+    if (_ptep == ptep) {
+        return;

     }
 
     }
 

-    return mapping;
-}
-
-void*
-vmm_v2p(void* va)
-{
-    return (void*)vmm_lookup(va).pa;
+    _ptep = mklft(_ptep, va, prot);
+    assert(_ptep == ptep);

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