Add naive_mmap_with_attr
This commit is contained in:
@@ -77,8 +77,9 @@ int sys_mmap_v2(uintptr_t* vaddr, uintptr_t* paddr, int len, sys_mmap_info* info
|
||||
struct Thread* cur_task = cur_cpu()->task;
|
||||
assert(cur_task != NULL);
|
||||
|
||||
if (vaddr == NULL) {
|
||||
ERROR("Invalid vaddr from %s\n", cur_task->name);
|
||||
if (vaddr == NULL || paddr == NULL) {
|
||||
ERROR("Invalid vaddr and paddr param from %s\n", cur_task->name);
|
||||
return -1;
|
||||
}
|
||||
|
||||
int true_len = ALIGNUP(len, PAGE_SIZE);
|
||||
@@ -86,24 +87,50 @@ int sys_mmap_v2(uintptr_t* vaddr, uintptr_t* paddr, int len, sys_mmap_info* info
|
||||
sys_mmap_type type = info->type;
|
||||
uintptr_t vaddr_to_map = *vaddr;
|
||||
if (type == SYS_MMAP_CUSTOMIZE) {
|
||||
if (paddr == NULL || *paddr == (uintptr_t)NULL || vaddr_to_map == (uintptr_t)NULL) {
|
||||
ERROR("Customized mapping from %s must have vaddr(%p) and paddr(%p)\n", cur_task->name, vaddr, paddr);
|
||||
return -1;
|
||||
}
|
||||
uintptr_t paddr_to_map = *paddr;
|
||||
if (*paddr != (uintptr_t)NULL) {
|
||||
if (*paddr == (uintptr_t)NULL || vaddr_to_map == (uintptr_t)NULL) {
|
||||
ERROR("Customized mapping from %s must have vaddr(%p) and paddr(%p)\n", cur_task->name, vaddr, paddr);
|
||||
return -1;
|
||||
}
|
||||
uintptr_t paddr_to_map = *paddr;
|
||||
|
||||
TraceTag mem_signature_tag;
|
||||
if (!CreateResourceTag(&mem_signature_tag, &cur_task->memspace->tag, "CUSTOMIZED_MEMORY", TRACER_MEM_SIGNATURE, (void*)vaddr)) {
|
||||
ERROR("Sign memory signature failed from %s\n", cur_task->name);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!_map_customizable_page(cur_task->memspace, vaddr_to_map, paddr_to_map, len, info->attr)) {
|
||||
ERROR("%s mapping page failed(Short of memory)\n", cur_task->name);
|
||||
DeleteResource(&mem_signature_tag, &cur_task->memspace->tag);
|
||||
return -1;
|
||||
TraceTag mem_signature_tag;
|
||||
if (!CreateResourceTag(&mem_signature_tag, &cur_task->memspace->tag, "CUSTOMIZED_MEMORY", TRACER_MEM_SIGNATURE, (void*)vaddr)) {
|
||||
ERROR("Sign memory signature failed from %s\n", cur_task->name);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!_map_customizable_page(cur_task->memspace, vaddr_to_map, paddr_to_map, len, info->attr)) {
|
||||
ERROR("%s mapping page failed(Short of memory)\n", cur_task->name);
|
||||
DeleteResource(&mem_signature_tag, &cur_task->memspace->tag);
|
||||
return -1;
|
||||
}
|
||||
} else {
|
||||
char* new_paddr = raw_alloc_by_ownership(cur_task->memspace->userspace_mem_usage.tag, true_len);
|
||||
if (new_paddr == NULL) {
|
||||
ERROR("Alloc dynamic memory failed\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
TraceTag mem_signature_tag;
|
||||
if (!CreateResourceTag(&mem_signature_tag, &cur_task->memspace->tag, "USER_MEMORY", TRACER_MEM_SIGNATURE, new_paddr)) {
|
||||
raw_free_by_ownership(cur_task->memspace->userspace_mem_usage.tag, new_paddr);
|
||||
ERROR("Sign memory signature failed from %s\n", cur_task->name);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (_map_customizable_page(cur_task->memspace, vaddr_to_map, (uintptr_t)new_paddr, len, info->attr) == (uintptr_t)NULL) {
|
||||
raw_free_by_ownership(cur_task->memspace->userspace_mem_usage.tag, new_paddr);
|
||||
DeleteResource(&mem_signature_tag, &cur_task->memspace->tag);
|
||||
return -1;
|
||||
}
|
||||
|
||||
// assign new_paddr back to user
|
||||
*paddr = (uintptr_t)new_paddr;
|
||||
}
|
||||
|
||||
cur_task->memspace->mem_size += true_len;
|
||||
*vaddr = *vaddr + true_len;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user