* Remove the debugging hack in procvm.c

[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 55fe52ba22e1509b58997f6d9fa5de6810aa58cb..6b497b8f60b0bb6c4eaea6122d6a18550d6fbe1b 100644 (file)
--- a/lunaix-os/kernel/mm/vmm.c
+++ b/lunaix-os/kernel/mm/vmm.c
@@ -1,10 +1,13 @@
-#include <hal/cpu.h>

 #include <klibc/string.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/spike.h>
 #include <klibc/string.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/spike.h>

+#include <lunaix/syslog.h>

 
 

-#include <stdbool.h>
+#include <sys/cpu.h>
+#include <sys/mm/mm_defs.h>
+
+LOG_MODULE("VM")

 
 void
 vmm_init()
 
 void
 vmm_init()


@@ -12,120 +15,138 @@ vmm_init()
     // XXX: something here?
 }
 
     // XXX: something here?
 }
 

-x86_page_table*
-vmm_init_pd()
+pte_t 
+vmm_alloc_page(pte_t* ptep, pte_t pte)

 {
 {

-    x86_page_table* dir =
-      (x86_page_table*)pmm_alloc_page(KERNEL_PID, PP_FGPERSIST);
-    for (size_t i = 0; i < PG_MAX_ENTRIES; i++) {
-        dir->entry[i] = PTE_NULL;
+    ptr_t pa = pmm_alloc_page(PP_FGPERSIST);
+    if (!pa) {
+        return null_pte;

     }
 
     }
 

-    // 递归映射，方便我们在软件层面进行查表地址转换
-    dir->entry[PG_MAX_ENTRIES - 1] = NEW_L1_ENTRY(T_SELF_REF_PERM, dir);
+    pte = pte_setpaddr(pte, pa);
+    pte = pte_mkloaded(pte);
+    set_pte(ptep, pte);
+
+    mount_page(PG_MOUNT_1, pa);
+    memset((void*)PG_MOUNT_1, 0, LFT_SIZE);
+    unmount_page(PG_MOUNT_1);

 
 

-    return dir;
+    cpu_flush_page((ptr_t)ptep);
+
+    return pte;

 }
 
 int
 }
 
 int

-vmm_set_mapping(uintptr_t mnt, uintptr_t va, uintptr_t pa, pt_attr attr)
+vmm_set_mapping(ptr_t mnt, ptr_t va, ptr_t pa, pte_attr_t prot)

 {
 {

-    assert((uintptr_t)va % PG_SIZE == 0);
-
-    uintptr_t l1_inx = L1_INDEX(va);
-    uintptr_t l2_inx = L2_INDEX(va);
-    x86_page_table* l1pt = (x86_page_table*)(mnt | (1023 << 12));
-    x86_page_table* l2pt = (x86_page_table*)(mnt | (l1_inx << 12));
+    assert(!va_offset(va));

 
 

-    // See if attr make sense
-    assert(attr <= 128);
-
-    if (!l1pt->entry[l1_inx]) {
-        x86_page_table* new_l1pt_pa = pmm_alloc_page(KERNEL_PID, PP_FGPERSIST);
-
-        // 物理内存已满！
-        if (!new_l1pt_pa) {
-            return 0;
-        }
-
-        // This must be writable
-        l1pt->entry[l1_inx] = NEW_L1_ENTRY(attr | PG_WRITE, new_l1pt_pa);
-        memset((void*)l2pt, 0, PG_SIZE);
-    }
+    pte_t* ptep = mkptep_va(mnt, va);
+    pte_t  pte  = mkpte(pa, prot);

 
 

-    if (mnt == PD_REFERENCED) {
-        cpu_invplg(va);
-    }
+    set_pte(ptep, pte);

 
 

-    l2pt->entry[l2_inx] = NEW_L2_ENTRY(attr, pa);

     return 1;
 }
 
     return 1;
 }
 

-int
-vmm_del_mapping(uintptr_t mnt, uintptr_t va)
+ptr_t
+vmm_del_mapping(ptr_t mnt, ptr_t va)

 {
 {

-    assert(((uintptr_t)va & 0xFFFU) == 0);
+    assert(!va_offset(va));

 
 

-    uint32_t l1_index = L1_INDEX(va);
-    uint32_t l2_index = L2_INDEX(va);
+    pte_t* ptep = mkptep_va(mnt, va);

 
 

-    // prevent unmap of recursive mapping region
-    if (l1_index == 1023) {
-        return 0;
-    }
+    pte_t old = *ptep;

 
 

-    x86_page_table* l1pt = (x86_page_table*)(mnt | (1023 << 12));
+    set_pte(ptep, null_pte);

 
 

-    x86_pte_t l1pte = l1pt->entry[l1_index];
+    return pte_paddr(old);
+}

 
 

-    if (l1pte) {
-        x86_page_table* l2pt = (x86_page_table*)(mnt | (l1_index << 12));
-        x86_pte_t l2pte = l2pt->entry[l2_index];
+pte_t
+vmm_tryptep(pte_t* ptep, size_t lvl_size)
+{
+    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;
+}

 
 

-        cpu_invplg(va);
-        l2pt->entry[l2_index] = PTE_NULL;
-    }
+ptr_t
+vmm_v2pat(ptr_t mnt, ptr_t va)
+{
+    ptr_t  va_off = va_offset(va);
+    pte_t* ptep   = mkptep_va(mnt, va);
+
+    return pte_paddr(pte_at(ptep)) + va_off;

 }
 
 }
 

-int
-vmm_lookup(uintptr_t va, v_mapping* mapping)
+ptr_t
+vms_mount(ptr_t mnt, ptr_t vms_root)

 {
 {

-    // va = va & ~0xfff;
-
-    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];
-
-    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;
-            mapping->pte = l2pte;
-            mapping->va = va;
-            return 1;
-        }
-    }
-    return 0;
+    assert(vms_root);
+
+    pte_t* ptep = mkl0tep_va(VMS_SELF, mnt);
+    set_pte(ptep, mkpte(vms_root, KERNEL_DATA));
+    cpu_flush_page(mnt);
+    return mnt;

 }
 
 }
 

-void*
-vmm_mount_pd(uintptr_t mnt, void* pde)
+ptr_t
+vms_unmount(ptr_t mnt)

 {
 {

-    x86_page_table* l1pt = (x86_page_table*)L1_BASE_VADDR;
-    l1pt->entry[(mnt >> 22)] = NEW_L1_ENTRY(T_SELF_REF_PERM, pde);
-    cpu_invplg(mnt);
+    pte_t* ptep = mkl0tep_va(VMS_SELF, mnt);
+    set_pte(ptep, null_pte);
+    cpu_flush_page(mnt);

     return mnt;
 }
 
     return mnt;
 }
 

-void*
-vmm_unmount_pd(uintptr_t mnt)
+
+void
+ptep_alloc_hierarchy(pte_t* ptep, ptr_t va, pte_attr_t prot)

 {
 {

-    x86_page_table* l1pt = (x86_page_table*)L1_BASE_VADDR;
-    l1pt->entry[(mnt >> 22)] = 0;
-    cpu_invplg(mnt);
+    pte_t* _ptep;
+    
+    _ptep = mkl0tep(ptep);
+    if (_ptep == ptep) {
+        return;
+    }
+
+    _ptep = mkl1t(_ptep, va, prot);
+    if (_ptep == ptep) {
+        return;
+    }
+
+    _ptep = mkl2t(_ptep, va, prot);
+    if (_ptep == ptep) {
+        return;
+    }
+
+    _ptep = mkl3t(_ptep, va, prot);
+    if (_ptep == ptep) {
+        return;
+    }
+
+    _ptep = mklft(_ptep, va, prot);
+    assert(_ptep == ptep);

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