X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/642855f81fd03b9fd6540ac99c665b57b4b38cc8..c316c28e6c8a165111d6bbc208555f5c53489818:/lunaix-os/kernel/mm/region.c

diff --git a/lunaix-os/kernel/mm/region.c b/lunaix-os/kernel/mm/region.c
index 59dd6e3..f883edb 100644
--- a/lunaix-os/kernel/mm/region.c
+++ b/lunaix-os/kernel/mm/region.c
@@ -1,12 +1,31 @@
+#include <lunaix/mm/page.h>
 #include <lunaix/mm/region.h>
 #include <lunaix/mm/valloc.h>
+#include <lunaix/spike.h>
 
 #include <klibc/string.h>
 
 struct mm_region*
 region_create(ptr_t start, ptr_t end, u32_t attr)
 {
-    return valloc(sizeof(struct mm_region));
+    assert_msg(PG_ALIGNED(start), "not page aligned");
+    assert_msg(PG_ALIGNED(end), "not page aligned");
+    struct mm_region* region = valloc(sizeof(struct mm_region));
+    *region =
+      (struct mm_region){ .attr = attr, .start = start, .end = end - 1 };
+    return region;
+}
+
+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");
+    struct mm_region* region = valloc(sizeof(struct mm_region));
+    *region = (struct mm_region){ .attr = attr,
+                                  .start = start,
+                                  .end = PG_ALIGN(start + length - 1) };
+    return region;
 }
 
 void
@@ -14,14 +33,14 @@ region_add(vm_regions_t* lead, struct mm_region* vmregion)
 {
     if (llist_empty(lead)) {
         llist_append(lead, &vmregion->head);
-        return vmregion;
+        return;
     }
 
     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) {
+        if (vmregion->start > cur_end && vmregion->end < n->start) {
             break;
         }
         cur_end = n->end;
@@ -33,6 +52,24 @@ region_add(vm_regions_t* lead, struct mm_region* vmregion)
     llist_insert_after(&pos->head, &vmregion->head);
 }
 
+void
+region_release(struct mm_region* region)
+{
+    if (region->destruct_region) {
+        region->destruct_region(region);
+    }
+
+    if (region->mfile) {
+        vfs_pclose(region->mfile, region->proc_vms->pid);
+    }
+
+    if (region->index) {
+        *region->index = NULL;
+    }
+
+    vfree(region);
+}
+
 void
 region_release_all(vm_regions_t* lead)
 {
@@ -40,24 +77,31 @@ region_release_all(vm_regions_t* lead)
 
     llist_for_each(pos, n, lead, head)
     {
-        vfree(pos);
+        region_release(pos);
     }
 }
 
 void
-region_copy(vm_regions_t* src, vm_regions_t* dest)
+region_copy(struct proc_mm* src, struct proc_mm* dest)
 {
-    if (!src) {
-        return;
-    }
-
     struct mm_region *pos, *n, *dup;
 
-    llist_for_each(pos, n, src, head)
+    llist_for_each(pos, n, &src->regions, head)
     {
         dup = valloc(sizeof(struct mm_region));
         memcpy(dup, pos, sizeof(*pos));
-        region_add(dest, dup);
+
+        dup->proc_vms = dest;
+
+        if (dup->mfile) {
+            vfs_ref_file(dup->mfile);
+        }
+
+        if (dup->region_copied) {
+            dup->region_copied(dup);
+        }
+
+        region_add(&dest->regions, dup);
     }
 }
 
@@ -70,9 +114,11 @@ region_get(vm_regions_t* lead, unsigned long vaddr)
 
     struct mm_region *pos, *n;
 
+    vaddr = PG_ALIGN(vaddr);
+
     llist_for_each(pos, n, lead, head)
     {
-        if (pos->start <= vaddr && vaddr < pos->end) {
+        if (pos->start <= vaddr && vaddr <= pos->end) {
             return pos;
         }
     }