From a12e50e5a7dae52ed8bd5a24cc6576371e20985b Mon Sep 17 00:00:00 2001 From: Kimplul Date: Mon, 27 Dec 2021 20:40:44 +0200 Subject: Started work on syscalls --- common/tcb.c | 16 ++++++++++++++++ common/uapi/conf.c | 15 +++++++++++++++ common/uapi/ipc.c | 28 ++++++++++++++++++++++++++++ common/uapi/mem.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ common/uapi/proc.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ common/vmem.c | 12 +++++++++--- 6 files changed, 160 insertions(+), 3 deletions(-) create mode 100644 common/uapi/conf.c create mode 100644 common/uapi/ipc.c create mode 100644 common/uapi/mem.c create mode 100644 common/uapi/proc.c (limited to 'common') diff --git a/common/tcb.c b/common/tcb.c index 5b00524..8a1e95e 100644 --- a/common/tcb.c +++ b/common/tcb.c @@ -3,6 +3,7 @@ #include static struct sp_root t_root = (struct sp_root){0}; +static struct tcb *__tcb_cache[MAX_CPUS] = {0}; #define tcb_container(x) \ container_of(x, struct tcb, sp_n) @@ -53,3 +54,18 @@ struct tcb *threads_find(id_t tid) return 0; } + +struct tcb *get_tcb(id_t pid) +{ + /* TODO: figure out how exactly thread IDs are related to process IDs, + * and figure out mapping between them. */ + return 0; +} + +struct tcb *cur_tcb() +{ + /* TODO: probably keep an array of processor ID's somewhere where each + * ID has a corresponding 'currently executing thread ID' field, and + * reutrn that. */ + return __tcb_cache[cpu_id()]; +} diff --git a/common/uapi/conf.c b/common/uapi/conf.c new file mode 100644 index 0000000..01c4ada --- /dev/null +++ b/common/uapi/conf.c @@ -0,0 +1,15 @@ +#include + +vm_t sys_conf(vm_t param, vm_t val, vm_t u0, vm_t u1) +{ + UNUSED(u0); UNUSED(u1); + /* no parameters supported atm */ + return 0; +} + +vm_t sys_poweroff(vm_t type, vm_t u0, vm_t u1, vm_t u2) +{ + UNUSED(u0); UNUSED(u1); UNUSED(u2); + /* powering off not supported yet, you're stuck here >:D */ + return 0; +} diff --git a/common/uapi/ipc.c b/common/uapi/ipc.c new file mode 100644 index 0000000..5abbaeb --- /dev/null +++ b/common/uapi/ipc.c @@ -0,0 +1,28 @@ +#include +#include + +vm_t sys_ipc_server(vm_t callback, vm_t u0, vm_t u1, vm_t u2) +{ + UNUSED(u0); UNUSED(u1); UNUSED(u2); + struct tcb *r = cur_tcb(); + if(r->callback) /* server can't be reinitialized */ + return 1; + + r->callback = callback; + return 0; +} + +vm_t sys_ipc_req(vm_t pid, vm_t d0, vm_t d1, vm_t d2) +{ + struct tcb *t = get_tcb(pid); + /* something like jump_to_callback(t, d0, d1, d2) */ + return 0; +} + +vm_t sys_ipc_resp(vm_t pid, vm_t ret, vm_t u0, vm_t u1) +{ + UNUSED(u0); UNUSED(u1); + struct tcb *r = get_tcb(pid); + /* something like return_from_callback(t, r) */ + return 0; /* oh yeah probably unreachable? */ +} diff --git a/common/uapi/mem.c b/common/uapi/mem.c new file mode 100644 index 0000000..34ddda2 --- /dev/null +++ b/common/uapi/mem.c @@ -0,0 +1,45 @@ +#include +#include +#include + +vm_t sys_req_mem(vm_t size, vm_t flags, vm_t u0, vm_t u1) +{ + UNUSED(u0); UNUSED(u1); + /* proc_tcb should give the tcb of the TID currently running */ + struct tcb *r = cur_tcb(); + return alloc_uvmem(r, size, flags); +} + +vm_t sys_req_fixmem(vm_t start, vm_t size, vm_t flags, vm_t u0) +{ + UNUSED(u0); + struct tcb *r = cur_tcb(); + return alloc_fixed_uvmem(r, start, size, flags); +} + +vm_t sys_free_mem(vm_t start, vm_t u0, vm_t u1, vm_t u2) +{ + UNUSED(u0); UNUSED(u1); UNUSED(u2); + struct tcb *r = cur_tcb(); + free_uvmem(r, start); + return 0; +} + +vm_t sys_req_pmem(vm_t paddr, vm_t size, vm_t flags, vm_t u0) +{ + UNUSED(u0); + /* this will require some pondering, but essentially this syscall should + * only be used for device access, so any addresses requested should be + * outside the RAM area, and I'll probably have to implement some method + * that keeps track of used regions outside of RAM. We'll see. + */ + return 0; +} + +vm_t sys_req_sharedmem(vm_t pid, vm_t start, vm_t size, vm_t flags) +{ + /* take memory in PID's vaddr and map it somewhere in our own memory + * region. + */ + return 0; +} diff --git a/common/uapi/proc.c b/common/uapi/proc.c new file mode 100644 index 0000000..dd05bad --- /dev/null +++ b/common/uapi/proc.c @@ -0,0 +1,47 @@ +#include + +/* Not entirely sure how I should handle forks/execs etc, mostly whether I + * should allow forks/execs to be called directly or only though the process + * manager. Probably though the process manager, although that will add in a + * slight bit of delay. + * + * I suppose I could add in a runtime parameter + * that would allow them to be called directly, and then the process manager + * would have to periodically ask the kernel about all threads it is aware of + * via sys_sync. Dunno. + */ +vm_t sys_fork(vm_t pid, vm_t u0, vm_t u1, vm_t u2) +{ + UNUSED(u0); UNUSED(u1); UNUSED(u2); + /* TODO: create new thread in the same process family */ + return 0; +} + +vm_t sys_exec(vm_t pid, vm_t bin, vm_t argc, vm_t argv) +{ + /* TODO: execute new process */ + return 0; +} + +vm_t sys_signal(vm_t pid, vm_t signal, vm_t u0, vm_t u1) +{ + UNUSED(u0); UNUSED(u1); + /* TODO: signals? */ + return 0; +} + +vm_t sys_switch(vm_t pid, vm_t u0, vm_t u1, vm_t u2) +{ + UNUSED(u0); UNUSED(u1); UNUSED(u2); + /* TODO: switch to process */ + return 0; +} + +vm_t sys_sync(vm_t buf, vm_t size, vm_t u0, vm_t u1) +{ + UNUSED(u0); UNUSED(u1); + /* check that only the process manager can use this syscall, otherwise + * just dump process info into the buffer (I guess, not sure if this + * will be quite required */ + return 0; +} diff --git a/common/vmem.c b/common/vmem.c index 229963c..ffe9b32 100644 --- a/common/vmem.c +++ b/common/vmem.c @@ -449,10 +449,16 @@ vm_t map_fill_region(struct vm_branch_t *b, vm_t start, size_t bytes, uint8_t fl return start; } -vm_t alloc_uvmem(struct tcb *t, size_t s, uint8_t flags) +vm_t alloc_uvmem(struct tcb *t, size_t size, uint8_t flags) { - vm_t v = alloc_region(&t->sp_r, s, &s); - return map_fill_region(t->b_r, v, s, flags); + vm_t v = alloc_region(&t->sp_r, size, &size); + return map_fill_region(t->b_r, v, size, flags); +} + +vm_t alloc_fixed_uvmem(struct tcb *t, vm_t start, size_t size, uint8_t flags) +{ + vm_t v = alloc_fixed_region(&t->sp_r, start, size, &size); + return map_fill_region(t->b_r, v, size, flags); } void free_uvmem(struct tcb *t, vm_t a) -- cgit v1.3