From d09f8a08bdd9477bd463a2de03397ff56b5ce75d Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 13 Jul 2016 23:11:55 +0200 Subject: Add delta wrt. function in stack dump --- Makefile | 2 +- src/common/include/btree.h | 4 ++-- src/common/libalgo/btree.c | 6 ++++-- src/kernel/core/kmain.c | 20 ++++++++++++++------ src/kernel/core/loader.s | 1 + src/kernel/core/sys.c | 7 +++++-- src/kernel/core/worker.c | 2 +- src/kernel/user/process.c | 2 +- src/tests/ktests/btree2/test.c | 8 ++++---- 9 files changed, 33 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index ada41d0..e7a3dfc 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ rebuild: clean all mrproper: clean run_tests: - rm build/tests/*.log + rm build/tests/*.log build/tests/*.log.err || true bam test run_qemu: all diff --git a/src/common/include/btree.h b/src/common/include/btree.h index 9975885..a645d66 100644 --- a/src/common/include/btree.h +++ b/src/common/include/btree.h @@ -23,8 +23,8 @@ void btree_remove(btree_t *t, const void* key); void btree_remove_v(btree_t *t, const void* key, const void* value); void* btree_find(btree_t *i, const void* key); -void* btree_lower(btree_t *i, const void* key); -void* btree_upper(btree_t *i, const void* key); +void* btree_lower(btree_t *i, const void* key, void** actual_key); +void* btree_upper(btree_t *i, const void* key, void** actual_key); void btree_iter(btree_t *i, kv_iter_fun_t f); void btree_iter_on(btree_t *i, const void* key, kv_iter_fun_t f); diff --git a/src/common/libalgo/btree.c b/src/common/libalgo/btree.c index 6bc0fdc..45fde1e 100644 --- a/src/common/libalgo/btree.c +++ b/src/common/libalgo/btree.c @@ -272,7 +272,7 @@ void* btree_find(btree_t *t, const void* key) { return i->val; } -void* btree_lower(btree_t *t, const void* key) { +void* btree_lower(btree_t *t, const void* key, void** actual_key) { btree_item_t *find_aux(btree_t *t, btree_item_t *i, const void* key) { if (i == 0) return 0; @@ -291,10 +291,11 @@ void* btree_lower(btree_t *t, const void* key) { btree_item_t *i = find_aux(t, t->root, key); if (i == 0) return 0; + if (actual_key != 0) *actual_key = i->key; return i->val; } -void* btree_upper(btree_t *t, const void* key) { +void* btree_upper(btree_t *t, const void* key, void** actual_key) { btree_item_t *find_aux(btree_t *t, btree_item_t *i, const void* key) { if (i == 0) return 0; @@ -313,6 +314,7 @@ void* btree_upper(btree_t *t, const void* key) { btree_item_t *i = find_aux(t, t->root, key); if (i == 0) return 0; + if (actual_key != 0) *actual_key = i->key; return i->val; } diff --git a/src/kernel/core/kmain.c b/src/kernel/core/kmain.c index 99ad0d7..38336a9 100644 --- a/src/kernel/core/kmain.c +++ b/src/kernel/core/kmain.c @@ -125,6 +125,20 @@ void kmain(multiboot_info_t *mbd, int32_t mb_magic) { setup_syscall_table(); dbg_printf("System calls setup ok.\n"); + // If we have a kernel map, load it now + for (unsigned i = 0; i < mbd->mods_count; i++) { + char* modname = (char*)mods[i].string; + size_t len = mods[i].mod_end - mods[i].mod_start; + + if (strlen(modname) > 4 && strcmp(modname + strlen(modname) - 4, ".map") == 0) { + // Copy data to somewhere safe, as it will be modified + void* dup_data = malloc(len + 1); + memcpy(dup_data, (void*)mods[i].mod_start, len); + + load_kernel_symbol_map((char*)dup_data, len); + } + } + // enter multi-threading mode // interrupts are enabled at this moment, so all // code run from now on should be preemtible (ie thread-safe) @@ -249,12 +263,6 @@ fs_t *setup_iofs(multiboot_info_t *mbd) { ASSERT(nullfs_add_ram_file(iofs, name, (char*)mods[i].mod_start, len, FM_READ | FM_MMAP)); - - if (strlen(modname) > 4 && strcmp(modname + strlen(modname) - 4, ".map") == 0) { - // remark: load_kernel_symbol_map modifies the data region, - // which is not a problem because nullfs_add_ram_file copied the thing already - load_kernel_symbol_map((char*)mods[i].mod_start, len); - } } return iofs; diff --git a/src/kernel/core/loader.s b/src/kernel/core/loader.s index 447d82d..6f14be6 100644 --- a/src/kernel/core/loader.s +++ b/src/kernel/core/loader.s @@ -2,6 +2,7 @@ [GLOBAL loader] ; making entry point visible to linker [GLOBAL kernel_pd] ; make kernel page directory visible [GLOBAL kernel_stack_protector] ; used to detect kernel stack overflow +[GLOBAL kernel_stack_bottom] ; usefull for debugging [GLOBAL kernel_stack_top] ; stack re-used by scheduler ; higher-half kernel setup diff --git a/src/kernel/core/sys.c b/src/kernel/core/sys.c index 333cb58..02b66e5 100644 --- a/src/kernel/core/sys.c +++ b/src/kernel/core/sys.c @@ -73,9 +73,12 @@ void kernel_stacktrace(uint32_t ebp, uint32_t eip) { int i = 0; while (ebp >= K_HIGHHALF_ADDR) { char* sym = 0; - if (kernel_symbol_map != 0) sym = btree_lower(kernel_symbol_map, (void*)eip); + void* fn_ptr = 0; + if (kernel_symbol_map != 0) { + sym = btree_lower(kernel_symbol_map, (void*)eip, &fn_ptr); + } - dbg_printf("| 0x%p EIP: 0x%p %s\n", ebp, eip, sym); + dbg_printf("| 0x%p EIP: 0x%p %s +0x%p\n", ebp, eip, sym, ((void*)eip - fn_ptr)); uint32_t *d = (uint32_t*)ebp; ebp = d[0]; diff --git a/src/kernel/core/worker.c b/src/kernel/core/worker.c index 6852329..9b50949 100644 --- a/src/kernel/core/worker.c +++ b/src/kernel/core/worker.c @@ -50,7 +50,7 @@ void worker_thread(void* x) { while (true) { mutex_lock(&tasks_mutex); - worker_task_t *next_task = btree_upper(tasks, &zero64); + worker_task_t *next_task = btree_upper(tasks, &zero64, 0); next_task_time = (next_task == 0 ? UINT64_MAX : next_task->time); if (next_task != 0 && next_task->time <= time) { diff --git a/src/kernel/user/process.c b/src/kernel/user/process.c index 7b0c351..43294ce 100644 --- a/src/kernel/user/process.c +++ b/src/kernel/user/process.c @@ -541,7 +541,7 @@ void proc_close_fd(process_t *p, int fd) { user_region_t *find_user_region(process_t *proc, const void* addr) { mutex_lock(&proc->lock); - user_region_t *r = (proc->regions_idx != 0 ? (user_region_t*)btree_lower(proc->regions_idx, addr) : 0); + user_region_t *r = (proc->regions_idx != 0 ? (user_region_t*)btree_lower(proc->regions_idx, addr, 0) : 0); if (r != 0) { ASSERT(addr >= r->addr); diff --git a/src/tests/ktests/btree2/test.c b/src/tests/ktests/btree2/test.c index 9e105a9..dd62237 100644 --- a/src/tests/ktests/btree2/test.c +++ b/src/tests/ktests/btree2/test.c @@ -24,8 +24,8 @@ void test_btree_2() { for (int i = 0; i < n; i++) { ASSERT(btree_find(ht, (void*)k[i]) == (void*)v[i]); - ASSERT(btree_lower(ht, (void*)k[i]) == (void*)v[i]); - ASSERT(btree_upper(ht, (void*)k[i]) == (void*)v[i]); + ASSERT(btree_lower(ht, (void*)k[i], 0) == (void*)v[i]); + ASSERT(btree_upper(ht, (void*)k[i], 0) == (void*)v[i]); } // random lower bound/upper bound tests @@ -38,8 +38,8 @@ void test_btree_2() { } dbg_printf("random %d : lower %d (= %d), upper %d (= %d) ; ", xk, k[ilower], v[ilower], k[iupper], v[iupper]); - const uint32_t bt_lower = (uint32_t)btree_lower(ht, (void*)xk); - const uint32_t bt_upper = (uint32_t)btree_upper(ht, (void*)xk); + const uint32_t bt_lower = (uint32_t)btree_lower(ht, (void*)xk, 0); + const uint32_t bt_upper = (uint32_t)btree_upper(ht, (void*)xk, 0); dbg_printf("got lower %d, upper %d\n", bt_lower, bt_upper); ASSERT(bt_lower == (ilower == -1 ? 0 : v[ilower]));; ASSERT(bt_upper == (iupper == -1 ? 0 : v[iupper]));; -- cgit v1.2.3