* 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 364332e186ee7621ecea955a90f64030c21c5dbc..6b497b8f60b0bb6c4eaea6122d6a18550d6fbe1b 100644 (file)
--- a/lunaix-os/kernel/mm/vmm.c
+++ b/lunaix-os/kernel/mm/vmm.c
@@ -1,143 +1,152 @@
-#include <lunaix/mm/page.h>
-#include <lunaix/mm/vmm.h>
+#include <klibc/string.h>

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

-#include <libc/string.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 P2V(pd);
+#include <lunaix/mm/vmm.h>
+#include <lunaix/spike.h>
+#include <lunaix/syslog.h>
+
+#include <sys/cpu.h>
+#include <sys/mm/mm_defs.h>
+
+LOG_MODULE("VM")
+
+void
+vmm_init()
+{
+    // XXX: something here?

 }
 
 }
 

-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
+pte_t 
+vmm_alloc_page(pte_t* ptep, pte_t pte)
+{
+    ptr_t pa = pmm_alloc_page(PP_FGPERSIST);
+    if (!pa) {
+        return null_pte;
+    }
+
+    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);
+
+    cpu_flush_page((ptr_t)ptep);
+
+    return pte;

 }
 
 }
 

-void vmm_init() {
-    // TODO: something here?
+int
+vmm_set_mapping(ptr_t mnt, ptr_t va, ptr_t pa, pte_attr_t prot)
+{
+    assert(!va_offset(va));
+
+    pte_t* ptep = mkptep_va(mnt, va);
+    pte_t  pte  = mkpte(pa, prot);
+
+    set_pte(ptep, pte);
+
+    return 1;

 }
 
 }
 

-ptd_t* vmm_init_pd() {
-    ptd_t* dir = pmm_alloc_page();
-    for (size_t i = 0; i < 1024; i++)
-    {
-        dir[i] = 0;
-    }
-    
-    // 自己映射自己，方便我们在软件层面进行查表地址转换
-    dir[1023] = PDE(T_SELF_REF_PERM, dir);
+ptr_t
+vmm_del_mapping(ptr_t mnt, ptr_t va)
+{
+    assert(!va_offset(va));

 
 

-    return dir;
+    pte_t* ptep = mkptep_va(mnt, va);
+
+    pte_t old = *ptep;
+
+    set_pte(ptep, null_pte);
+
+    return pte_paddr(old);

 }
 
 }
 

-void* vmm_map_page(void* va, void* pa, pt_attr dattr, pt_attr tattr) {
-    // 显然，对空指针进行映射没有意义。
-    if (!pa || !va) {
-        return NULL;
-    }
+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;
+}

 
 

-    uintptr_t pd_offset = PD_INDEX(va);
-    uintptr_t pt_offset = PT_INDEX(va);
-    ptd_t* ptd = (ptd_t*)PTD_BASE_VADDR;
-
-    // 在页表与页目录中找到一个可用的空位进行映射（位于va或其附近）
-    ptd_t* pde = ptd[pd_offset];
-    pt_t* pt = (uintptr_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);
-        }
-        // 页表有空位，只需要开辟一个新的 PTE
-        if (pt && !pt[pt_offset]) {
-            pt[pt_offset] = PTE(tattr, pa);
-            return V_ADDR(pd_offset, pt_offset, PG_OFFSET(va));
-        }
-        pt_offset++;
-    }
-    
-    // 页目录与所有页表已满！
-    if (pd_offset > 1024) {
-        return 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);

 
 

-    // 页目录有空位，需要开辟一个新的 PDE
-    uint8_t* new_pt_pa = pmm_alloc_page();
-    
-    // 物理内存已满！
-    if (!new_pt_pa) {
-        return NULL;
-    }
-    
-    ptd[pd_offset] = PDE(dattr, new_pt_pa);
-    
-    memset((void*)PT_VADDR(pd_offset), 0, PM_PAGE_SIZE);
-    pt[pt_offset] = PTE(tattr, pa);
+    return pte_paddr(pte_at(ptep)) + va_off;
+}

 
 

-    return V_ADDR(pd_offset, pt_offset, PG_OFFSET(va));
+ptr_t
+vms_mount(ptr_t mnt, ptr_t vms_root)
+{
+    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_alloc_page(void* vpn, pt_attr dattr, pt_attr tattr) {
-    void* pp = pmm_alloc_page();
-    void* result = vmm_map_page(vpn, pp, dattr, tattr);
-    if (!result) {
-        pmm_free_page(pp);
-    }
-    return result;
+ptr_t
+vms_unmount(ptr_t mnt)
+{
+    pte_t* ptep = mkl0tep_va(VMS_SELF, mnt);
+    set_pte(ptep, null_pte);
+    cpu_flush_page(mnt);
+    return mnt;

 }
 
 }
 

-void vmm_unmap_page(void* vpn) {
-    uintptr_t pd_offset = PD_INDEX(vpn);
-    uintptr_t pt_offset = PT_INDEX(vpn);
-    ptd_t* self_pde = 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(pte)) {
-            // 刷新TLB
-            #ifdef __ARCH_IA32
-            __asm__("invlpg (%0)" :: "r"((uintptr_t)vpn) : "memory");
-            #endif
-        }
-        pt[pt_offset] = 0;
+
+void
+ptep_alloc_hierarchy(pte_t* ptep, ptr_t va, pte_attr_t prot)
+{
+    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;

     }
     }

-}

 
 

-void* vmm_v2p(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_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);
-        }
+    _ptep = mkl3t(_ptep, va, prot);
+    if (_ptep == ptep) {
+        return;

     }
 
     }
 

-    return NULL;
+    _ptep = mklft(_ptep, va, prot);
+    assert(_ptep == ptep);

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