Unifying the Lunaix's Physical Memory Model (#28)

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

diff --git a/lunaix-os/kernel/mm/vmap.c b/lunaix-os/kernel/mm/vmap.c
index 02711fb3f34507094d2e4badb64b3a72782e93f2..6ec714a28c3229ac577a8c526c902a38853c20de 100644 (file)
--- a/lunaix-os/kernel/mm/vmap.c
+++ b/lunaix-os/kernel/mm/vmap.c
@@ -1,6 +1,5 @@
-#include <lunaix/mm/pmm.h>
+#include <lunaix/mm/page.h>

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

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

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


@@ -9,6 +8,11 @@
 static ptr_t start = VMAP;
 static volatile ptr_t prev_va = 0;
 
 static ptr_t start = VMAP;
 static volatile ptr_t prev_va = 0;
 

+void
+vmap_set_start(ptr_t start_addr) {
+    start = start_addr;
+}
+

 static pte_t*
 __alloc_contig_ptes(pte_t* ptep, size_t base_sz, int n)
 {
 static pte_t*
 __alloc_contig_ptes(pte_t* ptep, size_t base_sz, int n)
 {


@@ -49,7 +53,6 @@ __alloc_contig_ptes(pte_t* ptep, size_t base_sz, int n)
     }
 
     va -= base_sz * _n;
     }
 
     va -= base_sz * _n;

-    assert(prev_va < va);

     
     prev_va = va;
     return mkptep_va(ptep_vm_mnt(ptep), va);
     
     prev_va = va;
     return mkptep_va(ptep_vm_mnt(ptep), va);


@@ -67,5 +70,25 @@ vmap_ptes_at(pte_t pte, size_t lvl_size, int n)
 
     vmm_set_ptes_contig(ptep, pte, lvl_size, n);
 
 
     vmm_set_ptes_contig(ptep, pte, lvl_size, n);
 

-    return page_addr(ptep_pfn(ptep));
+    ptr_t va = page_addr(ptep_pfn(ptep));
+
+    tlb_flush_kernel_ranged(va, n);
+    
+    return va;
+}
+
+void
+vunmap(ptr_t ptr, struct leaflet* leaflet)
+{    
+    pte_t* ptep;
+    unsigned int npages;
+ 
+    assert(start <= ptr && ptr <= VMAP_END);
+    
+    npages = leaflet_nfold(leaflet);
+    ptep = mkptep_va(VMS_SELF, ptr);
+
+    vmm_unset_ptes(ptep, npages);
+
+    tlb_flush_kernel_ranged(ptr, npages);

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