diff options
| author | Shell <[email protected]> | 2023-03-30 08:25:15 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-03-30 08:25:15 +0800 |
| commit | eec78d9f5d3f0a944500a1cac5802dfee2befc7b (patch) | |
| tree | 8a29c0d564ea854d41f27a385f55100f3a8bd341 /components/lwp | |
| parent | dc77d8fcb62024f8dbb6de73cd2b4a604ae20f3a (diff) | |
[rt-smart] testcase & improvements for memory management (#7099)
* [utest/mm] add testcase for create/init
format codes of create/init in components/mm
* [libcpu/aarch64] fix user stack check routine
* [kservice] export API for utest
* [utest/mm] testcase for aspace_map
format & modify the files under components/mm related with aspace_map
* [lwp/user_mm] add user_map_varea for mmap feature
* [mm] rename rt_mm_fault_try_fix to rt_aspace_fault_try_fix
* [utest/mm] testcase for synchronization
* [mm] modify unmap api to improve throughput
* [utest/mm] testcases for cache and varea map
* [format] remove extra space
* [utest/mm] fix testcase problem in header
* [lwp] extend map_user_varea with a flag
* [utest/mm] testcase for lwp_map_user_varea
* [libcpu/arm/cortex-a] fix kernel space layout
* [utest/mm] adjust for armv7 arch
Diffstat (limited to 'components/lwp')
| -rw-r--r-- | components/lwp/lwp_shm.c | 21 | ||||
| -rw-r--r-- | components/lwp/lwp_user_mm.c | 108 | ||||
| -rw-r--r-- | components/lwp/lwp_user_mm.h | 7 |
3 files changed, 125 insertions, 11 deletions
diff --git a/components/lwp/lwp_shm.c b/components/lwp/lwp_shm.c index 51964dd2b8..f2bacf1b13 100644 --- a/components/lwp/lwp_shm.c +++ b/components/lwp/lwp_shm.c @@ -56,13 +56,24 @@ static void on_shm_varea_close(struct rt_varea *varea) shm->ref -= 1; } -static void on_shm_page_fault(struct rt_varea *varea, struct rt_mm_fault_msg *msg) +static void on_shm_page_fault(struct rt_varea *varea, struct rt_aspace_fault_msg *msg) { struct lwp_shm_struct *shm; + int err; shm = rt_container_of(varea->mem_obj, struct lwp_shm_struct, mem_obj); - msg->response.status = MM_FAULT_STATUS_OK; - msg->response.vaddr = (void *)shm->addr; - msg->response.size = shm->size; + + /* map all share page frames to user space in a time */ + void *page = (void *)shm->addr; + void *pg_paddr = page + PV_OFFSET; + err = rt_varea_map_range(varea, varea->start, pg_paddr, shm->size); + + if (err == RT_EOK) + { + msg->response.status = MM_FAULT_STATUS_OK_MAPPED; + msg->response.size = shm->size; + msg->response.vaddr = page; + } + return ; } @@ -383,7 +394,7 @@ int _lwp_shmdt(void *shm_vaddr) return -1; } - ret = rt_aspace_unmap(lwp->aspace, shm_vaddr, 1); + ret = rt_aspace_unmap(lwp->aspace, shm_vaddr); if (ret != RT_EOK) { ret = -1; diff --git a/components/lwp/lwp_user_mm.c b/components/lwp/lwp_user_mm.c index 57dfb5338b..09cc47dd2b 100644 --- a/components/lwp/lwp_user_mm.c +++ b/components/lwp/lwp_user_mm.c @@ -108,15 +108,18 @@ static const char *user_get_name(rt_varea_t varea) return name; } +#define NO_AUTO_FETCH 0x1 +#define VAREA_CAN_AUTO_FETCH(varea) (!((rt_ubase_t)((varea)->data) & NO_AUTO_FETCH)) + static void _user_do_page_fault(struct rt_varea *varea, - struct rt_mm_fault_msg *msg) + struct rt_aspace_fault_msg *msg) { struct rt_lwp_objs *lwp_objs; lwp_objs = rt_container_of(varea->mem_obj, struct rt_lwp_objs, mem_obj); if (lwp_objs->source) { - void *paddr = rt_hw_mmu_v2p(lwp_objs->source, msg->vaddr); + void *paddr = rt_hw_mmu_v2p(lwp_objs->source, msg->fault_vaddr); if (paddr != ARCH_MAP_FAILED) { void *vaddr; @@ -128,7 +131,7 @@ static void _user_do_page_fault(struct rt_varea *varea, if (cp) { memcpy(cp, vaddr, ARCH_PAGE_SIZE); - rt_varea_insert_page(varea, cp); + rt_varea_pgmgr_insert(varea, cp); msg->response.status = MM_FAULT_STATUS_OK; msg->response.vaddr = cp; msg->response.size = ARCH_PAGE_SIZE; @@ -143,7 +146,7 @@ static void _user_do_page_fault(struct rt_varea *varea, { rt_page_t page = rt_page_addr2page(vaddr); page->ref_cnt += 1; - rt_varea_insert_page(varea, vaddr); + rt_varea_pgmgr_insert(varea, vaddr); msg->response.status = MM_FAULT_STATUS_OK; msg->response.vaddr = vaddr; msg->response.size = ARCH_PAGE_SIZE; @@ -155,14 +158,20 @@ static void _user_do_page_fault(struct rt_varea *varea, rt_mm_dummy_mapper.on_page_fault(varea, msg); } } - else /* if (!lwp_objs->source), no aspace as source data */ + else if (VAREA_CAN_AUTO_FETCH(varea)) { + /* if (!lwp_objs->source), no aspace as source data */ rt_mm_dummy_mapper.on_page_fault(varea, msg); } } static void _init_lwp_objs(struct rt_lwp_objs *lwp_objs, rt_aspace_t aspace) { + /** + * @brief one lwp_obj represent an base layout of page based memory in user space + * This is useful on duplication. Where we only have a (lwp_objs and offset) to + * provide identical memory. This is implemented by lwp_objs->source. + */ lwp_objs->source = NULL; lwp_objs->mem_obj.get_name = user_get_name; lwp_objs->mem_obj.hint_free = NULL; @@ -198,7 +207,7 @@ static void *_lwp_map_user(struct rt_lwp *lwp, void *map_va, size_t map_size, int lwp_unmap_user(struct rt_lwp *lwp, void *va) { int err; - err = rt_aspace_unmap(lwp->aspace, va, 1); + err = rt_aspace_unmap(lwp->aspace, va); return err; } @@ -324,6 +333,93 @@ void *lwp_map_user(struct rt_lwp *lwp, void *map_va, size_t map_size, int text) return ret; } +static inline size_t _flags_to_attr(size_t flags) +{ + size_t attr; + + if (flags & LWP_MAP_FLAG_NOCACHE) + { + attr = MMU_MAP_U_RW; + } + else + { + attr = MMU_MAP_U_RWCB; + } + + return attr; +} + +static inline mm_flag_t _flags_to_aspace_flag(size_t flags) +{ + mm_flag_t mm_flag = 0; + + return mm_flag; +} + +static rt_varea_t _lwp_map_user_varea(struct rt_lwp *lwp, void *map_va, size_t map_size, size_t flags) +{ + void *va = map_va; + int ret = 0; + rt_mem_obj_t mem_obj = &lwp->lwp_obj->mem_obj; + rt_varea_t varea; + mm_flag_t mm_flags; + size_t attr; + + varea = rt_malloc(sizeof(*varea)); + if (varea) + { + attr = _flags_to_attr(flags); + mm_flags = _flags_to_aspace_flag(flags); + ret = rt_aspace_map_static(lwp->aspace, varea, &va, map_size, + attr, mm_flags, mem_obj, 0); + /* let aspace handle the free of varea */ + varea->flag &= ~MMF_STATIC_ALLOC; + /* don't apply auto fetch on this */ + varea->data = (void *)NO_AUTO_FETCH; + } + else + { + ret = -RT_ENOMEM; + } + + if (ret != RT_EOK) + { + LOG_I("lwp_map_user: failed to map %lx with size %lx with errno %d", map_va, + map_size, ret); + } + + return varea; +} + +static rt_varea_t _map_user_varea_ext(struct rt_lwp *lwp, void *map_va, size_t map_size, size_t flags) +{ + rt_varea_t varea = RT_NULL; + size_t offset = 0; + + if (!map_size) + { + return 0; + } + offset = (size_t)map_va & ARCH_PAGE_MASK; + map_size += (offset + ARCH_PAGE_SIZE - 1); + map_size &= ~ARCH_PAGE_MASK; + map_va = (void *)((size_t)map_va & ~ARCH_PAGE_MASK); + + varea = _lwp_map_user_varea(lwp, map_va, map_size, flags); + + return varea; +} + +rt_varea_t lwp_map_user_varea_ext(struct rt_lwp *lwp, void *map_va, size_t map_size, size_t flags) +{ + return _map_user_varea_ext(lwp, map_va, map_size, flags); +} + +rt_varea_t lwp_map_user_varea(struct rt_lwp *lwp, void *map_va, size_t map_size) +{ + return _map_user_varea_ext(lwp, map_va, map_size, LWP_MAP_FLAG_NONE); +} + void *lwp_map_user_phy(struct rt_lwp *lwp, void *map_va, void *map_pa, size_t map_size, int cached) { diff --git a/components/lwp/lwp_user_mm.h b/components/lwp/lwp_user_mm.h index c057f23b88..d2c6681e29 100644 --- a/components/lwp/lwp_user_mm.h +++ b/components/lwp/lwp_user_mm.h @@ -25,12 +25,19 @@ extern "C" { #endif +#define LWP_MAP_FLAG_NONE 0x0000 +#define LWP_MAP_FLAG_NOCACHE 0x0001 + int lwp_user_space_init(struct rt_lwp *lwp, rt_bool_t is_fork); void lwp_unmap_user_space(struct rt_lwp *lwp); int lwp_unmap_user(struct rt_lwp *lwp, void *va); void *lwp_map_user(struct rt_lwp *lwp, void *map_va, size_t map_size, rt_bool_t text); +rt_varea_t lwp_map_user_varea(struct rt_lwp *lwp, void *map_va, size_t map_size); +/* check LWP_MAP_FLAG_* */ +rt_varea_t lwp_map_user_varea_ext(struct rt_lwp *lwp, void *map_va, size_t map_size, size_t flags); + void *lwp_map_user_phy(struct rt_lwp *lwp, void *map_va, void *map_pa, size_t map_size, rt_bool_t cached); int lwp_unmap_user_phy(struct rt_lwp *lwp, void *va); |
