feat: nearly complete POSIX.1-2008 compliant terminal interface implementation

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

diff --git a/lunaix-os/kernel/mm/mmap.c b/lunaix-os/kernel/mm/mmap.c
index 8eb7482b60af4b3bf7686a8e478ae0f54f1c7f52..fa71016adc828e4792e47c5bf69796bb6f5a10cd 100644 (file)
--- a/lunaix-os/kernel/mm/mmap.c
+++ b/lunaix-os/kernel/mm/mmap.c
@@ -7,8 +7,10 @@
 #include <lunaix/syscall.h>
 #include <lunaix/syscall_utils.h>
 
 #include <lunaix/syscall.h>
 #include <lunaix/syscall_utils.h>
 

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

 // any size beyond this is bullshit
 // any size beyond this is bullshit

-#define BS_SIZE (KERNEL_MM_BASE - UMMAP_START)
+#define BS_SIZE (KERNEL_EXEC - USR_MMAP)

 
 int
 mem_has_overlap(vm_regions_t* regions, ptr_t start, ptr_t end)
 
 int
 mem_has_overlap(vm_regions_t* regions, ptr_t start, ptr_t end)


@@ -58,13 +60,13 @@ mem_adjust_inplace(vm_regions_t* regions,
 int
 mem_map(void** addr_out,
         struct mm_region** created,
 int
 mem_map(void** addr_out,
         struct mm_region** created,

-        void* addr,
+        ptr_t addr,

         struct v_file* file,
         struct mmap_param* param)
 {
     assert_msg(addr, "addr can not be NULL");
 
         struct v_file* file,
         struct mmap_param* param)
 {
     assert_msg(addr, "addr can not be NULL");
 

-    ptr_t last_end = USER_START, found_loc = (ptr_t)addr;
+    ptr_t last_end = USR_EXEC, found_loc = addr;

     struct mm_region *pos, *n;
 
     vm_regions_t* vm_regions = &param->pvms->regions;
     struct mm_region *pos, *n;
 
     vm_regions_t* vm_regions = &param->pvms->regions;


@@ -92,7 +94,7 @@ mem_map(void** addr_out,
             if (pos->start > found_loc && avail_space > param->mlen) {
                 goto found;
             }
             if (pos->start > found_loc && avail_space > param->mlen) {
                 goto found;
             }

-            found_loc = pos->end + PG_SIZE;
+            found_loc = pos->end + MEM_PAGE;

         }
 
         last_end = pos->end;
         }
 
         last_end = pos->end;


@@ -101,7 +103,7 @@ mem_map(void** addr_out,
     return ENOMEM;
 
 found:
     return ENOMEM;
 
 found:

-    if (found_loc >= KERNEL_MM_BASE || found_loc < USER_START) {
+    if (found_loc >= KERNEL_EXEC || found_loc < USR_EXEC) {

         return ENOMEM;
     }
 
         return ENOMEM;
     }
 


@@ -112,7 +114,6 @@ found:
 
     region->mfile = file;
     region->foff = param->offset;
 
     region->mfile = file;
     region->foff = param->offset;

-    region->flen = param->flen;

     region->proc_vms = param->pvms;
 
     region_add(vm_regions, region);
     region->proc_vms = param->pvms;
 
     region_add(vm_regions, region);


@@ -131,7 +132,7 @@ found:
     }
 
     if (addr_out) {
     }
 
     if (addr_out) {

-        *addr_out = found_loc;
+        *addr_out = (void*)found_loc;

     }
     if (created) {
         *created = region;
     }
     if (created) {
         *created = region;


@@ -146,6 +147,9 @@ mem_remap(void** addr_out,
           struct v_file* file,
           struct mmap_param* param)
 {
           struct v_file* file,
           struct mmap_param* param)
 {

+    // TODO
+
+    return EINVAL;

 }
 
 void
 }
 
 void


@@ -168,9 +172,12 @@ mem_sync_pages(ptr_t mnt,
         if (PG_IS_DIRTY(*mapping.pte)) {
             size_t offset = mapping.va - region->start + region->foff;
             struct v_inode* inode = region->mfile->inode;
         if (PG_IS_DIRTY(*mapping.pte)) {
             size_t offset = mapping.va - region->start + region->foff;
             struct v_inode* inode = region->mfile->inode;

-            region->mfile->ops->write_page(inode, mapping.va, PG_SIZE, offset);
+
+            region->mfile->ops->write_page(inode, (void*)mapping.va, offset);
+

             *mapping.pte &= ~PG_DIRTY;
             *mapping.pte &= ~PG_DIRTY;

-            cpu_invplg(mapping.pte);
+
+            cpu_flush_page((ptr_t)mapping.pte);

         } else if ((options & MS_INVALIDATE)) {
             goto invalidate;
         }
         } else if ((options & MS_INVALIDATE)) {
             goto invalidate;
         }


@@ -184,7 +191,7 @@ mem_sync_pages(ptr_t mnt,
     invalidate:
         *mapping.pte &= ~PG_PRESENT;
         pmm_free_page(KERNEL_PID, mapping.pa);
     invalidate:
         *mapping.pte &= ~PG_PRESENT;
         pmm_free_page(KERNEL_PID, mapping.pa);

-        cpu_invplg(mapping.pte);
+        cpu_flush_page((ptr_t)mapping.pte);

     }
 }
 
     }
 }
 


@@ -230,8 +237,93 @@ mem_unmap_region(ptr_t mnt, struct mm_region* region)
     region_release(region);
 }
 
     region_release(region);
 }
 

+// Case: head inseted, tail inseted
+#define CASE_HITI(vmr, addr, len)                                              \
+    ((vmr)->start <= (addr) && ((addr) + (len)) <= (vmr)->end)
+
+// Case: head inseted, tail extruded
+#define CASE_HITE(vmr, addr, len)                                              \
+    ((vmr)->start <= (addr) && ((addr) + (len)) > (vmr)->end)
+
+// Case: head extruded, tail inseted
+#define CASE_HETI(vmr, addr, len)                                              \
+    ((vmr)->start > (addr) && ((addr) + (len)) <= (vmr)->end)
+
+// Case: head extruded, tail extruded
+#define CASE_HETE(vmr, addr, len)                                              \
+    ((vmr)->start > (addr) && ((addr) + (len)) > (vmr)->end)
+
+static void
+__unmap_overlapped_cases(ptr_t mnt,
+                         struct mm_region* vmr,
+                         ptr_t* addr,
+                         size_t* length)
+{
+    // seg start, umapped segement start
+    ptr_t seg_start = *addr, umps_start = 0;
+
+    // seg len, umapped segement len
+    size_t seg_len = *length, umps_len = 0;
+
+    size_t displ = 0, shrink = 0;
+
+    if (CASE_HITI(vmr, seg_start, seg_len)) {
+        size_t new_start = seg_start + seg_len;
+
+        // Require a split
+        if (new_start < vmr->end) {
+            struct mm_region* region = region_dup(vmr);
+            if (region->mfile) {
+                size_t f_shifted = new_start - region->start;
+                region->foff += f_shifted;
+            }
+            region->start = new_start;
+            llist_insert_after(&vmr->head, &region->head);
+        }
+
+        shrink = vmr->end - seg_start;
+        umps_len = shrink;
+        umps_start = seg_start;
+    } else if (CASE_HITE(vmr, seg_start, seg_len)) {
+        shrink = vmr->end - seg_start;
+        umps_len = shrink;
+        umps_start = seg_start;
+    } else if (CASE_HETI(vmr, seg_start, seg_len)) {
+        displ = seg_len - (vmr->start - seg_start);
+        umps_len = displ;
+        umps_start = vmr->start;
+    } else if (CASE_HETE(vmr, seg_start, seg_len)) {
+        shrink = vmr->end - vmr->start;
+        umps_len = shrink;
+        umps_start = vmr->start;
+    }
+
+    mem_sync_pages(mnt, vmr, vmr->start, umps_len, 0);
+    for (size_t i = 0; i < umps_len; i += PG_SIZE) {
+        ptr_t pa = vmm_del_mapping(mnt, vmr->start + i);
+        if (pa) {
+            pmm_free_page(vmr->proc_vms->pid, pa);
+        }
+    }
+
+    vmr->start += displ;
+    vmr->end -= shrink;
+
+    if (vmr->start >= vmr->end) {
+        llist_delete(&vmr->head);
+        region_release(vmr);
+    } else if (vmr->mfile) {
+        vmr->foff += displ;
+    }
+
+    *addr = umps_start + umps_len;
+
+    size_t ump_len = *addr - seg_start;
+    *length = MAX(seg_len, ump_len) - ump_len;
+}
+

 int
 int

-mem_unmap(ptr_t mnt, vm_regions_t* regions, void* addr, size_t length)
+mem_unmap(ptr_t mnt, vm_regions_t* regions, ptr_t addr, size_t length)

 {
     length = ROUNDUP(length, PG_SIZE);
     ptr_t cur_addr = PG_ALIGN(addr);
 {
     length = ROUNDUP(length, PG_SIZE);
     ptr_t cur_addr = PG_ALIGN(addr);


@@ -239,42 +331,17 @@ mem_unmap(ptr_t mnt, vm_regions_t* regions, void* addr, size_t length)
 
     llist_for_each(pos, n, regions, head)
     {
 
     llist_for_each(pos, n, regions, head)
     {

-        if (pos->start <= cur_addr && pos->end >= cur_addr) {
+        u32_t l = pos->start - cur_addr;
+        if ((pos->start <= cur_addr && cur_addr < pos->end) || l <= length) {

             break;
         }
     }
 
             break;
         }
     }
 

-    while (&pos->head != regions && cur_addr >= pos->start) {
-        u32_t l = pos->end - cur_addr;
-        pos->end = cur_addr;
-
-        if (l > length) {
-            // unmap cause discontinunity in a memory region -  do split
-            struct mm_region* region = valloc(sizeof(struct mm_region));
-            *region = *pos;
-            region->start = cur_addr + length;
-            llist_insert_after(&pos->head, &region->head);
-            l = length;
-        }
-
-        mem_sync_pages(mnt, pos, cur_addr, l, 0);
-
-        for (size_t i = 0; i < l; i += PG_SIZE) {
-            ptr_t pa = vmm_del_mapping(mnt, cur_addr + i);
-            if (pa) {
-                pmm_free_page(pos->proc_vms->pid, pa);
-            }
-        }
-
+    while (&pos->head != regions && length) {

         n = container_of(pos->head.next, typeof(*pos), head);
         n = container_of(pos->head.next, typeof(*pos), head);

-        if (pos->end == pos->start) {
-            llist_delete(&pos->head);
-            region_release(pos);
-        }
+        __unmap_overlapped_cases(mnt, pos, &cur_addr, &length);

 
         pos = n;
 
         pos = n;

-        length -= l;
-        cur_addr += length;

     }
 
     return 0;
     }
 
     return 0;


@@ -289,14 +356,16 @@ __DEFINE_LXSYSCALL3(void*, sys_mmap, void*, addr, size_t, length, va_list, lst)
     int errno = 0;
     void* result = (void*)-1;
 
     int errno = 0;
     void* result = (void*)-1;
 

-    if (!length || length > BS_SIZE || !PG_ALIGNED(addr)) {
+    ptr_t addr_ptr = (ptr_t)addr;
+
+    if (!length || length > BS_SIZE || !PG_ALIGNED(addr_ptr)) {

         errno = EINVAL;
         goto done;
     }
 
         errno = EINVAL;
         goto done;
     }
 

-    if (!addr) {
-        addr = UMMAP_START;
-    } else if (addr < UMMAP_START || addr + length >= UMMAP_END) {
+    if (!addr_ptr) {
+        addr_ptr = USR_MMAP;
+    } else if (addr_ptr < USR_MMAP || addr_ptr + length >= USR_MMAP_END) {

         if (!(options & (MAP_FIXED | MAP_FIXED_NOREPLACE))) {
             errno = ENOMEM;
             goto done;
         if (!(options & (MAP_FIXED | MAP_FIXED_NOREPLACE))) {
             errno = ENOMEM;
             goto done;


@@ -320,22 +389,24 @@ __DEFINE_LXSYSCALL3(void*, sys_mmap, void*, addr, size_t, length, va_list, lst)
 
     struct mmap_param param = { .flags = options,
                                 .mlen = ROUNDUP(length, PG_SIZE),
 
     struct mmap_param param = { .flags = options,
                                 .mlen = ROUNDUP(length, PG_SIZE),

+                                .flen = length,

                                 .offset = offset,
                                 .type = REGION_TYPE_GENERAL,
                                 .proct = proct,
                                 .offset = offset,
                                 .type = REGION_TYPE_GENERAL,
                                 .proct = proct,

-                                .pvms = &__current->mm,
+                                .pvms = (struct proc_mm*)&__current->mm,

                                 .vms_mnt = VMS_SELF };
 
                                 .vms_mnt = VMS_SELF };
 

-    errno = mem_map(&result, NULL, addr, file, &param);
+    errno = mem_map(&result, NULL, addr_ptr, file, &param);

 
 done:
     __current->k_status = errno;
     return result;
 }
 
 
 done:
     __current->k_status = errno;
     return result;
 }
 

-__DEFINE_LXSYSCALL2(void, munmap, void*, addr, size_t, length)
+__DEFINE_LXSYSCALL2(int, munmap, void*, addr, size_t, length)

 {
 {

-    return mem_unmap(VMS_SELF, &__current->mm.regions, addr, length);
+    return mem_unmap(
+      VMS_SELF, (vm_regions_t*)&__current->mm.regions, (ptr_t)addr, length);

 }
 
 __DEFINE_LXSYSCALL3(int, msync, void*, addr, size_t, length, int, flags)
 }
 
 __DEFINE_LXSYSCALL3(int, msync, void*, addr, size_t, length, int, flags)


@@ -344,8 +415,11 @@ __DEFINE_LXSYSCALL3(int, msync, void*, addr, size_t, length, int, flags)
         return DO_STATUS(EINVAL);
     }
 
         return DO_STATUS(EINVAL);
     }
 

-    int status =
-      mem_msync(VMS_SELF, &__current->mm.regions, addr, length, flags);
+    int status = mem_msync(VMS_SELF,
+                           (vm_regions_t*)&__current->mm.regions,
+                           (ptr_t)addr,
+                           length,
+                           flags);

 
     return DO_STATUS(status);
 }
\ No newline at end of file
 
     return DO_STATUS(status);
 }
\ No newline at end of file