X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=afb99214821743ffa054b8a47b101c41747f1f8a;hb=16745fa0dd0900263d4d92315cd17e0ed9ccae91;hp=4dddf6efebf867afef84397e258be5dcf39d1c1f;hpb=14fa18cc54571eaa7aaa0f7d55677bdb4dad81a6;p=palacios-OLD.git diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c index 4dddf6e..afb9921 100644 --- a/palacios/src/palacios/vm_guest.c +++ b/palacios/src/palacios/vm_guest.c @@ -29,6 +29,7 @@ #include #include #include +#include v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info) { @@ -257,6 +258,55 @@ void v3_print_ctrl_regs(struct guest_info * info) { } +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) { + if (v3_gpa_to_hva(info, linear_addr, host_addr) == -1) return -1; + } else if (info->mem_mode == VIRTUAL_MEM) { + if (v3_gva_to_hva(info, linear_addr, host_addr) == -1) return -1; + } + return 0; +} + +static int v3_print_disassembly(struct guest_info * info) { + int passed_rip = 0; + addr_t rip, rip_linear, rip_host; + + /* we don't know where the instructions preceding RIP start, so we just take + * a guess and hope the instruction stream synced up with our disassembly + * some time before RIP; if it has not we correct RIP at that point + */ + + /* start disassembly 64 bytes before current RIP, continue 32 bytes after */ + rip = (addr_t) info->rip - 64; + while ((int) (rip - info->rip) < 32) { + /* always print RIP, even if the instructions before were bad */ + if (!passed_rip && rip >= info->rip) { + if (rip != info->rip) { + V3_Print("***** bad disassembly up to this point *****\n"); + rip = info->rip; + } + passed_rip = 1; + } + + /* look up host virtual address for this instruction */ + rip_linear = get_addr_linear(info, rip, &(info->segments.cs)); + if (safe_gva_to_hva(info, rip_linear, &rip_host) < 0) { + rip++; + continue; + } + + /* print disassembled instrcution (updates rip) */ + if (v3_disasm(info, (void *) rip_host, &rip, rip == info->rip) < 0) { + rip++; + continue; + } + } + + return 0; +} + + void v3_print_guest_state(struct guest_info * info) { addr_t linear_addr = 0; @@ -281,6 +331,8 @@ void v3_print_guest_state(struct guest_info * info) { v3_print_mem_map(info->vm_info); v3_print_stack(info); + + v3_print_disassembly(info); } @@ -331,7 +383,7 @@ void v3_print_GPRs(struct guest_info * info) { v3_reg_t * reg_ptr; char * reg_names[] = { "RDI", "RSI", "RBP", "RSP", "RBX", "RDX", "RCX", "RAX", NULL}; - reg_ptr= (v3_reg_t *)regs; + reg_ptr = (v3_reg_t *)regs; V3_Print("32 bit GPRs:\n"); @@ -364,24 +416,27 @@ void v3_print_GPRs(struct guest_info * info) { #include #include static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_data) { - v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id()); - + v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU()); + int cpu_valid = 0; + + V3_Print("************** Guest State ************\n"); v3_print_guest_state(core); - // init SVM/VMX #ifdef CONFIG_SVM if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) { + cpu_valid = 1; PrintDebugVMCB((vmcb_t *)(core->vmm_data)); } #endif #ifdef CONFIG_VMX - else if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) { + if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) { + cpu_valid = 1; v3_print_vmcs(); } #endif - else { - PrintError("Invalid CPU Type\n"); + if (!cpu_valid) { + PrintError("Invalid CPU Type 0x%x\n", cpu_type); return -1; } @@ -404,8 +459,8 @@ 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_id()); - + v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU()); + int cpu_valid = 0; if (v3_get_foreground_vm() == NULL) { v3_set_foreground_vm(vm); @@ -449,31 +504,30 @@ int v3_init_vm(struct v3_vm_info * vm) { if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) { v3_init_svm_io_map(vm); v3_init_svm_msr_map(vm); - } + cpu_valid = 1; + } #endif #ifdef CONFIG_VMX - else if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) { + if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) { v3_init_vmx_io_map(vm); v3_init_vmx_msr_map(vm); + cpu_valid = 1; } #endif - else { - PrintError("Invalid CPU Type\n"); + if (!cpu_valid) { + PrintError("Invalid CPU Type 0x%x\n", cpu_type); return -1; } - - v3_register_hypercall(vm, GUEST_INFO_HCALL, info_hcall, NULL); - V3_Print("GUEST_INFO_HCALL=%x\n", GUEST_INFO_HCALL); return 0; } int v3_init_core(struct guest_info * core) { - v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id()); + v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU()); struct v3_vm_info * vm = core->vm_info; /* @@ -499,26 +553,80 @@ int v3_init_core(struct guest_info * core) { #endif // init SVM/VMX + + + switch (cpu_type) { #ifdef CONFIG_SVM - if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) { - if (v3_init_svm_vmcb(core, vm->vm_class) == -1) { - PrintError("Error in SVM initialization\n"); - return -1; - } - } + case V3_SVM_CPU: + case V3_SVM_REV3_CPU: + if (v3_init_svm_vmcb(core, vm->vm_class) == -1) { + PrintError("Error in SVM initialization\n"); + return -1; + } + break; #endif #ifdef CONFIG_VMX - else if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) { - if (v3_init_vmx_vmcs(core, vm->vm_class) == -1) { - PrintError("Error in VMX initialization\n"); + case V3_VMX_CPU: + case V3_VMX_EPT_CPU: + if (v3_init_vmx_vmcs(core, vm->vm_class) == -1) { + PrintError("Error in VMX initialization\n"); + return -1; + } + break; +#endif + default: + PrintError("Invalid CPU Type 0x%x\n", cpu_type); return -1; - } } + + return 0; +} + + + +int v3_free_core(struct guest_info * core) { + v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU()); + + +#ifdef CONFIG_SYMBIOTIC + //v3_deinit_symbiotic_core(core); #endif - else { - PrintError("Invalid CPU Type\n"); - return -1; + + v3_deinit_decoder(core); + + v3_deinit_intr_controllers(core); + + switch (cpu_type) { +#ifdef CONFIG_SVM + case V3_SVM_CPU: + case V3_SVM_REV3_CPU: + if (v3_deinit_svm_vmcb(core) == -1) { + PrintError("Error in SVM initialization\n"); + return -1; + } + break; +#endif +#ifdef CONFIG_VMX + case V3_VMX_CPU: + case V3_VMX_EPT_CPU: + if (v3_deinit_vmx_vmcs(core) == -1) { + PrintError("Error in VMX initialization\n"); + return -1; + } + break; +#endif + default: + PrintError("Invalid CPU Type 0x%x\n", cpu_type); + return -1; } return 0; } + + + +int v3_free_vm_internal(struct v3_vm_info * vm) { + + + return 0; +}