X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/b60166b327a9108b07e3069fa6568a451529ffd9..refs/heads/eme/usr-header-gen:/lunaix-os/kernel/mm/mmap.c?ds=sidebyside diff --git a/lunaix-os/kernel/mm/mmap.c b/lunaix-os/kernel/mm/mmap.c index 1c3b8b8..ac23bd6 100644 --- a/lunaix-os/kernel/mm/mmap.c +++ b/lunaix-os/kernel/mm/mmap.c @@ -1,17 +1,16 @@ #include -#include +#include #include -#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) @@ -65,12 +64,34 @@ mmap_user(void** addr_out, struct v_file* file, struct mmap_param* param) { - param->range_end = KERNEL_EXEC; + param->range_end = KERNEL_RESIDENT; param->range_start = USR_EXEC; return mem_map(addr_out, created, addr, file, param); } +static void +__remove_ranged_mappings(pte_t* ptep, size_t npages) +{ + struct leaflet* leaflet; + pte_t pte; + for (size_t i = 0, n = 0; i < npages; i++, ptep++) { + pte = pte_at(ptep); + + set_pte(ptep, null_pte); + if (!pte_isloaded(pte)) { + continue; + } + + leaflet = pte_leaflet_aligned(pte); + leaflet_return(leaflet); + + n = ptep_unmap_leaflet(ptep, leaflet) - 1; + i += n; + ptep += n; + } +} + static ptr_t __mem_find_slot_backward(struct mm_region* lead, struct mmap_param* param, struct mm_region* anchor) { @@ -168,7 +189,7 @@ mem_map(void** addr_out, { assert_msg(addr, "addr can not be NULL"); - ptr_t last_end = USR_EXEC, found_loc = PG_ALIGN(addr); + ptr_t last_end = USR_EXEC, found_loc = page_aligned(addr); struct mm_region *pos, *n; vm_regions_t* vm_regions = ¶m->pvms->regions; @@ -211,24 +232,12 @@ found: ((param->proct | param->flags) & 0x3f) | (param->type & ~0xffff)); region->mfile = file; + region->flen = param->flen; region->foff = param->offset; region->proc_vms = param->pvms; region_add(vm_regions, region); - - int proct = param->proct; - int attr = PG_ALLOW_USER; - if ((proct & REGION_WRITE)) { - attr |= PG_WRITE; - } - if ((proct & REGION_KERNEL)) { - attr &= ~PG_ALLOW_USER; - } - - for (size_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); } @@ -264,22 +273,25 @@ mem_sync_pages(ptr_t mnt, if (!region->mfile || !(region->attr & REGION_WSHARED)) { return; } + + pte_t* ptep = mkptep_va(mnt, start); + ptr_t va = page_aligned(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); + region->mfile->ops->write_page(inode, (void*)va, offset); - *mapping.pte &= ~PG_DIRTY; - - cpu_flush_page((ptr_t)mapping.pte); + set_pte(ptep, pte_mkclean(pte)); + tlb_flush_vmr(region, va); + } else if ((options & MS_INVALIDATE)) { goto invalidate; } @@ -290,10 +302,12 @@ mem_sync_pages(ptr_t mnt, continue; + // FIXME what if mem_sync range does not aligned with + // a leaflet with order > 1 invalidate: - *mapping.pte &= ~PG_PRESENT; - pmm_free_page(mapping.pa); - cpu_flush_page((ptr_t)mapping.pte); + set_pte(ptep, null_pte); + leaflet_return(pte_leaflet(pte)); + tlb_flush_vmr(region, va); } } @@ -332,15 +346,13 @@ mem_unmap_region(ptr_t mnt, struct mm_region* region) valloc_ensure_valid(region); - size_t len = ROUNDUP(region->end - region->start, PG_SIZE); - mem_sync_pages(mnt, region, region->start, len, 0); + pfn_t pglen = leaf_count(region->end - region->start); + mem_sync_pages(mnt, region, region->start, pglen * PAGE_SIZE, 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(pa); - } - } + pte_t* ptep = mkptep_va(mnt, region->start); + __remove_ranged_mappings(ptep, pglen); + + tlb_flush_vmr_all(region); llist_delete(®ion->head); region_release(region); @@ -393,27 +405,29 @@ __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) { - ptr_t pa = vmm_del_mapping(mnt, vmr->start + i); - if (pa) { - pmm_free_page(pa); - } - } + + pte_t *ptep = mkptep_va(mnt, vmr->start); + __remove_ranged_mappings(ptep, leaf_count(umps_len)); + + tlb_flush_vmr_range(vmr, vmr->start, umps_len); vmr->start += displ; vmr->end -= shrink; @@ -434,8 +448,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 = page_aligned(addr); struct mm_region *pos, *n; llist_for_each(pos, n, regions, head) @@ -446,9 +460,14 @@ mem_unmap(ptr_t mnt, vm_regions_t* regions, ptr_t addr, size_t length) } } - while (&pos->head != regions && length) { + size_t remaining = length; + while (&pos->head != regions && remaining) { n = container_of(pos->head.next, typeof(*pos), head); - __unmap_overlapped_cases(mnt, pos, &cur_addr, &length); + if (pos->start > cur_addr + length) { + break; + } + + __unmap_overlapped_cases(mnt, pos, &cur_addr, &remaining); pos = n; } @@ -456,18 +475,26 @@ mem_unmap(ptr_t mnt, vm_regions_t* regions, ptr_t addr, size_t length) return 0; } -__DEFINE_LXSYSCALL3(void*, sys_mmap, void*, addr, size_t, length, va_list, lst) +__DEFINE_LXSYSCALL1(void*, sys_mmap, struct usr_mmap_param*, mparam) { - int proct = va_arg(lst, int); - int fd = va_arg(lst, u32_t); - off_t offset = va_arg(lst, off_t); - int options = va_arg(lst, int); - int errno = 0; - void* result = (void*)-1; - - ptr_t addr_ptr = (ptr_t)addr; - - if (!length || length > BS_SIZE || !PG_ALIGNED(addr_ptr)) { + off_t offset; + size_t length; + int proct, fd, options; + int errno; + void* result; + ptr_t addr_ptr; + + proct = mparam->proct; + fd = mparam->fd; + offset = mparam->offset; + options = mparam->flags; + addr_ptr = __ptr(mparam->addr); + length = mparam->length; + + errno = 0; + result = (void*)-1; + + if (!length || length > BS_SIZE || va_offset(addr_ptr)) { errno = EINVAL; goto done; } @@ -496,8 +523,10 @@ __DEFINE_LXSYSCALL3(void*, sys_mmap, void*, addr, size_t, length, va_list, lst) } } + length = ROUNDUP(length, PAGE_SIZE); struct mmap_param param = { .flags = options, - .mlen = ROUNDUP(length, PG_SIZE), + .mlen = length, + .flen = length, .offset = offset, .type = REGION_TYPE_GENERAL, .proct = proct, @@ -519,7 +548,7 @@ __DEFINE_LXSYSCALL2(int, munmap, void*, addr, size_t, 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); }