floratest1
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support mmap with customized attr.

This commit is contained in:
TXuian 2024-10-31 21:00:09 +08:00
parent 78cba2564e
commit ce727442de
10 changed files with 163 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ubiquitous/XiZi_AIoT/kernel_actracer/actracer_tag.h
View File

@ -7,7 +7,7 @@ typedef enum {
TRACER_HARDKERNEL_AC_RESOURCE,
TRACER_TASK_DESCRIPTOR_AC_RESOURCE,
TRACER_SERVER_IDENTITY_AC_RESOURCE,
TRACER_MEM_FROM_BUDDY_AC_RESOURCE,
TRACER_MEM_SIGNATURE,
TRACER_SYSOBJECT,
} tracemeta_ac_type;

21
Ubiquitous/XiZi_AIoT/services/lib/usyscall/usyscall.c
View File

@ -128,8 +128,12 @@ uintptr_t get_tick()
uintptr_t mmap(uintptr_t vaddr, uintptr_t paddr, int len, bool is_dev)
{
sys_mmap_info info = {
.type = SYS_MMAP_NORMAL,
.is_dev = is_dev,
};
uintptr_t vaddr_inner = vaddr, paddr_inner = paddr;
if (syscall(SYSCALL_MMAP, (intptr_t)&vaddr_inner, (intptr_t)&paddr_inner, (intptr_t)len, (intptr_t)is_dev) < 0) {
if (syscall(SYSCALL_MMAP, (intptr_t)&vaddr_inner, (intptr_t)&paddr_inner, (intptr_t)len, (intptr_t)&info) < 0) {
return (uintptr_t)NULL;
}
return vaddr_inner;
@ -137,7 +141,20 @@ uintptr_t mmap(uintptr_t vaddr, uintptr_t paddr, int len, bool is_dev)
int naive_mmap(uintptr_t* vaddr, uintptr_t* paddr, int len, bool is_dev)
{
return syscall(SYSCALL_MMAP, (uintptr_t)vaddr, (intptr_t)paddr, (intptr_t)len, (intptr_t)is_dev);
sys_mmap_info info = {
.type = SYS_MMAP_NORMAL,
.is_dev = is_dev,
};
return syscall(SYSCALL_MMAP, (uintptr_t)vaddr, (intptr_t)paddr, (intptr_t)len, (intptr_t)&info);
}
int mmap_with_attr(uintptr_t vaddr, uintptr_t paddr, int len, uintptr_t attr)
{
sys_mmap_info info = {
.type = SYS_MMAP_CUSTOMIZE,
.attr = attr,
};
return syscall(SYSCALL_MMAP, (intptr_t)vaddr, (intptr_t)paddr, (intptr_t)len, (intptr_t)&info);
}
int register_irq(int irq, int opcode)

12
Ubiquitous/XiZi_AIoT/services/lib/usyscall/usyscall.h
View File

@ -58,6 +58,17 @@ typedef enum {
SYS_TASK_YIELD_BLOCK_IPC = 0x2,
} task_yield_reason;
typedef enum {
SYS_MMAP_NORMAL = 0x0,
SYS_MMAP_CUSTOMIZE,
} sys_mmap_type;
typedef struct sys_mmap_info {
sys_mmap_type type;
uintptr_t attr;
bool is_dev;
} sys_mmap_info;
typedef union {
struct {
uintptr_t memblock_start;
@ -96,6 +107,7 @@ int register_irq(int irq, int opcode);
uintptr_t mmap(uintptr_t vaddr, uintptr_t paddr, int len, bool is_dev);
int naive_mmap(uintptr_t* vaddr, uintptr_t* paddr, int len, bool is_dev);
int customized_mmap(uintptr_t vaddr, uintptr_t paddr, int len, uintptr_t attr);
int task_heap_base();
int get_memblock_info(sys_state_info* info);

1
Ubiquitous/XiZi_AIoT/softkernel/include/memspace.h
View File

@ -52,6 +52,7 @@ struct MemSpace {
/* mem usage info */
struct MemUsage kernspace_mem_usage;
struct MemUsage userspace_mem_usage;
struct MemUsage customized_mapping_mem_map;
/* task memory resources */
struct TopLevelPageDirectory pgdir; // [phy] vm pgtbl base address

12
Ubiquitous/XiZi_AIoT/softkernel/include/syscall.h
View File

@ -78,6 +78,17 @@ typedef enum {
SYS_TASK_YIELD_BLOCK_IPC = 0x2,
} task_yield_reason;
typedef enum {
SYS_MMAP_NORMAL = 0x0,
SYS_MMAP_CUSTOMIZE,
} sys_mmap_type;
typedef struct {
sys_mmap_type type;
uintptr_t attr;
bool is_dev;
} sys_mmap_info;
typedef union {
struct {
uintptr_t memblock_start;
@ -112,6 +123,7 @@ int sys_wait_session(struct Session* userland_session);
int sys_exec(char* img_start, char* name, char** argv);
int sys_state(sys_state_option option, sys_state_info* info);
int sys_mmap(uintptr_t* vaddr, uintptr_t* paddr, int len, int is_dev);
int sys_mmap_v2(uintptr_t* vaddr, uintptr_t* paddr, int len, sys_mmap_info* info);
int sys_register_irq(int irq_num, int irq_opcode);
int sys_unbind_irq_all(struct Thread* task);

14
Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable.c
View File

@ -143,6 +143,20 @@ static bool _map_user_pages(struct MemSpace* pmemspace, uintptr_t vaddr, uintptr
return _map_pages(pmemspace->pgdir.pd_addr, vaddr, paddr, (intptr_t)len, mem_attr);
}
bool _map_customizable_page(struct MemSpace* pmemspace, uintptr_t vaddr, uintptr_t paddr, int len, uintptr_t attr)
{
if (len < 0) {
return false;
}
if (UNLIKELY(vaddr >= USER_MEM_TOP)) {
ERROR("mapping kernel space.\n");
return false;
}
return _map_pages(pmemspace->pgdir.pd_addr, vaddr, paddr, (intptr_t)len, attr);
}
/// assume that a user pagedir is allocated from [0, size)
/// if new_size > old_size, allocate more space,
/// if old_size > new_size, free extra space, to avoid unnecessary alloc/free.

91
Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_mmap.c
View File

@ -62,7 +62,7 @@ int sys_mmap(uintptr_t* vaddr, uintptr_t* paddr, int len, int is_dev)
raw_free_by_ownership(cur_task->memspace->userspace_mem_usage.tag, new_paddr);
return -1;
}
CreateResourceTag(NULL, &cur_task->memspace->tag, "USER_MEMORY", TRACER_MEM_FROM_BUDDY_AC_RESOURCE, new_paddr);
CreateResourceTag(NULL, &cur_task->memspace->tag, "USER_MEMORY", TRACER_MEM_SIGNATURE, new_paddr);
*paddr = (uintptr_t)new_paddr;
}
@ -70,3 +70,92 @@ int sys_mmap(uintptr_t* vaddr, uintptr_t* paddr, int len, int is_dev)
*vaddr = *vaddr + true_len;
return 0;
}
extern bool _map_customizable_page(struct MemSpace* pmemspace, uintptr_t vaddr, uintptr_t paddr, int len, uintptr_t attr);
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);
}
int true_len = ALIGNUP(len, PAGE_SIZE);
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;
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;
}
return 0;
}
if (type == SYS_MMAP_NORMAL) {
bool is_dev = info->is_dev;
if (*paddr != (uintptr_t)NULL) {
if (paddr == NULL || *paddr == (uintptr_t)NULL || vaddr_to_map == (uintptr_t)NULL) {
ERROR("Invalid mapping from %s\n", cur_task->name);
return -1;
}
uintptr_t paddr_to_map = *paddr;
if (paddr_to_map >= PHY_MEM_BASE && paddr_to_map < PHY_MEM_STOP && cur_task->tid > 1) {
ERROR("mapping invalid memory: 0x%p\n", paddr_to_map);
return -1;
}
if (xizi_share_page_manager.task_map_pages(cur_task, vaddr_to_map, paddr_to_map, true_len / PAGE_SIZE, is_dev) == (uintptr_t)NULL) {
ERROR("%s mapping page failed(Short of memory)\n", cur_task->name);
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 (xizi_share_page_manager.task_map_pages(cur_task, vaddr_to_map, (uintptr_t)new_paddr, true_len / PAGE_SIZE, false) == (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;
}
return -1;
}

7
Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_spawn.c
View File

@ -54,8 +54,13 @@ int sys_spawn(char* img_start, char* name, char** argv)
// alloc a new pcb
struct Thread* new_task_cb = xizi_task_manager.new_task_cb(pmemspace);
if (UNLIKELY(!new_task_cb)) {
ERROR("Unable to new task control block.\n");
ERROR("Unable to new task control block %x.\n");
// error task allocation may free memspace before hand
// @todo use task ref map to handle this scene
if (NULL != pmemspace->tag.meta) {
free_memspace(pmemspace);
}
return -1;
}
assert(!IS_DOUBLE_LIST_EMPTY(&pmemspace->thread_list_guard));

2
Ubiquitous/XiZi_AIoT/softkernel/syscall/syscall.c
View File

@ -69,7 +69,7 @@ int syscall(int sys_num, uintptr_t param1, uintptr_t param2, uintptr_t param3, u
ret = sys_state(param1, (sys_state_info*)param2);
break;
case SYSCALL_MMAP:
ret = sys_mmap((uintptr_t*)param1, (uintptr_t*)param2, (int)param3, (int)param4);
ret = sys_mmap_v2((uintptr_t*)param1, (uintptr_t*)param2, (int)param3, (sys_mmap_info*)param4);
break;
case SYSCALL_REGISTER_IRQ:
ret = sys_register_irq((int)param1, (int)param2);

8
Ubiquitous/XiZi_AIoT/softkernel/task/memspace.c
View File

@ -63,14 +63,18 @@ struct MemSpace* alloc_memspace(char* name)
}
assert(pmemspace->tag.meta != NULL);
rbtree_init(&pmemspace->kernspace_mem_usage.mem_block_map);
if (!CreateResourceTag(&pmemspace->kernspace_mem_usage.tag, &pmemspace->tag, "MemUsage", TRACER_SYSOBJECT, (void*)&pmemspace->kernspace_mem_usage) || //
!CreateResourceTag(&pmemspace->userspace_mem_usage.tag, &pmemspace->tag, "UserMemUsage", TRACER_SYSOBJECT, (void*)&pmemspace->userspace_mem_usage)) {
!CreateResourceTag(&pmemspace->userspace_mem_usage.tag, &pmemspace->tag, "UserMemUsage", TRACER_SYSOBJECT, (void*)&pmemspace->userspace_mem_usage) || //
!CreateResourceTag(&pmemspace->customized_mapping_mem_map.tag, &pmemspace->tag, "CustomizaedMemMapping", TRACER_SYSOBJECT, (void*)&pmemspace->customized_mapping_mem_map)) {
DEBUG("Register MemUsage %s failed\n", name);
slab_free(&xizi_task_manager.memspace_allocator, (void*)pmemspace);
DeleteResource(&pmemspace->tag, &xizi_task_manager.tag);
return NULL;
}
rbtree_init(&pmemspace->kernspace_mem_usage.mem_block_map);
rbtree_init(&pmemspace->userspace_mem_usage.mem_block_map);
rbtree_init(&pmemspace->customized_mapping_mem_map.mem_block_map);
return pmemspace;
}