lby/mkrtos-real
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

尝试启动shell

Browse Source
This commit is contained in:
zhangzheng
2024-04-08 20:04:34 +08:00
parent 1a2c180fa2
commit c61745f096
21 changed files with 335 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mkrtos_user/lib/sys/inc/u_arch.h
View File

@@ -3,7 +3,8 @@
#include "u_arch_hard.h"
#define MK_PAGE_SIZE (1UL << CONFIG_PAGE_SHIFT)
#define PAGE_SIZE (1UL << CONFIG_PAGE_SHIFT)
#define MK_PAGE_SIZE (PAGE_SIZE)
#define WORD_BYTES (sizeof(void *))
#define WORD_BITS (WORD_BYTES * 8)

13
mkrtos_user/lib/sys/inc/u_vmam.h
View File

@@ -4,9 +4,14 @@
enum vpage_prot_attrs
{
VPAGE_PROT_RO = 1, //!< 只读
VPAGE_PROT_RW = VPAGE_PROT_RO | 0x2, //!< 读写
VPAGE_PROT_RWX = (VPAGE_PROT_RO | VPAGE_PROT_RW | 0x4), //!< 读写执行
VPAGE_PROT_RO = 1, //!< 只读
VPAGE_PROT_WO = 0x2,
VPAGE_PROT_RW = VPAGE_PROT_RO | VPAGE_PROT_WO, //!< 读写
VPAGE_PROT_X = 0x4,
VPAGE_PROT_RWX = (VPAGE_PROT_RO | VPAGE_PROT_RW | VPAGE_PROT_X), //!< 读写执行
VPAGE_PROT_UNCACHE = 0x10, //!< 不使用缓存
VPAGE_PROT_IN_KNL = 0x20, //!< 内核中使用
};
#define VMA_ADDR_RESV 0x1 //!< 保留内存
@@ -40,4 +45,6 @@ static inline vma_addr_t vma_addr_create(uint8_t prot, uint8_t flags, umword_t a
};
}
msg_tag_t u_vmam_alloc(obj_handler_t obj, vma_addr_t addr, size_t size, addr_t paddr, addr_t *vaddr);
msg_tag_t u_vmam_grant(obj_handler_t obj, obj_handler_t dst_task_obj,
addr_t src_addr, addr_t dst_addr, size_t size);
msg_tag_t u_vmam_free(obj_handler_t obj, addr_t addr, size_t size);

20
mkrtos_user/lib/sys/src/u_vmam.c
View File

@@ -7,6 +7,7 @@ enum
{
VMA_ALLOC,
VMA_FREE,
VMA_GRANT,
};
msg_tag_t u_vmam_alloc(obj_handler_t obj, vma_addr_t addr, size_t size, addr_t paddr, addr_t *vaddr)
@@ -32,6 +33,25 @@ msg_tag_t u_vmam_alloc(obj_handler_t obj, vma_addr_t addr, size_t size, addr_t p
return msg_tag_init(r0);
}
msg_tag_t u_vmam_grant(obj_handler_t obj, obj_handler_t dst_task_obj,
addr_t src_addr, addr_t dst_addr, size_t size)
{
register volatile umword_t r0 asm(ARCH_REG_0);
mk_syscall(syscall_prot_create4(VMA_GRANT, VMA_PROT, obj, FALSE).raw,
dst_task_obj,
src_addr,
dst_addr,
size,
0,
0);
asm __volatile__(""
:
:
: ARCH_REG_0);
return msg_tag_init(r0);
}
msg_tag_t u_vmam_free(obj_handler_t obj, addr_t addr, size_t size)
{

5
mkrtos_user/lib/sys_util/inc/u_elf64.h Normal file
View File

@@ -0,0 +1,5 @@
#pragma once
#include <u_types.h>
int elf_load(umword_t elf_data, size_t size, addr_t *entry_addr, obj_handler_t dst_task);

92
mkrtos_user/lib/sys_util/src/u_elf64.c Normal file
View File

@@ -0,0 +1,92 @@
#include <elf.h>
#include <u_types.h>
#include <stdio.h>
#include <u_vmam.h>
#include <u_prot.h>
#include <string.h>
#include <assert.h>
#include <stdio.h>
static int elf_check(Elf64_Ehdr *ehdr)
{
if (memcmp(ehdr->e_ident, ELFMAG, SELFMAG) != 0)
{
return -1;
}
if (ehdr->e_type != ET_EXEC)
{
return -1;
}
/*TODO:check arch.*/
return 0;
}
int elf_load(umword_t elf_data, size_t size, addr_t *entry_addr, obj_handler_t dst_task)
{
int ret;
Elf64_Ehdr *elf_header;
assert(entry_addr);
elf_header = (Elf64_Ehdr *)elf_data;
ret = elf_check(elf_header);
if (ret != 0)
{
return ret;
}
// int size = elf_header->e_phentsize;
Elf64_Phdr *elf_phdr = (Elf64_Phdr *)(elf_header->e_phoff + elf_data);
size_t mem_size = 0;
addr_t st_addr = 0;
addr_t end_addr = 0;
*entry_addr = elf_header->e_entry;
for (int i = 0; i < elf_header->e_phnum; i++, elf_phdr++)
{
if (elf_phdr->p_type == PT_LOAD)
{
printf("u[elf] paddr:0x%x vaddr:0x%x memsize:%d filesize:%d ofst:%d align:0x%x\n",
elf_phdr->p_vaddr, elf_phdr->p_paddr, elf_phdr->p_memsz, elf_phdr->p_filesz,
elf_phdr->p_offset, elf_phdr->p_align);
if (i == 0)
{
st_addr = elf_phdr->p_vaddr;
}
end_addr = ALIGN(elf_phdr->p_vaddr + elf_phdr->p_memsz, elf_phdr->p_align);
}
}
mem_size = end_addr - st_addr;
void *mem;
msg_tag_t tag;
tag = u_vmam_alloc(VMA_PROT, vma_addr_create(VPAGE_PROT_RWX, 0, 0), mem_size, 0, (addr_t *)(&mem));
if (msg_tag_get_val(tag) < 0)
{
return msg_tag_get_val(tag);
}
memset(mem, 0, mem_size);
mword_t offset = 0;
elf_phdr = (Elf64_Phdr *)(elf_header->e_phoff + elf_data);
for (int i = 0; i < elf_header->e_phnum; i++, elf_phdr++)
{
if (elf_phdr->p_type == PT_LOAD)
{
memcpy((char *)mem + (elf_phdr->p_vaddr - st_addr),
(void *)(elf_data + elf_phdr->p_offset),
elf_phdr->p_filesz);
offset += ALIGN(elf_phdr->p_memsz, elf_phdr->p_align);
}
}
tag = u_vmam_grant(VMA_PROT, dst_task, (addr_t)mem, st_addr, mem_size);
if (msg_tag_get_val(tag) < 0)
{
u_vmam_free(VMA_PROT, (addr_t)mem, mem_size);
return msg_tag_get_val(tag);
}
return ret;
}

115
mkrtos_user/lib/sys_util/src/u_elf_loader.c
View File

@@ -11,6 +11,7 @@
#include "u_types.h"
#include "u_prot.h"
#include "u_app.h"
#include "u_arch.h"
#include "u_factory.h"
#include "u_mm.h"
#include "u_task.h"
@@ -26,6 +27,9 @@
#include <stdio.h>
#include <errno.h>
#include <sys/types.h>
#include <u_elf64.h>
#include <u_vmam.h>
/**
* @brief 向栈中存放数据
*
@@ -49,11 +53,8 @@ static umword_t app_stack_push(umword_t *stack, umword_t val)
*/
static void *app_stack_push_umword(obj_handler_t task_obj, umword_t **stack, umword_t val)
{
ipc_msg_t *msg = thread_get_cur_ipc_msg();
(*stack)--;
msg->msg_buf[0] = val;
task_copy_data(task_obj, *stack, sizeof(umword_t));
*(*stack) = val;
return *stack;
}
@@ -66,17 +67,12 @@ static void *app_stack_push_umword(obj_handler_t task_obj, umword_t **stack, umw
*/
static void *app_stack_push_str(obj_handler_t task_obj, umword_t **stack, const char *str)
{
ipc_msg_t *msg = thread_get_cur_ipc_msg();
int len = strlen(str) + 1;
char *cp_data = (char *)msg->msg_buf;
len = MIN(len, ARRAY_SIZE(msg->msg_buf) * sizeof(umword_t));
*stack -= ALIGN(len, sizeof(void *)) / sizeof(void *);
memcpy(cp_data, str, len);
cp_data[len - 1] = 0;
task_copy_data(task_obj, *stack, len);
for (int i = 0; i < len; i++) {
((char*)(*stack))[i] = str[i];
}
return *stack;
}
@@ -91,20 +87,34 @@ static void *app_stack_push_str(obj_handler_t task_obj, umword_t **stack, const
*/
static void *app_stack_push_array(obj_handler_t task_obj, umword_t **stack, uint8_t *arr, size_t len)
{
ipc_msg_t *msg = thread_get_cur_ipc_msg();
char *cp_data = (char *)msg->msg_buf;
len = MIN(len, ARRAY_SIZE(msg->msg_buf) * sizeof(umword_t));
*stack -= ALIGN(len, sizeof(void *)) / sizeof(void *);
memcpy(cp_data, arr, len);
cp_data[len - 1] = 0;
task_copy_data(task_obj, *stack, len);
memcpy(*stack, arr, len);
return *stack;
}
static int thread_set_msg_buf(obj_handler_t hd_task, obj_handler_t hd_thread)
{
addr_t mem;
msg_tag_t tag;
tag = u_vmam_alloc(VMA_PROT, vma_addr_create(VPAGE_PROT_RW, 0, 0), PAGE_SIZE, 0, (addr_t *)(&mem));
if (msg_tag_get_val(tag) < 0)
{
return msg_tag_get_val(tag);
}
memset((void *)mem, 0, PAGE_SIZE);
tag = u_vmam_grant(VMA_PROT, hd_task, (addr_t)mem, CONFIG_MSG_BUF_VADDR, PAGE_SIZE);
if (msg_tag_get_val(tag) < 0)
{
return msg_tag_get_val(tag);
}
//设置msgbuff,TODO:内核需要获取到对应的物理地址
tag = thread_msg_buf_set(hd_thread, (void *)(CONFIG_MSG_BUF_VADDR));
if (msg_tag_get_val(tag) < 0)
{
return msg_tag_get_val(tag);
}
return 0;
}
/**
* @brief 加载并执行一个app
*
@@ -115,6 +125,7 @@ int app_load(const char *name, uenv_t *cur_env, pid_t *pid, char *argv[], int ar
{
msg_tag_t tag;
sys_info_t sys_info;
int ret;
tag = sys_read_info(SYS_PROT, &sys_info);
if (msg_tag_get_val(tag) < 0)
@@ -123,24 +134,18 @@ int app_load(const char *name, uenv_t *cur_env, pid_t *pid, char *argv[], int ar
}
int type;
umword_t addr;
int ret = cpio_find_file((umword_t)sys_info.bootfs_start_addr, (umword_t)(-1), name, NULL, &type, &addr);
umword_t size;
ret = cpio_find_file((umword_t)sys_info.bootfs_start_addr, (umword_t)(-1), name, &size, &type, &addr);
if (ret < 0 || (ret >= 0 && type == 1))
{
return -ENOENT;
}
app_info_t *app = app_info_get((void *)addr);
if (app == NULL)
{
printf("app format is error.\n");
return -1;
}
printf("%s addr is [0x%x]\n", name, app);
umword_t ram_base;
obj_handler_t hd_task = handler_alloc();
obj_handler_t hd_thread = handler_alloc();
addr_t entry_addr;
if (hd_task == HANDLER_INVALID)
{
@@ -156,16 +161,22 @@ int app_load(const char *name, uenv_t *cur_env, pid_t *pid, char *argv[], int ar
{
goto end_del_obj;
}
ret = elf_load(addr, size, &entry_addr, hd_task);
if (ret < 0) {
goto end_del_obj;
}
tag = factory_create_thread(FACTORY_PROT, vpage_create_raw3(KOBJ_ALL_RIGHTS, 0, hd_thread));
if (msg_tag_get_prot(tag) < 0)
{
goto end_del_obj;
}
tag = task_alloc_ram_base(hd_task, app->i.ram_size, &ram_base);
if (msg_tag_get_prot(tag) < 0)
{
goto end_del_obj;
}
// tag = task_alloc_ram_base(hd_task, app->i.ram_size, &ram_base);
// if (msg_tag_get_prot(tag) < 0)
// {
// goto end_del_obj;
// }
tag = task_map(hd_task, hd_task, TASK_PROT, 0);
if (msg_tag_get_prot(tag) < 0)
{
@@ -201,6 +212,11 @@ int app_load(const char *name, uenv_t *cur_env, pid_t *pid, char *argv[], int ar
{
goto end_del_obj;
}
tag = task_map(hd_task, VMA_PROT, VMA_PROT, KOBJ_DELETE_RIGHT);
if (msg_tag_get_prot(tag) < 0)
{
goto end_del_obj;
}
tag = task_map(hd_task, cur_env->ns_hd, cur_env->ns_hd, KOBJ_DELETE_RIGHT);
if (msg_tag_get_prot(tag) < 0)
{
@@ -211,10 +227,10 @@ int app_load(const char *name, uenv_t *cur_env, pid_t *pid, char *argv[], int ar
{
goto end_del_obj;
}
tag = thread_msg_buf_set(hd_thread, (void *)(ram_base + app->i.ram_size));
if (msg_tag_get_prot(tag) < 0)
{
ret = thread_set_msg_buf(hd_task, hd_thread);
if (ret < 0) {
goto end_del_obj;
}
tag = task_set_pid(hd_task, hd_task); //!< 设置进程的pid就是进程hd号码
if (msg_tag_get_prot(tag) < 0)
@@ -225,9 +241,17 @@ int app_load(const char *name, uenv_t *cur_env, pid_t *pid, char *argv[], int ar
{
*pid = hd_task;
}
void *sp_addr = (char *)ram_base + app->i.stack_offset - app->i.data_offset;
void *sp_addr_top = (char *)sp_addr + app->i.stack_size;
printf("stack:0x%x size:%d.\n", sp_addr, app->i.stack_size);
void *sp_addr;
void *sp_addr_top;
tag = u_vmam_alloc(VMA_PROT, vma_addr_create(VPAGE_PROT_RWX, 0, 0), CONFIG_PAGE_SHIFT * 8, 0, (addr_t *)(&sp_addr));
if (msg_tag_get_val(tag) < 0)
{
goto end_del_obj;
}
sp_addr_top = (char *)sp_addr_top + CONFIG_PAGE_SHIFT * 8;
printf("stack:0x%x size:%d.\n", sp_addr, CONFIG_PAGE_SHIFT * 8);
umword_t *usp_top = (umword_t *)((umword_t)((umword_t)sp_addr_top - 8) & ~0x7UL);
uenv_t uenv = {
.log_hd = cur_env->ns_hd,
@@ -275,8 +299,7 @@ int app_load(const char *name, uenv_t *cur_env, pid_t *pid, char *argv[], int ar
app_stack_push_umword(hd_task, &usp_top, arg_cn);
printf("pid:%d stack:%p\n", hd_task, usp_top);
tag = thread_exec_regs(hd_thread, (umword_t)addr, (umword_t)usp_top,
ram_base, 0);
tag = thread_exec_regs(hd_thread, (umword_t)addr, (umword_t)usp_top, 0, 0);
assert(msg_tag_get_prot(tag) >= 0);
/*启动线程运行*/
tag = thread_run(hd_thread, 2);

2
mkrtos_user/server/init/src/init.cfg
View File

@@ -4,5 +4,5 @@
# cpiofs
# dm9000_drv
# net
sh
sh.elf
# lcd_drv