DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-21 00:06:32 +00:00
Code Issues Releases Wiki Activity

merge master and fix conflicts

Browse Source
This commit is contained in:
fslongjin
2022-08-14 21:43:39 +08:00
parent daf8732bbd
commit f3cd2b7777
4 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/mm/mmap.c
View File

@ -327,6 +327,8 @@ int mm_map_vma(struct mm_struct *mm, uint64_t vaddr, uint64_t length, uint64_t p
vma->vm_start = vaddr;
vma->vm_end = vaddr + length;
// 将vma与对应的anon_vma进行绑定
struct Page * pg = Phy_to_2M_Page(paddr);
// 将VMA加入链表
retval = vma_insert(mm, vma);
if (retval == -EEXIST) // 之前已经存在了相同的vma，直接返回
@ -336,7 +338,7 @@ int mm_map_vma(struct mm_struct *mm, uint64_t vaddr, uint64_t length, uint64_t p
}
uint64_t len_4k = length % PAGE_2M_SIZE;
uint64_t len_2m = length - len_4k;
// kdebug("len_2m=%ld", len_2m);
// ==== 将地址映射到页表
/*
todo: 限制页面的读写权限