A Total Overhaul on the Lunaix's Virtual Memory Model (#26)

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

diff --git a/lunaix-os/kernel/mm/region.c b/lunaix-os/kernel/mm/region.c
index 6340cfbb9d1768632abda81f34352f62898b4d26..7dead6da5de68826c9bfcddb7a4ad28773ecf91a 100644 (file)
--- a/lunaix-os/kernel/mm/region.c
+++ b/lunaix-os/kernel/mm/region.c
@@ -1,15 +1,17 @@
-#include <lunaix/mm/page.h>

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

+#include <lunaix/process.h>
+
+#include <sys/mm/mempart.h>

 
 #include <klibc/string.h>
 
 struct mm_region*
 region_create(ptr_t start, ptr_t end, u32_t attr)
 {
 
 #include <klibc/string.h>
 
 struct mm_region*
 region_create(ptr_t start, ptr_t end, u32_t attr)
 {

-    assert_msg(PG_ALIGNED(start), "not page aligned");
-    assert_msg(PG_ALIGNED(end), "not page aligned");
+    assert_msg(!va_offset(start), "not page aligned");
+    assert_msg(!va_offset(end), "not page aligned");

     struct mm_region* region = valloc(sizeof(struct mm_region));
     *region =
       (struct mm_region){ .attr = attr, .start = start, .end = end - 1 };
     struct mm_region* region = valloc(sizeof(struct mm_region));
     *region =
       (struct mm_region){ .attr = attr, .start = start, .end = end - 1 };


@@ -19,12 +21,26 @@ region_create(ptr_t start, ptr_t end, u32_t attr)
 struct mm_region*
 region_create_range(ptr_t start, size_t length, u32_t attr)
 {
 struct mm_region*
 region_create_range(ptr_t start, size_t length, u32_t attr)
 {

-    assert_msg(PG_ALIGNED(start), "not page aligned");
-    assert_msg(PG_ALIGNED(length), "not page aligned");
+    assert_msg(!va_offset(start), "not page aligned");
+    assert_msg(!va_offset(length), "not page aligned");

     struct mm_region* region = valloc(sizeof(struct mm_region));
     *region = (struct mm_region){ .attr = attr,
                                   .start = start,
     struct mm_region* region = valloc(sizeof(struct mm_region));
     *region = (struct mm_region){ .attr = attr,
                                   .start = start,

-                                  .end = PG_ALIGN(start + length - 1) };
+                                  .end = ROUNDUP(start + length, MEM_PAGE) };
+    return region;
+}
+
+struct mm_region*
+region_dup(struct mm_region* origin)
+{
+    struct mm_region* region = valloc(sizeof(struct mm_region));
+    *region = *origin;
+
+    if (region->mfile) {
+        vfs_ref_file(region->mfile);
+    }
+
+    llist_init_head(&region->head);

     return region;
 }
 
     return region;
 }
 


@@ -36,20 +52,19 @@ region_add(vm_regions_t* lead, struct mm_region* vmregion)
         return;
     }
 
         return;
     }
 

+    struct mm_region *pos, *n;

     ptr_t cur_end = 0;
     ptr_t cur_end = 0;

-    struct mm_region *pos = (struct mm_region*)lead,
-                     *n = list_entry(lead->next, struct mm_region, head);
-    do {
-        if (vmregion->start > cur_end && vmregion->end < n->start) {
+
+    llist_for_each(pos, n, lead, head)
+    {
+        if (vmregion->start >= cur_end && vmregion->end <= pos->start) {

             break;
         }
             break;
         }

-        cur_end = n->end;
-        pos = n;
-        n = list_entry(n->head.next, struct mm_region, head);
-    } while ((ptr_t)&n->head != (ptr_t)lead);
+        cur_end = pos->end;
+    }

 
     // XXX caution. require mm_region::head to be the lead of struct
 
     // XXX caution. require mm_region::head to be the lead of struct

-    llist_insert_after(&pos->head, &vmregion->head);
+    llist_append(&pos->head, &vmregion->head);

 }
 
 void
 }
 
 void


@@ -60,7 +75,8 @@ region_release(struct mm_region* region)
     }
 
     if (region->mfile) {
     }
 
     if (region->mfile) {

-        vfs_pclose(region->mfile, region->proc_vms->pid);
+        struct proc_mm* mm = region->proc_vms;
+        vfs_pclose(region->mfile, mm->proc->pid);

     }
 
     if (region->index) {
     }
 
     if (region->index) {


@@ -82,7 +98,7 @@ region_release_all(vm_regions_t* lead)
 }
 
 void
 }
 
 void

-region_copy(struct proc_mm* src, struct proc_mm* dest)
+region_copy_mm(struct proc_mm* src, struct proc_mm* dest)

 {
     struct mm_region *pos, *n, *dup;
 
 {
     struct mm_region *pos, *n, *dup;
 


@@ -101,7 +117,7 @@ region_copy(struct proc_mm* src, struct proc_mm* dest)
             dup->region_copied(dup);
         }
 
             dup->region_copied(dup);
         }
 

-        region_add(&dest->regions, dup);
+        llist_append(&dest->regions, &dup->head);

     }
 }
 
     }
 }
 


@@ -114,11 +130,11 @@ region_get(vm_regions_t* lead, unsigned long vaddr)
 
     struct mm_region *pos, *n;
 
 
     struct mm_region *pos, *n;
 

-    vaddr = PG_ALIGN(vaddr);
+    vaddr = va_align(vaddr);

 
     llist_for_each(pos, n, lead, head)
     {
 
     llist_for_each(pos, n, lead, head)
     {

-        if (pos->start <= vaddr && vaddr <= pos->end) {
+        if (pos->start <= vaddr && vaddr < pos->end) {

             return pos;
         }
     }
             return pos;
         }
     }