RT-Thread
/
rt-thread
mirror of https://github.com/RT-Thread/rt-thread
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[rt-smart] fix competition on aspace (#7064) 

* [mm] mmu operations should be wrapped by _aspace_bst_insert & _aspace_bst_remove to avoid competition on page table

* [lwp] may not return null on failed
This commit is contained in:
Shell 2023-03-19 14:41:50 +08:00 committed by GitHub
parent c11f5bb251
commit dd2f1a795a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/lwp/lwp_user_mm.c
View File

@ -362,8 +362,12 @@ void *lwp_map_user_phy(struct rt_lwp *lwp, void *map_va, void *map_pa,
va = RT_NULL; va = RT_NULL;
LOG_W("%s", __func__); LOG_W("%s", __func__);
} }
else
{
va += offset;
}
return va + offset; return va;
} }
rt_base_t lwp_brk(void *addr) rt_base_t lwp_brk(void *addr)

6
components/mm/mm_aspace.c
View File

@ -75,12 +75,12 @@ static inline void _varea_uninstall(rt_varea_t varea)
rt_varea_free_pages(varea); rt_varea_free_pages(varea);
rt_hw_mmu_unmap(aspace, varea->start, varea->size);
rt_hw_tlb_invalidate_range(aspace, varea->start, varea->size, ARCH_PAGE_SIZE);
WR_LOCK(aspace); WR_LOCK(aspace);
_aspace_bst_remove(aspace, varea); _aspace_bst_remove(aspace, varea);
WR_UNLOCK(aspace); WR_UNLOCK(aspace);
rt_hw_mmu_unmap(aspace, varea->start, varea->size);
rt_hw_tlb_invalidate_range(aspace, varea->start, varea->size, ARCH_PAGE_SIZE);
} }
int _init_lock(rt_aspace_t aspace) int _init_lock(rt_aspace_t aspace)