X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=5281dd445f6174227d785c3db50e7758db1e194f;hb=dc6b47d05e37e6c3738e1bc6165ec4a107717d2b;hp=73926cce8da8e86697f99b541217709bcff38ce9;hpb=f18097c35ddc13572ab41e03ad7a14430cff11ac;p=palacios.git diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c index 73926cc..5281dd4 100644 --- a/palacios/src/palacios/vm_guest.c +++ b/palacios/src/palacios/vm_guest.c @@ -28,10 +28,13 @@ #include #include #include -#include #include #include +#ifdef CONFIG_SYSCALL_HIJACK +#include +#endif + v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info) { @@ -252,14 +255,14 @@ void v3_print_ctrl_regs(struct guest_info * info) { V3_Print("32 bit Ctrl Regs:\n"); for (i = 0; reg_names[i] != NULL; i++) { - V3_Print("\t%s=0x%p\n", reg_names[i], (void *)(addr_t)reg_ptr[i]); + V3_Print("\t%s=0x%p (at %p)\n", reg_names[i], (void *)(addr_t)reg_ptr[i], &(reg_ptr[i])); } V3_Print("\tEFER=0x%p\n", (void*)(addr_t)(guest_state->efer)); } - +#if 0 static int safe_gva_to_hva(struct guest_info * info, addr_t linear_addr, addr_t * host_addr) { /* select the proper translation based on guest mode */ if (info->mem_mode == PHYSICAL_MEM) { @@ -282,6 +285,8 @@ static int v3_print_disassembly(struct guest_info * info) { /* start disassembly 64 bytes before current RIP, continue 32 bytes after */ rip = (addr_t) info->rip - 64; while ((int) (rip - info->rip) < 32) { + V3_Print("disassembly step\n"); + /* always print RIP, even if the instructions before were bad */ if (!passed_rip && rip >= info->rip) { if (rip != info->rip) { @@ -303,11 +308,13 @@ static int v3_print_disassembly(struct guest_info * info) { rip++; continue; } + } return 0; } +#endif void v3_print_guest_state(struct guest_info * info) { addr_t linear_addr = 0; @@ -334,7 +341,7 @@ void v3_print_guest_state(struct guest_info * info) { v3_print_stack(info); - v3_print_disassembly(info); + // v3_print_disassembly(info); } void v3_print_guest_state_all(struct v3_vm_info * vm) { @@ -357,6 +364,40 @@ void v3_print_guest_state_all(struct v3_vm_info * vm) { V3_Print("\n"); } +static void print_real_mode_stack(struct guest_info *info) +{ + uint16_t ss; + uint16_t sp; + addr_t addr; + addr_t host_addr; + int i; + + + ss = info->segments.ss.selector & 0xffff; + sp = info->vm_regs.rsp & 0xffff; + addr = (((uint32_t)ss)<<4) + sp; + + + V3_Print("Real Mode Stack starting at 0x%x:0x%x (0x%p):\n",ss,sp,(void*)addr); + + if (info->mem_mode!=PHYSICAL_MEM) { + PrintError("Cannot print real mode stack when virtual memory active\n"); + return; + } + + for (i=0;i<=24;i++,sp+=2) { + // note that it's correct for this to wrap around + addr = (((uint32_t)ss)<<4) + sp; + if (v3_gpa_to_hva(info,addr,&host_addr)) { + PrintError("Could not translate physical stack address 0x%p\n",(void*)addr); + return; + } + V3_Print("\t0x%.4x\n",*((uint16_t*)host_addr)); + } +} + + + void v3_print_stack(struct guest_info * info) { addr_t linear_addr = 0; @@ -365,9 +406,16 @@ void v3_print_stack(struct guest_info * info) { v3_cpu_mode_t cpu_mode = v3_get_vm_cpu_mode(info); + if (cpu_mode==REAL) { + print_real_mode_stack(info); + return; + } + + // protected mode, 32 or 64 bit + linear_addr = get_addr_linear(info, info->vm_regs.rsp, &(info->segments.ss)); - V3_Print("Stack at %p:\n", (void *)linear_addr); + V3_Print("Stack at %p:\n", (void *)linear_addr); if (info->mem_mode == PHYSICAL_MEM) { if (v3_gpa_to_hva(info, linear_addr, &host_addr) == -1) { @@ -387,8 +435,6 @@ void v3_print_stack(struct guest_info * info) { for (i = 0; i <= 24; i++) { if (cpu_mode == LONG) { V3_Print("\t%p\n", (void *)*(addr_t *)(host_addr + (i * 8))); - } else if (cpu_mode == REAL) { - V3_Print("Don't currently handle 16 bit stacks... \n"); } else { // 32 bit stacks... V3_Print("\t%.8x\n", *(uint32_t *)(host_addr + (i * 4))); @@ -410,7 +456,7 @@ void v3_print_GPRs(struct guest_info * info) { V3_Print("32 bit GPRs:\n"); for (i = 0; reg_names[i] != NULL; i++) { - V3_Print("\t%s=0x%p\n", reg_names[i], (void *)(addr_t)reg_ptr[i]); + V3_Print("\t%s=0x%p (at %p)\n", reg_names[i], (void *)(addr_t)reg_ptr[i], &(reg_ptr[i])); } } @@ -428,7 +474,7 @@ void v3_print_GPRs(struct guest_info * info) { V3_Print("64 bit GPRs:\n"); for (i = 0; reg_names[i] != NULL; i++) { - V3_Print("\t%s=0x%p\n", reg_names[i], (void *)(addr_t)reg_ptr[i]); + V3_Print("\t%s=0x%p (at %p)\n", reg_names[i], (void *)(addr_t)reg_ptr[i], &(reg_ptr[i])); } } @@ -483,9 +529,7 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat int v3_init_vm(struct v3_vm_info * vm) { v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU()); - if (v3_get_foreground_vm() == NULL) { - v3_set_foreground_vm(vm); - } + #ifdef CONFIG_TELEMETRY v3_init_telemetry(vm); @@ -614,6 +658,8 @@ int v3_init_core(struct guest_info * core) { v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU()); struct v3_vm_info * vm = core->vm_info; + + /* * Initialize the subsystem data strutures */ @@ -636,6 +682,16 @@ int v3_init_core(struct guest_info * core) { v3_init_symbiotic_core(core); #endif +/* KCH: Hook INT 80 + not sure about this location though...*/ +#ifdef CONFIG_SYSCALL_HIJACK + v3_hook_swintr(core, 0x80, v3_syscall_handler, NULL); + /* hook a poll syscall */ + //v3_hook_syscall(core, 5, v3_sysopen_handler, NULL); + //v3_hook_syscall(core, 21, v3_sysmount_handler, NULL); + v3_hook_syscall(core, 11, v3_sysexecve_handler, NULL); +#endif + // init SVM/VMX