Index: kernel/generic/src/mm/as.c =================================================================== --- kernel/generic/src/mm/as.c (revision bfe43d5afff05c7aa00374944b0dbd885849f884) +++ kernel/generic/src/mm/as.c (revision fc51296af4f45da426f5626f3573adee6b0babda) @@ -71,4 +71,5 @@ #include #include +#include #include #include @@ -288,15 +289,16 @@ /** Check area conflicts with other areas. * - * @param as Address space. - * @param va Starting virtual address of the area being tested. - * @param size Size of the area being tested. - * @param avoid_area Do not touch this area. + * @param as Address space. + * @param addr Starting virtual address of the area being tested. + * @param count Number of pages in the area being tested. + * @param avoid Do not touch this area. * * @return True if there is no conflict, false otherwise. * */ -NO_TRACE static bool check_area_conflicts(as_t *as, uintptr_t va, size_t size, - as_area_t *avoid_area) -{ +NO_TRACE static bool check_area_conflicts(as_t *as, uintptr_t addr, + size_t count, as_area_t *avoid) +{ + ASSERT((addr % PAGE_SIZE) == 0); ASSERT(mutex_locked(&as->lock)); @@ -304,5 +306,5 @@ * We don't want any area to have conflicts with NULL page. */ - if (overlaps(va, size, (uintptr_t) NULL, PAGE_SIZE)) + if (overlaps(addr, count << PAGE_WIDTH, (uintptr_t) NULL, PAGE_SIZE)) return false; @@ -316,7 +318,7 @@ btree_node_t *leaf; as_area_t *area = - (as_area_t *) btree_search(&as->as_area_btree, va, &leaf); + (as_area_t *) btree_search(&as->as_area_btree, addr, &leaf); if (area) { - if (area != avoid_area) + if (area != avoid) return false; } @@ -328,12 +330,15 @@ area = (as_area_t *) node->value[node->keys - 1]; - mutex_lock(&area->lock); - - if (overlaps(va, size, area->base, area->pages * PAGE_SIZE)) { + if (area != avoid) { + mutex_lock(&area->lock); + + if (overlaps(addr, count << PAGE_WIDTH, + area->base, area->pages << PAGE_WIDTH)) { + mutex_unlock(&area->lock); + return false; + } + mutex_unlock(&area->lock); - return false; - } - - mutex_unlock(&area->lock); + } } @@ -342,12 +347,15 @@ area = (as_area_t *) node->value[0]; - mutex_lock(&area->lock); - - if (overlaps(va, size, area->base, area->pages * PAGE_SIZE)) { + if (area != avoid) { + mutex_lock(&area->lock); + + if (overlaps(addr, count << PAGE_WIDTH, + area->base, area->pages << PAGE_WIDTH)) { + mutex_unlock(&area->lock); + return false; + } + mutex_unlock(&area->lock); - return false; - } - - mutex_unlock(&area->lock); + } } @@ -357,10 +365,11 @@ area = (as_area_t *) leaf->value[i]; - if (area == avoid_area) + if (area == avoid) continue; mutex_lock(&area->lock); - if (overlaps(va, size, area->base, area->pages * PAGE_SIZE)) { + if (overlaps(addr, count << PAGE_WIDTH, + area->base, area->pages << PAGE_WIDTH)) { mutex_unlock(&area->lock); return false; @@ -375,5 +384,5 @@ */ if (!KERNEL_ADDRESS_SPACE_SHADOWED) { - return !overlaps(va, size, + return !overlaps(addr, count << PAGE_WIDTH, KERNEL_ADDRESS_SPACE_START, KERNEL_ADDRESS_SPACE_END - KERNEL_ADDRESS_SPACE_START); @@ -402,9 +411,11 @@ mem_backend_data_t *backend_data) { - if (base % PAGE_SIZE) + if ((base % PAGE_SIZE) != 0) return NULL; - if (!size) + if (size == 0) return NULL; + + size_t pages = SIZE2FRAMES(size); /* Writeable executable areas are not supported. */ @@ -414,5 +425,5 @@ mutex_lock(&as->lock); - if (!check_area_conflicts(as, base, size, NULL)) { + if (!check_area_conflicts(as, base, pages, NULL)) { mutex_unlock(&as->lock); return NULL; @@ -426,5 +437,5 @@ area->flags = flags; area->attributes = attrs; - area->pages = SIZE2FRAMES(size); + area->pages = pages; area->resident = 0; area->base = base; @@ -480,5 +491,6 @@ mutex_lock(&area->lock); - if ((area->base <= va) && (va < area->base + area->pages * PAGE_SIZE)) + if ((area->base <= va) && + (va < area->base + (area->pages << PAGE_WIDTH))) return area; @@ -496,5 +508,5 @@ mutex_lock(&area->lock); - if (va < area->base + area->pages * PAGE_SIZE) + if (va < area->base + (area->pages << PAGE_WIDTH)) return area; @@ -561,5 +573,5 @@ if (pages < area->pages) { - uintptr_t start_free = area->base + pages * PAGE_SIZE; + uintptr_t start_free = area->base + (pages << PAGE_WIDTH); /* @@ -574,5 +586,5 @@ */ ipl_t ipl = tlb_shootdown_start(TLB_INVL_PAGES, as->asid, - area->base + pages * PAGE_SIZE, area->pages - pages); + area->base + (pages << PAGE_WIDTH), area->pages - pages); /* @@ -597,8 +609,8 @@ size_t i = 0; - if (overlaps(ptr, size * PAGE_SIZE, area->base, - pages * PAGE_SIZE)) { + if (overlaps(ptr, size << PAGE_WIDTH, area->base, + pages << PAGE_WIDTH)) { - if (ptr + size * PAGE_SIZE <= start_free) { + if (ptr + (size << PAGE_WIDTH) <= start_free) { /* * The whole interval fits @@ -632,5 +644,5 @@ for (; i < size; i++) { pte_t *pte = page_mapping_find(as, ptr + - i * PAGE_SIZE); + (i << PAGE_WIDTH)); ASSERT(pte); @@ -641,10 +653,10 @@ (area->backend->frame_free)) { area->backend->frame_free(area, - ptr + i * PAGE_SIZE, + ptr + (i << PAGE_WIDTH), PTE_GET_FRAME(pte)); } page_mapping_remove(as, ptr + - i * PAGE_SIZE); + (i << PAGE_WIDTH)); } } @@ -655,5 +667,5 @@ */ - tlb_invalidate_pages(as->asid, area->base + pages * PAGE_SIZE, + tlb_invalidate_pages(as->asid, area->base + (pages << PAGE_WIDTH), area->pages - pages); @@ -662,5 +674,5 @@ */ as_invalidate_translation_cache(as, area->base + - pages * PAGE_SIZE, area->pages - pages); + (pages << PAGE_WIDTH), area->pages - pages); tlb_shootdown_finalize(ipl); @@ -671,6 +683,5 @@ * Check for overlaps with other address space areas. */ - if (!check_area_conflicts(as, address, pages * PAGE_SIZE, - area)) { + if (!check_area_conflicts(as, address, pages, area)) { mutex_unlock(&area->lock); mutex_unlock(&as->lock); @@ -771,5 +782,6 @@ for (size = 0; size < (size_t) node->value[i]; size++) { - pte_t *pte = page_mapping_find(as, ptr + size * PAGE_SIZE); + pte_t *pte = + page_mapping_find(as, ptr + (size << PAGE_WIDTH)); ASSERT(pte); @@ -780,8 +792,8 @@ (area->backend->frame_free)) { area->backend->frame_free(area, - ptr + size * PAGE_SIZE, PTE_GET_FRAME(pte)); + ptr + (size << PAGE_WIDTH), PTE_GET_FRAME(pte)); } - page_mapping_remove(as, ptr + size * PAGE_SIZE); + page_mapping_remove(as, ptr + (size << PAGE_WIDTH)); } } @@ -870,5 +882,5 @@ } - size_t src_size = src_area->pages * PAGE_SIZE; + size_t src_size = src_area->pages << PAGE_WIDTH; unsigned int src_flags = src_area->flags; mem_backend_t *src_backend = src_area->backend; @@ -1076,5 +1088,6 @@ for (size = 0; size < (size_t) node->value[i]; size++) { - pte_t *pte = page_mapping_find(as, ptr + size * PAGE_SIZE); + pte_t *pte = + page_mapping_find(as, ptr + (size << PAGE_WIDTH)); ASSERT(pte); @@ -1085,5 +1098,5 @@ /* Remove old mapping */ - page_mapping_remove(as, ptr + size * PAGE_SIZE); + page_mapping_remove(as, ptr + (size << PAGE_WIDTH)); } } @@ -1131,5 +1144,5 @@ /* Insert the new mapping */ - page_mapping_insert(as, ptr + size * PAGE_SIZE, + page_mapping_insert(as, ptr + (size << PAGE_WIDTH), old_frame[frame_idx++], page_flags); @@ -1453,5 +1466,5 @@ if (src_area) { - size = src_area->pages * PAGE_SIZE; + size = src_area->pages << PAGE_WIDTH; mutex_unlock(&src_area->lock); } else @@ -1508,14 +1521,14 @@ if (page >= right_pg) { /* Do nothing. */ - } else if (overlaps(page, count * PAGE_SIZE, left_pg, - left_cnt * PAGE_SIZE)) { + } else if (overlaps(page, count << PAGE_WIDTH, left_pg, + left_cnt << PAGE_WIDTH)) { /* The interval intersects with the left interval. */ return false; - } else if (overlaps(page, count * PAGE_SIZE, right_pg, - right_cnt * PAGE_SIZE)) { + } else if (overlaps(page, count << PAGE_WIDTH, right_pg, + right_cnt << PAGE_WIDTH)) { /* The interval intersects with the right interval. */ return false; - } else if ((page == left_pg + left_cnt * PAGE_SIZE) && - (page + count * PAGE_SIZE == right_pg)) { + } else if ((page == left_pg + (left_cnt << PAGE_WIDTH)) && + (page + (count << PAGE_WIDTH) == right_pg)) { /* * The interval can be added by merging the two already @@ -1525,5 +1538,5 @@ btree_remove(&area->used_space, right_pg, leaf); goto success; - } else if (page == left_pg + left_cnt * PAGE_SIZE) { + } else if (page == left_pg + (left_cnt << PAGE_WIDTH)) { /* * The interval can be added by simply growing the left @@ -1532,5 +1545,5 @@ node->value[node->keys - 1] += count; goto success; - } else if (page + count * PAGE_SIZE == right_pg) { + } else if (page + (count << PAGE_WIDTH) == right_pg) { /* * The interval can be addded by simply moving base of @@ -1559,9 +1572,9 @@ */ - if (overlaps(page, count * PAGE_SIZE, right_pg, - right_cnt * PAGE_SIZE)) { + if (overlaps(page, count << PAGE_WIDTH, right_pg, + right_cnt << PAGE_WIDTH)) { /* The interval intersects with the right interval. */ return false; - } else if (page + count * PAGE_SIZE == right_pg) { + } else if (page + (count << PAGE_WIDTH) == right_pg) { /* * The interval can be added by moving the base of the @@ -1598,14 +1611,14 @@ if (page < left_pg) { /* Do nothing. */ - } else if (overlaps(page, count * PAGE_SIZE, left_pg, - left_cnt * PAGE_SIZE)) { + } else if (overlaps(page, count << PAGE_WIDTH, left_pg, + left_cnt << PAGE_WIDTH)) { /* The interval intersects with the left interval. */ return false; - } else if (overlaps(page, count * PAGE_SIZE, right_pg, - right_cnt * PAGE_SIZE)) { + } else if (overlaps(page, count << PAGE_WIDTH, right_pg, + right_cnt << PAGE_WIDTH)) { /* The interval intersects with the right interval. */ return false; - } else if ((page == left_pg + left_cnt * PAGE_SIZE) && - (page + count * PAGE_SIZE == right_pg)) { + } else if ((page == left_pg + (left_cnt << PAGE_WIDTH)) && + (page + (count << PAGE_WIDTH) == right_pg)) { /* * The interval can be added by merging the two already @@ -1615,5 +1628,5 @@ btree_remove(&area->used_space, right_pg, node); goto success; - } else if (page == left_pg + left_cnt * PAGE_SIZE) { + } else if (page == left_pg + (left_cnt << PAGE_WIDTH)) { /* * The interval can be added by simply growing the left @@ -1622,5 +1635,5 @@ leaf->value[leaf->keys - 1] += count; goto success; - } else if (page + count * PAGE_SIZE == right_pg) { + } else if (page + (count << PAGE_WIDTH) == right_pg) { /* * The interval can be addded by simply moving base of @@ -1649,9 +1662,9 @@ */ - if (overlaps(page, count * PAGE_SIZE, left_pg, - left_cnt * PAGE_SIZE)) { + if (overlaps(page, count << PAGE_WIDTH, left_pg, + left_cnt << PAGE_WIDTH)) { /* The interval intersects with the left interval. */ return false; - } else if (left_pg + left_cnt * PAGE_SIZE == page) { + } else if (left_pg + (left_cnt << PAGE_WIDTH) == page) { /* * The interval can be added by growing the left @@ -1688,6 +1701,6 @@ */ - if (overlaps(page, count * PAGE_SIZE, left_pg, - left_cnt * PAGE_SIZE)) { + if (overlaps(page, count << PAGE_WIDTH, left_pg, + left_cnt << PAGE_WIDTH)) { /* * The interval intersects with the left @@ -1695,6 +1708,6 @@ */ return false; - } else if (overlaps(page, count * PAGE_SIZE, right_pg, - right_cnt * PAGE_SIZE)) { + } else if (overlaps(page, count << PAGE_WIDTH, right_pg, + right_cnt << PAGE_WIDTH)) { /* * The interval intersects with the right @@ -1702,6 +1715,6 @@ */ return false; - } else if ((page == left_pg + left_cnt * PAGE_SIZE) && - (page + count * PAGE_SIZE == right_pg)) { + } else if ((page == left_pg + (left_cnt << PAGE_WIDTH)) && + (page + (count << PAGE_WIDTH) == right_pg)) { /* * The interval can be added by merging the two @@ -1711,5 +1724,5 @@ btree_remove(&area->used_space, right_pg, leaf); goto success; - } else if (page == left_pg + left_cnt * PAGE_SIZE) { + } else if (page == left_pg + (left_cnt << PAGE_WIDTH)) { /* * The interval can be added by simply growing @@ -1718,5 +1731,5 @@ leaf->value[i - 1] += count; goto success; - } else if (page + count * PAGE_SIZE == right_pg) { + } else if (page + (count << PAGE_WIDTH) == right_pg) { /* * The interval can be addded by simply moving @@ -1784,5 +1797,5 @@ for (i = 0; i < leaf->keys; i++) { if (leaf->key[i] == page) { - leaf->key[i] += count * PAGE_SIZE; + leaf->key[i] += count << PAGE_WIDTH; leaf->value[i] -= count; goto success; @@ -1799,8 +1812,8 @@ size_t left_cnt = (size_t) node->value[node->keys - 1]; - if (overlaps(left_pg, left_cnt * PAGE_SIZE, page, - count * PAGE_SIZE)) { - if (page + count * PAGE_SIZE == - left_pg + left_cnt * PAGE_SIZE) { + if (overlaps(left_pg, left_cnt << PAGE_WIDTH, page, + count << PAGE_WIDTH)) { + if (page + (count << PAGE_WIDTH) == + left_pg + (left_cnt << PAGE_WIDTH)) { /* * The interval is contained in the rightmost @@ -1811,6 +1824,6 @@ node->value[node->keys - 1] -= count; goto success; - } else if (page + count * PAGE_SIZE < - left_pg + left_cnt*PAGE_SIZE) { + } else if (page + (count << PAGE_WIDTH) < + left_pg + (left_cnt << PAGE_WIDTH)) { /* * The interval is contained in the rightmost @@ -1820,9 +1833,9 @@ * new interval. */ - size_t new_cnt = ((left_pg + left_cnt * PAGE_SIZE) - - (page + count*PAGE_SIZE)) >> PAGE_WIDTH; + size_t new_cnt = ((left_pg + (left_cnt << PAGE_WIDTH)) - + (page + (count << PAGE_WIDTH))) >> PAGE_WIDTH; node->value[node->keys - 1] -= count + new_cnt; btree_insert(&area->used_space, page + - count * PAGE_SIZE, (void *) new_cnt, leaf); + (count << PAGE_WIDTH), (void *) new_cnt, leaf); goto success; } @@ -1837,8 +1850,8 @@ size_t left_cnt = (size_t) leaf->value[leaf->keys - 1]; - if (overlaps(left_pg, left_cnt * PAGE_SIZE, page, - count * PAGE_SIZE)) { - if (page + count * PAGE_SIZE == - left_pg + left_cnt * PAGE_SIZE) { + if (overlaps(left_pg, left_cnt << PAGE_WIDTH, page, + count << PAGE_WIDTH)) { + if (page + (count << PAGE_WIDTH) == + left_pg + (left_cnt << PAGE_WIDTH)) { /* * The interval is contained in the rightmost @@ -1848,6 +1861,6 @@ leaf->value[leaf->keys - 1] -= count; goto success; - } else if (page + count * PAGE_SIZE < left_pg + - left_cnt * PAGE_SIZE) { + } else if (page + (count << PAGE_WIDTH) < left_pg + + (left_cnt << PAGE_WIDTH)) { /* * The interval is contained in the rightmost @@ -1857,9 +1870,9 @@ * interval. */ - size_t new_cnt = ((left_pg + left_cnt * PAGE_SIZE) - - (page + count * PAGE_SIZE)) >> PAGE_WIDTH; + size_t new_cnt = ((left_pg + (left_cnt << PAGE_WIDTH)) - + (page + (count << PAGE_WIDTH))) >> PAGE_WIDTH; leaf->value[leaf->keys - 1] -= count + new_cnt; btree_insert(&area->used_space, page + - count * PAGE_SIZE, (void *) new_cnt, leaf); + (count << PAGE_WIDTH), (void *) new_cnt, leaf); goto success; } @@ -1883,8 +1896,8 @@ * to (i - 1) and i. */ - if (overlaps(left_pg, left_cnt * PAGE_SIZE, page, - count * PAGE_SIZE)) { - if (page + count * PAGE_SIZE == - left_pg + left_cnt*PAGE_SIZE) { + if (overlaps(left_pg, left_cnt << PAGE_WIDTH, page, + count << PAGE_WIDTH)) { + if (page + (count << PAGE_WIDTH) == + left_pg + (left_cnt << PAGE_WIDTH)) { /* * The interval is contained in the @@ -1895,6 +1908,6 @@ leaf->value[i - 1] -= count; goto success; - } else if (page + count * PAGE_SIZE < - left_pg + left_cnt * PAGE_SIZE) { + } else if (page + (count << PAGE_WIDTH) < + left_pg + (left_cnt << PAGE_WIDTH)) { /* * The interval is contained in the @@ -1905,10 +1918,10 @@ */ size_t new_cnt = ((left_pg + - left_cnt * PAGE_SIZE) - - (page + count * PAGE_SIZE)) >> + (left_cnt << PAGE_WIDTH)) - + (page + (count << PAGE_WIDTH))) >> PAGE_WIDTH; leaf->value[i - 1] -= count + new_cnt; btree_insert(&area->used_space, page + - count * PAGE_SIZE, (void *) new_cnt, + (count << PAGE_WIDTH), (void *) new_cnt, leaf); goto success; @@ -1961,4 +1974,70 @@ } +/** Return pointer to unmapped address space area + * + * @param base Lowest address bound. + * @param size Requested size of the allocation. + * + * @return Pointer to the beginning of unmapped address space area. + * + */ +sysarg_t sys_as_get_unmapped_area(uintptr_t base, size_t size) +{ + if (size == 0) + return 0; + + /* + * Make sure we allocate from page-aligned + * address. Check for possible overflow in + * each step. + */ + + size_t pages = SIZE2FRAMES(size); + uintptr_t ret = 0; + + /* + * Find the lowest unmapped address aligned on the sz + * boundary, not smaller than base and of the required size. + */ + + mutex_lock(&AS->lock); + + /* First check the base address itself */ + uintptr_t addr = ALIGN_UP(base, PAGE_SIZE); + if ((addr >= base) && + (check_area_conflicts(AS, addr, pages, NULL))) + ret = addr; + + /* Eventually check the addresses behind each area */ + link_t *cur; + for (cur = AS->as_area_btree.leaf_head.next; + (ret == 0) && (cur != &AS->as_area_btree.leaf_head); + cur = cur->next) { + btree_node_t *node = + list_get_instance(cur, btree_node_t, leaf_link); + + btree_key_t i; + for (i = 0; (ret == 0) && (i < node->keys); i++) { + as_area_t *area = (as_area_t *) node->value[i]; + + mutex_lock(&area->lock); + + uintptr_t addr = + ALIGN_UP(area->base + (area->pages << PAGE_WIDTH), + PAGE_SIZE); + + if ((addr >= base) && (addr >= area->base) && + (check_area_conflicts(AS, addr, pages, area))) + ret = addr; + + mutex_unlock(&area->lock); + } + } + + mutex_unlock(&AS->lock); + + return (sysarg_t) ret; +} + /** Get list of adress space areas. * @@ -2027,5 +2106,5 @@ mutex_lock(&as->lock); - /* print out info about address space areas */ + /* Print out info about address space areas */ link_t *cur; for (cur = as->as_area_btree.leaf_head.next; Index: kernel/generic/src/syscall/syscall.c =================================================================== --- kernel/generic/src/syscall/syscall.c (revision bfe43d5afff05c7aa00374944b0dbd885849f884) +++ kernel/generic/src/syscall/syscall.c (revision fc51296af4f45da426f5626f3573adee6b0babda) @@ -143,4 +143,5 @@ (syshandler_t) sys_as_area_change_flags, (syshandler_t) sys_as_area_destroy, + (syshandler_t) sys_as_get_unmapped_area, /* IPC related syscalls. */