X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/78cd005fac540973751b5a108c37a715bc64b5a2..69777bdcab284335651a8002e2896f3862fa423d:/lunaix-os/kernel/mm/mmap.c diff --git a/lunaix-os/kernel/mm/mmap.c b/lunaix-os/kernel/mm/mmap.c index d39269c..3f273c0 100644 --- a/lunaix-os/kernel/mm/mmap.c +++ b/lunaix-os/kernel/mm/mmap.c @@ -3,14 +3,15 @@ #include #include #include - #include #include -#include +#include + +#include // any size beyond this is bullshit -#define BS_SIZE (KERNEL_EXEC - USR_MMAP) +#define BS_SIZE (KERNEL_RESIDENT - USR_MMAP) int mem_has_overlap(vm_regions_t* regions, ptr_t start, ptr_t end) @@ -57,6 +58,107 @@ mem_adjust_inplace(vm_regions_t* regions, return 0; } +int +mmap_user(void** addr_out, + struct mm_region** created, + ptr_t addr, + struct v_file* file, + struct mmap_param* param) +{ + param->range_end = KERNEL_RESIDENT; + param->range_start = USR_EXEC; + + return mem_map(addr_out, created, addr, file, param); +} + +static ptr_t +__mem_find_slot_backward(struct mm_region* lead, struct mmap_param* param, struct mm_region* anchor) +{ + ptr_t size = param->mlen; + struct mm_region *pos = anchor, + *n = next_region(pos); + while (pos != lead) + { + if (pos == lead) { + break; + } + + ptr_t end = n->start; + if (n == lead) { + end = param->range_end; + } + + if (end - pos->end >= size) { + return pos->end; + } + + pos = n; + n = next_region(pos); + } + + return 0; +} + +static ptr_t +__mem_find_slot_forward(struct mm_region* lead, struct mmap_param* param, struct mm_region* anchor) +{ + ptr_t size = param->mlen; + struct mm_region *pos = anchor, + *prev = prev_region(pos); + while (lead != pos) + { + ptr_t end = prev->end; + if (prev == lead) { + end = param->range_start; + } + + if (pos->start - end >= size) { + return pos->start - size; + } + + pos = prev; + prev = prev_region(pos); + } + + return 0; +} + +static ptr_t +__mem_find_slot(vm_regions_t* lead, struct mmap_param* param, struct mm_region* anchor) +{ + ptr_t result = 0; + struct mm_region* _lead = get_region(lead); + if ((result = __mem_find_slot_backward(_lead, param, anchor))) { + return result; + } + + return __mem_find_slot_forward(_lead, param, anchor); +} + +static struct mm_region* +__mem_find_nearest(vm_regions_t* lead, ptr_t addr) +{ + ptr_t min_dist = (ptr_t)-1; + struct mm_region *pos, *n, *min = NULL; + llist_for_each(pos, n, lead, head) { + if (region_contains(pos, addr)) { + return pos; + } + + ptr_t dist = addr - pos->end; + if (addr < pos->start) { + dist = pos->start - addr; + } + + if (dist < min_dist) { + min_dist = dist; + min = pos; + } + } + + return min; +} + int mem_map(void** addr_out, struct mm_region** created, @@ -66,7 +168,7 @@ mem_map(void** addr_out, { assert_msg(addr, "addr can not be NULL"); - ptr_t last_end = USR_EXEC, found_loc = addr; + ptr_t last_end = USR_EXEC, found_loc = va_align(addr); struct mm_region *pos, *n; vm_regions_t* vm_regions = ¶m->pvms->regions; @@ -87,23 +189,19 @@ mem_map(void** addr_out, goto found; } - llist_for_each(pos, n, vm_regions, head) - { - if (last_end < found_loc) { - size_t avail_space = pos->start - found_loc; - if (pos->start > found_loc && avail_space > param->mlen) { - goto found; - } - found_loc = pos->end + MEM_PAGE; - } + if (llist_empty(vm_regions)) { + goto found; + } - last_end = pos->end; + struct mm_region* anchor = __mem_find_nearest(vm_regions, found_loc); + if ((found_loc = __mem_find_slot(vm_regions, param, anchor))) { + goto found; } return ENOMEM; found: - if (found_loc >= KERNEL_EXEC || found_loc < USR_EXEC) { + if (found_loc >= param->range_end || found_loc < param->range_start) { return ENOMEM; } @@ -114,20 +212,10 @@ found: region->mfile = file; region->foff = param->offset; - region->flen = param->flen; region->proc_vms = param->pvms; region_add(vm_regions, region); - - u32_t attr = PG_ALLOW_USER; - if ((param->proct & REGION_WRITE)) { - attr |= PG_WRITE; - } - - for (u32_t i = 0; i < param->mlen; i += PG_SIZE) { - vmm_set_mapping(param->vms_mnt, found_loc + i, 0, attr, 0); - } - + if (file) { vfs_ref_file(file); } @@ -163,22 +251,24 @@ mem_sync_pages(ptr_t mnt, if (!region->mfile || !(region->attr & REGION_WSHARED)) { return; } + + pte_t* ptep = mkptep_va(mnt, start); + ptr_t va = va_align(start); - v_mapping mapping; - for (size_t i = 0; i < length; i += PG_SIZE) { - if (!vmm_lookupat(mnt, start + i, &mapping)) { + for (; va < start + length; va += PAGE_SIZE, ptep++) { + pte_t pte = vmm_tryptep(ptep, LFT_SIZE); + if (pte_isnull(pte)) { continue; } - if (PG_IS_DIRTY(*mapping.pte)) { - size_t offset = mapping.va - region->start + region->foff; + if (pte_dirty(pte)) { + size_t offset = va - region->start + region->foff; struct v_inode* inode = region->mfile->inode; - region->mfile->ops->write_page(inode, (void*)mapping.va, offset); - - *mapping.pte &= ~PG_DIRTY; + region->mfile->ops->write_page(inode, (void*)va, offset); - cpu_flush_page((ptr_t)mapping.pte); + set_pte(ptep, pte_mkclean(pte)); + cpu_flush_page(va); } else if ((options & MS_INVALIDATE)) { goto invalidate; } @@ -190,9 +280,9 @@ mem_sync_pages(ptr_t mnt, continue; invalidate: - *mapping.pte &= ~PG_PRESENT; - pmm_free_page(KERNEL_PID, mapping.pa); - cpu_flush_page((ptr_t)mapping.pte); + set_pte(ptep, null_pte); + pmm_free_page(pte_paddr(pte)); + cpu_flush_page(va); } } @@ -225,15 +315,26 @@ mem_msync(ptr_t mnt, void mem_unmap_region(ptr_t mnt, struct mm_region* region) { - size_t len = ROUNDUP(region->end - region->start, PG_SIZE); - mem_sync_pages(mnt, region, region->start, len, 0); - - for (size_t i = region->start; i <= region->end; i += PG_SIZE) { - ptr_t pa = vmm_del_mapping(mnt, i); - if (pa) { - pmm_free_page(__current->pid, pa); + if (!region) { + return; + } + + valloc_ensure_valid(region); + + pfn_t pglen = leaf_count(region->end - region->start); + mem_sync_pages(mnt, region, region->start, pglen * PAGE_SIZE, 0); + + pte_t* ptep = mkptep_va(mnt, region->start); + for (size_t i = 0; i < pglen; i++, ptep++) { + pte_t pte = pte_at(ptep); + ptr_t pa = pte_paddr(pte); + + set_pte(ptep, null_pte); + if (pte_isloaded(pte)) { + pmm_free_page(pte_paddr(pte)); } } + llist_delete(®ion->head); region_release(region); } @@ -277,7 +378,6 @@ __unmap_overlapped_cases(ptr_t mnt, if (region->mfile) { size_t f_shifted = new_start - region->start; region->foff += f_shifted; - region->flen = MAX(region->flen, f_shifted) - f_shifted; } region->start = new_start; llist_insert_after(&vmr->head, ®ion->head); @@ -286,25 +386,28 @@ __unmap_overlapped_cases(ptr_t mnt, shrink = vmr->end - seg_start; umps_len = shrink; umps_start = seg_start; - } else if (CASE_HITE(vmr, seg_start, seg_len)) { + } + 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)) { + } + 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)) { + } + 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) { + for (size_t i = 0; i < umps_len; i += PAGE_SIZE) { ptr_t pa = vmm_del_mapping(mnt, vmr->start + i); if (pa) { - pmm_free_page(vmr->proc_vms->pid, pa); + pmm_free_page(pa); } } @@ -316,7 +419,6 @@ __unmap_overlapped_cases(ptr_t mnt, region_release(vmr); } else if (vmr->mfile) { vmr->foff += displ; - vmr->flen = MAX(vmr->flen, displ) - displ; } *addr = umps_start + umps_len; @@ -328,8 +430,8 @@ __unmap_overlapped_cases(ptr_t mnt, int 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, PAGE_SIZE); + ptr_t cur_addr = va_align(addr); struct mm_region *pos, *n; llist_for_each(pos, n, regions, head) @@ -361,7 +463,7 @@ __DEFINE_LXSYSCALL3(void*, sys_mmap, void*, addr, size_t, length, va_list, lst) ptr_t addr_ptr = (ptr_t)addr; - if (!length || length > BS_SIZE || !PG_ALIGNED(addr_ptr)) { + if (!length || length > BS_SIZE || va_offset(addr_ptr)) { errno = EINVAL; goto done; } @@ -391,35 +493,34 @@ __DEFINE_LXSYSCALL3(void*, sys_mmap, void*, addr, size_t, length, va_list, lst) } struct mmap_param param = { .flags = options, - .mlen = ROUNDUP(length, PG_SIZE), - .flen = length, + .mlen = ROUNDUP(length, PAGE_SIZE), .offset = offset, .type = REGION_TYPE_GENERAL, .proct = proct, - .pvms = (struct proc_mm*)&__current->mm, + .pvms = vmspace(__current), .vms_mnt = VMS_SELF }; - errno = mem_map(&result, NULL, addr_ptr, file, ¶m); + errno = mmap_user(&result, NULL, addr_ptr, file, ¶m); done: - __current->k_status = errno; + syscall_result(errno); return result; } __DEFINE_LXSYSCALL2(int, munmap, void*, addr, size_t, length) { return mem_unmap( - VMS_SELF, (vm_regions_t*)&__current->mm.regions, (ptr_t)addr, length); + VMS_SELF, vmregions(__current), (ptr_t)addr, length); } __DEFINE_LXSYSCALL3(int, msync, void*, addr, size_t, length, int, flags) { - if (!PG_ALIGNED(addr) || ((flags & MS_ASYNC) && (flags & MS_SYNC))) { + if (va_offset((ptr_t)addr) || ((flags & MS_ASYNC) && (flags & MS_SYNC))) { return DO_STATUS(EINVAL); } int status = mem_msync(VMS_SELF, - (vm_regions_t*)&__current->mm.regions, + vmregions(__current), (ptr_t)addr, length, flags);