Index: kernel/generic/src/proc/task.c =================================================================== --- kernel/generic/src/proc/task.c (revision 5b86d10e0aaef92218b09a916639e9844b6f4f79) +++ kernel/generic/src/proc/task.c (revision ba661bce010ad734a46440fd01290bea8981f2e4) @@ -129,5 +129,5 @@ #ifdef CONFIG_DEBUG - printf("Killing task %llu\n", id); + printf("Killing task %" PRIu64 "\n", id); #endif task_kill(id); @@ -234,32 +234,39 @@ } -/** Create new task with 1 thread and run it - * - * @param program_addr Address of program executable image. - * @param name Program name. - * - * @return Task of the running program or NULL on error. - */ -task_t *task_run_program(void *program_addr, char *name) -{ - as_t *as; - as_area_t *a; - unsigned int rc; - thread_t *t; - task_t *task; - uspace_arg_t *kernel_uarg; - - as = as_create(0); - ASSERT(as); - - rc = elf_load((elf_header_t *) program_addr, as); - if (rc != EE_OK) { - as_destroy(as); - return NULL; - } - - kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0); +/** Syscall for reading task ID from userspace. + * + * @param uspace_task_id Userspace address of 8-byte buffer where to store + * current task ID. + * + * @return 0 on success or an error code from @ref errno.h. + */ +unative_t sys_task_get_id(task_id_t *uspace_task_id) +{ + /* + * No need to acquire lock on TASK because taskid + * remains constant for the lifespan of the task. + */ + return (unative_t) copy_to_uspace(uspace_task_id, &TASK->taskid, + sizeof(TASK->taskid)); +} + +unative_t sys_task_spawn(void *image, size_t size) +{ + void *kimage = malloc(size, 0); + if (kimage == NULL) + return ENOMEM; + + int rc = copy_from_uspace(kimage, image, size); + if (rc != EOK) + return rc; + + uspace_arg_t *kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0); + if (kernel_uarg == NULL) { + free(kimage); + return ENOMEM; + } + kernel_uarg->uspace_entry = - (void *) ((elf_header_t *) program_addr)->e_entry; + (void *) ((elf_header_t *) kimage)->e_entry; kernel_uarg->uspace_stack = (void *) USTACK_ADDRESS; kernel_uarg->uspace_thread_function = NULL; @@ -267,41 +274,54 @@ kernel_uarg->uspace_uarg = NULL; - task = task_create(as, name); - ASSERT(task); - - /* - * Create the data as_area. - */ - a = as_area_create(as, AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE, - LOADED_PROG_STACK_PAGES_NO * PAGE_SIZE, USTACK_ADDRESS, - AS_AREA_ATTR_NONE, &anon_backend, NULL); - - /* - * Create the main thread. - */ - t = thread_create(uinit, kernel_uarg, task, THREAD_FLAG_USPACE, - "uinit", false); - ASSERT(t); - - thread_ready(t); - - return task; -} - -/** Syscall for reading task ID from userspace. - * - * @param uspace_task_id Userspace address of 8-byte buffer where to store - * current task ID. - * - * @return 0 on success or an error code from @ref errno.h. - */ -unative_t sys_task_get_id(task_id_t *uspace_task_id) -{ - /* - * No need to acquire lock on TASK because taskid - * remains constant for the lifespan of the task. - */ - return (unative_t) copy_to_uspace(uspace_task_id, &TASK->taskid, - sizeof(TASK->taskid)); + as_t *as = as_create(0); + if (as == NULL) { + free(kernel_uarg); + free(kimage); + return ENOMEM; + } + + unsigned int erc = elf_load((elf_header_t *) kimage, as); + if (erc != EE_OK) { + as_destroy(as); + free(kernel_uarg); + free(kimage); + return ENOENT; + } + + as_area_t *area = as_area_create(as, + AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE, + LOADED_PROG_STACK_PAGES_NO * PAGE_SIZE, USTACK_ADDRESS, + AS_AREA_ATTR_NONE, &anon_backend, NULL); + if (area == NULL) { + as_destroy(as); + free(kernel_uarg); + free(kimage); + return ENOMEM; + } + + task_t *task = task_create(as, "app"); + if (task == NULL) { + as_destroy(as); + free(kernel_uarg); + free(kimage); + return ENOENT; + } + + // FIXME: control the capabilities + cap_set(task, cap_get(TASK)); + + thread_t *thread = thread_create(uinit, kernel_uarg, task, + THREAD_FLAG_USPACE, "user", false); + if (thread == NULL) { + task_destroy(task); + as_destroy(as); + free(kernel_uarg); + free(kimage); + return ENOENT; + } + + thread_ready(thread); + + return EOK; } @@ -421,16 +441,20 @@ char suffix; order(task_get_accounting(t), &cycles, &suffix); - - if (sizeof(void *) == 4) - printf("%-6llu %-10s %-3ld %#10zx %#10zx %9llu%c %7zd %6zd", - t->taskid, t->name, t->context, t, t->as, cycles, suffix, - t->refcount, atomic_get(&t->active_calls)); - else - printf("%-6llu %-10s %-3ld %#18zx %#18zx %9llu%c %7zd %6zd", - t->taskid, t->name, t->context, t, t->as, cycles, suffix, - t->refcount, atomic_get(&t->active_calls)); + +#ifdef __32_BITS__ + printf("%-6" PRIu64 " %-10s %-3" PRIu32 " %10p %10p %9" PRIu64 "%c %7ld %6ld", + t->taskid, t->name, t->context, t, t->as, cycles, suffix, + atomic_get(&t->refcount), atomic_get(&t->active_calls)); +#endif + +#ifdef __64_BITS__ + printf("%-6" PRIu64 " %-10s %-3" PRIu32 " %18p %18p %9" PRIu64 "%c %7ld %6ld", + t->taskid, t->name, t->context, t, t->as, cycles, suffix, + atomic_get(&t->refcount), atomic_get(&t->active_calls)); +#endif + for (j = 0; j < IPC_MAX_PHONES; j++) { if (t->phones[j].callee) - printf(" %zd:%#zx", j, t->phones[j].callee); + printf(" %d:%p", j, t->phones[j].callee); } printf("\n"); @@ -448,16 +472,18 @@ ipl = interrupts_disable(); spinlock_lock(&tasks_lock); - - if (sizeof(void *) == 4) { - printf("taskid name ctx address as " - "cycles threads calls callee\n"); - printf("------ ---------- --- ---------- ---------- " - "---------- ------- ------ ------>\n"); - } else { - printf("taskid name ctx address as " - "cycles threads calls callee\n"); - printf("------ ---------- --- ------------------ ------------------ " - "---------- ------- ------ ------>\n"); - } + +#ifdef __32_BITS__ + printf("taskid name ctx address as " + "cycles threads calls callee\n"); + printf("------ ---------- --- ---------- ---------- " + "---------- ------- ------ ------>\n"); +#endif + +#ifdef __64_BITS__ + printf("taskid name ctx address as " + "cycles threads calls callee\n"); + printf("------ ---------- --- ------------------ ------------------ " + "---------- ------- ------ ------>\n"); +#endif avltree_walk(&tasks_tree, task_print_walker, NULL); Index: kernel/generic/src/proc/thread.c =================================================================== --- kernel/generic/src/proc/thread.c (revision 5b86d10e0aaef92218b09a916639e9844b6f4f79) +++ kernel/generic/src/proc/thread.c (revision ba661bce010ad734a46440fd01290bea8981f2e4) @@ -68,5 +68,9 @@ #include #include -#include + + +#ifndef LOADED_PROG_STACK_PAGES_NO +#define LOADED_PROG_STACK_PAGES_NO 1 +#endif @@ -444,7 +448,6 @@ if (THREAD->flags & THREAD_FLAG_USPACE) { ipc_cleanup(); - futex_cleanup(); - klog_printf("Cleanup of task %llu completed.", - TASK->taskid); + futex_cleanup(); + LOG("Cleanup of task %" PRIu64" completed.", TASK->taskid); } } @@ -582,31 +585,35 @@ static bool thread_walker(avltree_node_t *node, void *arg) { - thread_t *t; - - t = avltree_get_instance(node, thread_t, threads_tree_node); - + thread_t *t = avltree_get_instance(node, thread_t, threads_tree_node); + uint64_t cycles; char suffix; order(t->cycles, &cycles, &suffix); - - if (sizeof(void *) == 4) - printf("%-6llu %-10s %#10zx %-8s %#10zx %-3ld %#10zx %#10zx %9llu%c ", - t->tid, t->name, t, thread_states[t->state], t->task, - t->task->context, t->thread_code, t->kstack, cycles, suffix); - else - printf("%-6llu %-10s %#18zx %-8s %#18zx %-3ld %#18zx %#18zx %9llu%c ", - t->tid, t->name, t, thread_states[t->state], t->task, - t->task->context, t->thread_code, t->kstack, cycles, suffix); + +#ifdef __32_BITS__ + printf("%-6" PRIu64" %-10s %10p %-8s %10p %-3" PRIu32 " %10p %10p %9" PRIu64 "%c ", + t->tid, t->name, t, thread_states[t->state], t->task, + t->task->context, t->thread_code, t->kstack, cycles, suffix); +#endif + +#ifdef __64_BITS__ + printf("%-6" PRIu64" %-10s %18p %-8s %18p %-3" PRIu32 " %18p %18p %9" PRIu64 "%c ", + t->tid, t->name, t, thread_states[t->state], t->task, + t->task->context, t->thread_code, t->kstack, cycles, suffix); +#endif if (t->cpu) - printf("%-4zd", t->cpu->id); + printf("%-4u", t->cpu->id); else printf("none"); if (t->state == Sleeping) { - if (sizeof(uintptr_t) == 4) - printf(" %#10zx", t->sleep_queue); - else - printf(" %#18zx", t->sleep_queue); +#ifdef __32_BITS__ + printf(" %10p", t->sleep_queue); +#endif + +#ifdef __64_BITS__ + printf(" %18p", t->sleep_queue); +#endif } @@ -624,20 +631,22 @@ ipl = interrupts_disable(); spinlock_lock(&threads_lock); - - if (sizeof(uintptr_t) == 4) { - printf("tid name address state task " - "ctx code stack cycles cpu " - "waitqueue\n"); - printf("------ ---------- ---------- -------- ---------- " - "--- ---------- ---------- ---------- ---- " - "----------\n"); - } else { - printf("tid name address state task " - "ctx code stack cycles cpu " - "waitqueue\n"); - printf("------ ---------- ------------------ -------- ------------------ " - "--- ------------------ ------------------ ---------- ---- " - "------------------\n"); - } + +#ifdef __32_BITS__ + printf("tid name address state task " + "ctx code stack cycles cpu " + "waitqueue\n"); + printf("------ ---------- ---------- -------- ---------- " + "--- ---------- ---------- ---------- ---- " + "----------\n"); +#endif + +#ifdef __64_BITS__ + printf("tid name address state task " + "ctx code stack cycles cpu " + "waitqueue\n"); + printf("------ ---------- ------------------ -------- ------------------ " + "--- ------------------ ------------------ ---------- ---- " + "------------------\n"); +#endif avltree_walk(&threads_tree, thread_walker, NULL); @@ -663,4 +672,71 @@ return node != NULL; +} + + +/** Create new user task with 1 thread from image + * + * @param program_addr Address of program executable image. + * @param name Program name. + * + * @return Initialized main thread of the task or NULL on error. + */ +thread_t *thread_create_program(void *program_addr, char *name) +{ + as_t *as; + as_area_t *area; + unsigned int rc; + task_t *task; + uspace_arg_t *kernel_uarg; + + kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0); + if (kernel_uarg == NULL) + return NULL; + + kernel_uarg->uspace_entry = + (void *) ((elf_header_t *) program_addr)->e_entry; + kernel_uarg->uspace_stack = (void *) USTACK_ADDRESS; + kernel_uarg->uspace_thread_function = NULL; + kernel_uarg->uspace_thread_arg = NULL; + kernel_uarg->uspace_uarg = NULL; + + as = as_create(0); + if (as == NULL) { + free(kernel_uarg); + return NULL; + } + + rc = elf_load((elf_header_t *) program_addr, as); + if (rc != EE_OK) { + free(kernel_uarg); + as_destroy(as); + return NULL; + } + + /* + * Create the data as_area. + */ + area = as_area_create(as, + AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE, + LOADED_PROG_STACK_PAGES_NO * PAGE_SIZE, USTACK_ADDRESS, + AS_AREA_ATTR_NONE, &anon_backend, NULL); + if (area == NULL) { + free(kernel_uarg); + as_destroy(as); + return NULL; + } + + task = task_create(as, name); + if (task == NULL) { + free(kernel_uarg); + as_destroy(as); + return NULL; + } + + /* + * Create the main thread. + */ + return thread_create(uinit, kernel_uarg, task, THREAD_FLAG_USPACE, + "uinit", false); }