From 3212707a9ab549119ad0ad6441a07fe774c99f3b Mon Sep 17 00:00:00 2001 From: Kimplul Date: Thu, 27 Jul 2023 20:29:28 +0300 Subject: use nifty variable argument count trick + Found it in newlib. This allows the compiler to more effectively optimize away unnecessary register operations. Applied to both kernel and init.c for a slight speed increase. I really should move init.c to some other repository though, the binary files are starting to get annoying --- common/uapi/cap.c | 16 ++++++++-------- common/uapi/conf.c | 18 +++++++++--------- common/uapi/dispatch.c | 6 +++--- common/uapi/ipc.c | 21 ++++++++++++--------- common/uapi/mem.c | 28 ++++++++++++++-------------- common/uapi/proc.c | 36 ++++++++++++++++++------------------ common/uapi/timers.c | 20 ++++++++------------ 7 files changed, 72 insertions(+), 73 deletions(-) (limited to 'common/uapi') diff --git a/common/uapi/cap.c b/common/uapi/cap.c index 825022a..157ef47 100644 --- a/common/uapi/cap.c +++ b/common/uapi/cap.c @@ -42,14 +42,14 @@ SYSCALL_DEFINE3(set_cap)(struct tcb *t, sys_arg_t tid, sys_arg_t off, sys_arg_t caps) { if (!is_set(t->caps, CAP_CAPS)) - return_args(t, SYS_RET1(ERR_PERM)); + return_args1(t, ERR_PERM); capflags_t *c; if (!(c = __get_tcb_caps(tid, off))) - return_args(t, SYS_RET1(ERR_INVAL)); + return_args1(t, ERR_INVAL); set_caps(*c, off, caps); - return_args(t, SYS_RET1(OK)); + return_args1(t, OK); } /** @@ -64,9 +64,9 @@ SYSCALL_DEFINE2(get_cap)(struct tcb *t, sys_arg_t tid, sys_arg_t off) { capflags_t *c; if (!(c = __get_tcb_caps(tid, off))) - return_args(t, SYS_RET1(ERR_INVAL)); + return_args1(t, ERR_INVAL); - return_args(t, SYS_RET2(OK, get_caps(*c, off))); + return_args2(t, OK, get_caps(*c, off)); } /** @@ -83,12 +83,12 @@ SYSCALL_DEFINE3(clear_cap)(struct tcb *t, sys_arg_t tid, sys_arg_t off, sys_arg_t caps) { if (!is_set(t->caps, CAP_CAPS)) - return_args(t, SYS_RET1(ERR_PERM)); + return_args1(t, ERR_PERM); capflags_t *c; if (!(c = __get_tcb_caps(tid, off))) - return_args(t, SYS_RET1(ERR_INVAL)); + return_args1(t, ERR_INVAL); clear_caps(*c, off, caps); - return_args(t, SYS_RET1(OK)); + return_args1(t, OK); } diff --git a/common/uapi/conf.c b/common/uapi/conf.c index ea06e06..13be3ee 100644 --- a/common/uapi/conf.c +++ b/common/uapi/conf.c @@ -41,7 +41,7 @@ enum conf_param { SYSCALL_DEFINE1(conf_get)(struct tcb *t, sys_arg_t param) { if (!has_cap(t->caps, CAP_CONF)) - return_args(t, SYS_RET1(ERR_PERM)); + return_args1(t, ERR_PERM); long val = 0; switch (param) { @@ -58,10 +58,10 @@ SYSCALL_DEFINE1(conf_get)(struct tcb *t, sys_arg_t param) break; default: - return_args(t, SYS_RET1(ERR_NF)); + return_args1(t, ERR_NF); } - return_args(t, SYS_RET2(OK, val)); + return_args2(t, OK, val); } /** @@ -77,7 +77,7 @@ SYSCALL_DEFINE1(conf_get)(struct tcb *t, sys_arg_t param) SYSCALL_DEFINE2(conf_set)(struct tcb *t, sys_arg_t param, sys_arg_t val) { if (!has_cap(t->caps, CAP_CONF)) - return_args(t, SYS_RET1(ERR_PERM)); + return_args1(t, ERR_PERM); size_t size = 0; switch (param) { @@ -96,13 +96,13 @@ SYSCALL_DEFINE2(conf_set)(struct tcb *t, sys_arg_t param, sys_arg_t val) case CONF_RPC_STACK: size = align_up(val, BASE_PAGE_SIZE); if (size > __call_stack_size) - return_args(t, SYS_RET1(ERR_MISC)); + return_args1(t, ERR_MISC); __rpc_stack_size = size; break; } - return_args(t, SYS_RET1(OK)); + return_args1(t, OK); } /** @@ -116,14 +116,14 @@ SYSCALL_DEFINE2(conf_set)(struct tcb *t, sys_arg_t param, sys_arg_t val) SYSCALL_DEFINE1(poweroff)(struct tcb *t, sys_arg_t type) { if (!(has_cap(t->caps, CAP_POWER))) - return_args(t, SYS_RET1(ERR_PERM)); + return_args1(t, ERR_PERM); switch (type) { case SHUTDOWN: case COLD_REBOOT: case WARM_REBOOT: - return_args(t, SYS_RET2(OK, poweroff(type))); + return_args2(t, OK, poweroff(type)); }; - return_args(t, SYS_RET1(ERR_INVAL)); + return_args1(t, ERR_INVAL); } diff --git a/common/uapi/dispatch.c b/common/uapi/dispatch.c index d071db3..a9caa1e 100644 --- a/common/uapi/dispatch.c +++ b/common/uapi/dispatch.c @@ -23,7 +23,7 @@ SYSCALL_DEFINE0(noop)(struct tcb *t) { info("sys_noop\n"); - set_args(t, SYS_RET1(OK)); + set_args1(t, OK); } /** @@ -37,7 +37,7 @@ SYSCALL_DEFINE0(noop)(struct tcb *t) SYSCALL_DEFINE1(putch)(struct tcb *t, sys_arg_t a) { dbg("%c", (char)a); - set_args(t, SYS_RET1(OK)); + set_args1(t, OK); } void handle_syscall(sys_arg_t syscall, sys_arg_t a, sys_arg_t b, @@ -79,7 +79,7 @@ void handle_syscall(sys_arg_t syscall, sys_arg_t a, sys_arg_t b, default: error("Syscall %zu outside allowed range [0 - %i]\n", syscall, SYS_NUM - 1); - set_args(t, SYS_RET1(ERR_INVAL)); + set_args1(t, ERR_INVAL); }; if (check_canary(t)) { diff --git a/common/uapi/ipc.c b/common/uapi/ipc.c index c2548e9..f9b2817 100644 --- a/common/uapi/ipc.c +++ b/common/uapi/ipc.c @@ -134,7 +134,7 @@ static struct stack_diff enter_rpc(struct tcb *t, struct sys_ret a, /* try to get rid of args as fast as possible to free up registers for * later use */ - set_args(t, a); + set_args(t, 6, a); ctx->exec = t->exec; ctx->pid = t->pid; @@ -185,7 +185,7 @@ static void leave_rpc(struct tcb *t, struct sys_ret a) t->regs = ctx->regs; /* again, get rid of args as fast as possible */ - set_args(t, a); + set_args(t, 6, a); set_return(t, ctx->exec); /* if we're returning from a failed rpc, this should essentially be a @@ -230,7 +230,7 @@ static bool enough_rpc_stack(struct tcb *t) SYSCALL_DEFINE1(ipc_server)(struct tcb *t, sys_arg_t callback) { get_cproc(t)->callback = callback; - return_args(t, SYS_RET1(OK)); + return_args1(t, OK); } /** @@ -261,7 +261,7 @@ static void do_ipc(struct tcb *t, enum ipc_kind kind) { if (unlikely(!enough_rpc_stack(t))) - return_args(t, SYS_RET1(ERR_OOMEM)); + return_args1(t, ERR_OOMEM); struct stack_diff sd = enter_rpc(t, SYS_RET6(OK, t->eid, d0, d1, d2, d3), kind); @@ -283,6 +283,9 @@ static void do_ipc(struct tcb *t, t->eid = t->pid; finalize_rpc(t, r, sd); + /* I tested out passing the return values as arguments to + * ret_userspace_fast, but apparently that causes enough stack shuffling + * to be slower overall. */ ret_userspace_fast(); } /** @@ -354,7 +357,7 @@ SYSCALL_DEFINE4(ipc_resp)(struct tcb *t, sys_arg_t d0, sys_arg_t d1, /* if we're not in an rpc, the user messed something up. */ /** @todo choose or come up with more fitting error value. */ if (unlikely(!is_rpc(t))) - return_args(t, SYS_RET1(ERR_MISC)); + return_args1(t, ERR_MISC); /* we need the current proc before leaving the rpc */ struct tcb *r = get_cproc(t); @@ -373,20 +376,20 @@ SYSCALL_DEFINE4(ipc_resp)(struct tcb *t, sys_arg_t d0, sys_arg_t d1, */ SYSCALL_DEFINE1(ipc_notify)(struct tcb *t, sys_arg_t tid){ if (!has_cap(t->caps, CAP_CALL)) - return_args(t, SYS_RET1(ERR_PERM)); + return_args1(t, ERR_PERM); struct tcb *r = get_tcb(tid); if (r->notify_state == NOTIFY_QUEUED) - return_args(t, SYS_RET1(OK)); + return_args1(t, OK); if (r->notify_state == NOTIFY_RUNNING) { t->notify_state = NOTIFY_QUEUED; - return_args(t, SYS_RET1(OK)); + return_args1(t, OK); } r->notify_state = NOTIFY_QUEUED; if (running(r)) send_ipi(r); - return_args(t, SYS_RET1(OK)); + return_args1(t, OK); } diff --git a/common/uapi/mem.c b/common/uapi/mem.c index 01bf470..d54390a 100644 --- a/common/uapi/mem.c +++ b/common/uapi/mem.c @@ -27,9 +27,9 @@ SYSCALL_DEFINE2(req_mem)(struct tcb *t, sys_arg_t size, sys_arg_t flags) vm_t start = 0; /** @todo expose flags to users */ if (!(start = alloc_uvmem(r, size, flags))) - return_args(t, SYS_RET1(ERR_OOMEM)); + return_args1(t, ERR_OOMEM); - return_args(t, SYS_RET2(OK, start)); + return_args2(t, OK, start); } /** @@ -46,9 +46,9 @@ SYSCALL_DEFINE2(req_page)(struct tcb *t, sys_arg_t size, sys_arg_t flags) struct tcb *r = get_cproc(t); vm_t start = 0; pm_t paddr = 0; size_t asize = size; if (!(start = alloc_uvpage(r, asize, flags, &asize, &paddr))) - return_args(t, SYS_RET1(ERR_OOMEM)); + return_args1(t, ERR_OOMEM); - return_args(t, SYS_RET4(OK, start, asize, paddr)); + return_args4(t, OK, start, asize, paddr); } /** @@ -67,9 +67,9 @@ SYSCALL_DEFINE3(req_fixmem)(struct tcb *t, sys_arg_t fixed, sys_arg_t size, struct tcb *r = get_cproc(t); vm_t start = 0; if (!(start = alloc_fixed_uvmem(r, fixed, size, flags))) - return_args(t, SYS_RET1(ERR_OOMEM)); + return_args1(t, ERR_OOMEM); - return_args(t, SYS_RET2(OK, start)); + return_args2(t, OK, start); } /** @@ -88,12 +88,12 @@ SYSCALL_DEFINE1(free_mem)(struct tcb *t, sys_arg_t start) /* try freeing normal user memory first, if that fails, try device * memory, otherwise just assume the address is borked. */ if (!(status = free_uvmem(r, vm_start))) - return_args(t, SYS_RET1(OK)); + return_args1(t, OK); if (!(status = free_devmem(r, vm_start))) - return_args(t, SYS_RET1(OK)); + return_args1(t, OK); - return_args(t, SYS_RET1(status)); + return_args1(t, status); } /** @@ -117,9 +117,9 @@ SYSCALL_DEFINE3(req_pmem)(struct tcb *t, sys_arg_t paddr, sys_arg_t size, struct tcb *r = get_cproc(t); vm_t start = 0; if (!(start = alloc_devmem(r, paddr, size, flags))) - return_args(t, SYS_RET1(ERR_OOMEM)); + return_args1(t, ERR_OOMEM); - return_args(t, SYS_RET2(OK, start)); + return_args2(t, OK, start); } /** @@ -143,16 +143,16 @@ SYSCALL_DEFINE4(req_sharedmem)(struct tcb *t, sys_arg_t tid, /** @todo check capability for shared memory */ struct tcb *u = get_tcb(tid); if (!u) - return_args(t, SYS_RET1(ERR_INVAL)); + return_args1(t, ERR_INVAL); struct tcb *s = get_cproc(t); struct tcb *c = get_rproc(u); vm_t sstart, cstart; if (alloc_shared_uvmem(s, c, size, sflags, cflags, &sstart, &cstart)) - return_args(t, SYS_RET1(ERR_OOMEM)); + return_args1(t, ERR_OOMEM); - return_args(t, SYS_RET3(OK, sstart, cstart)); + return_args3(t, OK, sstart, cstart); } /** \todo add some way to specify who gets to access the shared memory? */ diff --git a/common/uapi/proc.c b/common/uapi/proc.c index 81e3305..0ec19fb 100644 --- a/common/uapi/proc.c +++ b/common/uapi/proc.c @@ -30,14 +30,14 @@ SYSCALL_DEFINE5(create)(struct tcb *t, sys_arg_t func, { struct tcb *c = create_thread(t); if (!c) - return_args(t, SYS_RET1(ERR_OOMEM)); + return_args1(t, ERR_OOMEM); alloc_stack(c); - set_args(c, SYS_RET5(c->tid, d0, d1, d2, d3)); + set_args5(c, c->tid, d0, d1, d2, d3); set_return(c, func); - return_args(t, SYS_RET2(OK, c->tid)); + return_args2(t, OK, c->tid); } /** @@ -60,17 +60,17 @@ SYSCALL_DEFINE0(fork)(struct tcb *t) { struct tcb *c = get_cproc(t); if (!(has_cap(c->caps, CAP_PROC))) - return_args(t, SYS_RET1(ERR_PERM)); + return_args1(t, ERR_PERM); struct tcb *n = create_proc(get_eproc(t)); if (!n) - return_args(t, SYS_RET1(ERR_OOMEM)); + return_args1(t, ERR_OOMEM); /* prepare args for when we eventually swap to the new proc, giving * parent ID as third return value */ - set_args(n, SYS_RET3(OK, 0, n->pid)); + set_args3(n, OK, 0, n->pid); - return_args(t, SYS_RET2(OK, n->pid)); + return_args2(t, OK, n->pid); } /** @@ -88,7 +88,7 @@ SYSCALL_DEFINE2(exec)(struct tcb *t, sys_arg_t bin, sys_arg_t interp) /* mark binary to be kept */ struct mem_region *b = find_used_region(&t->sp_r, bin); if (!b) - return_args(t, SYS_RET1(ERR_INVAL)); + return_args1(t, ERR_INVAL); set_bit(b->flags, MR_KEEP); @@ -97,7 +97,7 @@ SYSCALL_DEFINE2(exec)(struct tcb *t, sys_arg_t bin, sys_arg_t interp) /* mark interpreter to be kept */ i = find_used_region(&t->sp_r, interp); if (!i) - return_args(t, SYS_RET1(ERR_INVAL)); + return_args1(t, ERR_INVAL); set_bit(i->flags, MR_KEEP); } @@ -110,7 +110,7 @@ SYSCALL_DEFINE2(exec)(struct tcb *t, sys_arg_t bin, sys_arg_t interp) if (interp) clear_bit(b->flags, MR_KEEP); - return_args(t, SYS_RET1(prepare_proc(t, bin, interp))); + return_args1(t, prepare_proc(t, bin, interp)); } /** @@ -126,13 +126,13 @@ SYSCALL_DEFINE2(spawn)(struct tcb *t, sys_arg_t bin, sys_arg_t interp) { struct tcb *c = get_proc(t); if (!(has_cap(c->caps, CAP_PROC))) - return_args(t, SYS_RET1(ERR_PERM)); + return_args1(t, ERR_PERM); struct tcb *n = create_proc(NULL); if (!n) - return_args(t, SYS_RET1(ERR_OOMEM)); + return_args1(t, ERR_OOMEM); - return_args(t, SYS_RET2(prepare_proc(n, bin, interp), n->pid)); + return_args2(t, prepare_proc(n, bin, interp), n->pid); } /** @@ -148,11 +148,11 @@ SYSCALL_DEFINE1(kill)(struct tcb *t, sys_arg_t tid) { struct tcb *c = get_cproc(t); if (!(has_cap(c->caps, CAP_PROC))) - return_args(t, SYS_RET1(ERR_PERM)); + return_args1(t, ERR_PERM); /** @todo implement */ - return_args(t, SYS_RET1(OK)); + return_args1(t, OK); } /** @@ -170,17 +170,17 @@ SYSCALL_DEFINE1(kill)(struct tcb *t, sys_arg_t tid) SYSCALL_DEFINE1(swap)(struct tcb *t, sys_arg_t tid){ struct tcb *c = get_cproc(t); if (!(has_cap(c->caps, CAP_PROC))) - return_args(t, SYS_RET1(ERR_PERM)); + return_args1(t, ERR_PERM); struct tcb *s = get_tcb(tid); if (!s) - return_args(t, SYS_RET1(ERR_INVAL)); + return_args1(t, ERR_INVAL); /* switch over to new thread */ use_tcb(s); /* set return value for current thread */ - set_args(t, SYS_RET1(OK)); + set_args1(t, OK); /* get register state for new thread */ return_args(s, get_args(s)); diff --git a/common/uapi/timers.c b/common/uapi/timers.c index 0d0ac50..b119fcc 100644 --- a/common/uapi/timers.c +++ b/common/uapi/timers.c @@ -43,9 +43,9 @@ SYSCALL_DEFINE0(timebase)(struct tcb *t) { ticks_t tm = secs_to_ticks(1); #if defined(_LP64) - return_args(t, SYS_RET2(OK, tm)); + return_args2(t, OK, tm); #else - return_args(t, SYS_RET3(OK, tm >> 32, tm)); + return_args3(t, OK, tm >> 32, tm); #endif } @@ -64,9 +64,9 @@ SYSCALL_DEFINE0(ticks)(struct tcb *t) { ticks_t tm = current_ticks(); #if defined(_LP64) - return_args(t, SYS_RET2(OK, tm)); + return_args2(t, OK, tm); #else - return_args(t, SYS_RET3(OK, tm >> 32, tm)); + return_args3(t, OK, tm >> 32, tm); #endif } @@ -84,9 +84,7 @@ SYSCALL_DEFINE0(ticks)(struct tcb *t) */ SYSCALL_DEFINE2(req_rel_timer)(struct tcb *t, sys_arg_t ticks, sys_arg_t mult) { - return_args(t, - SYS_RET2(OK, - new_rel_timer(t->tid, scaled_ticks(ticks, mult)))); + return_args2(t, OK, new_rel_timer(t->tid, scaled_ticks(ticks, mult))); } /** @@ -100,9 +98,7 @@ SYSCALL_DEFINE2(req_rel_timer)(struct tcb *t, sys_arg_t ticks, sys_arg_t mult) */ SYSCALL_DEFINE2(req_abs_timer)(struct tcb *t, sys_arg_t ticks, sys_arg_t mult) { - return_args(t, - SYS_RET2(OK, - new_abs_timer(t->tid, scaled_ticks(ticks, mult)))); + return_args2(t, OK, new_abs_timer(t->tid, scaled_ticks(ticks, mult))); } /** @@ -117,8 +113,8 @@ SYSCALL_DEFINE1(free_timer)(struct tcb *t, sys_arg_t cid) { struct timer *timer = find_timer(cid); if (!timer) - return_args(t, SYS_RET1(ERR_NF)); + return_args1(t, ERR_NF); remove_timer(timer); - return_args(t, SYS_RET1(OK)); + return_args1(t, OK); } -- cgit v1.3