X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=e9ff5f7178761c8be57dfaf89667f00405a08457;hb=0b9cb865c52bc2b6e0a5637d1e1a3cb340ce50f8;hp=e62835c83a804563b1dc1a0b491a8d375ec99395;hpb=f0e3b9e0d33d90a41cb2c3bb800ab38929c744b5;p=palacios.git diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c index e62835c..e9ff5f7 100644 --- a/palacios/src/palacios/vm_guest.c +++ b/palacios/src/palacios/vm_guest.c @@ -28,7 +28,8 @@ #include #include #include - +#include +#include v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info) { @@ -198,7 +199,7 @@ int v3_translate_segment(struct guest_info * info, uint16_t selector, struct v3_ return -1; } - if (guest_va_to_host_va(info, gdt->base, &gdt_addr) == -1) { + if (v3_gva_to_hva(info, gdt->base, &gdt_addr) == -1) { PrintError("Unable to translate GDT address\n"); return -1; } @@ -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; @@ -278,7 +328,11 @@ void v3_print_guest_state(struct guest_info * info) { } v3_print_GPRs(info); + v3_print_mem_map(info->vm_info); + v3_print_stack(info); + + v3_print_disassembly(info); } @@ -294,12 +348,12 @@ void v3_print_stack(struct guest_info * info) { V3_Print("Stack at %p:\n", (void *)linear_addr); if (info->mem_mode == PHYSICAL_MEM) { - if (guest_pa_to_host_va(info, linear_addr, &host_addr) == -1) { + if (v3_gpa_to_hva(info, linear_addr, &host_addr) == -1) { PrintError("Could not translate Stack address\n"); return; } } else if (info->mem_mode == VIRTUAL_MEM) { - if (guest_va_to_host_va(info, linear_addr, &host_addr) == -1) { + if (v3_gva_to_hva(info, linear_addr, &host_addr) == -1) { PrintError("Could not translate Virtual Stack address\n"); return; } @@ -362,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; } @@ -402,7 +459,12 @@ 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); + } #ifdef CONFIG_TELEMETRY v3_init_telemetry(vm); @@ -421,18 +483,20 @@ int v3_init_vm(struct v3_vm_info * vm) { return -1; } -#ifdef CONFIG_SYMBIOTIC - v3_init_sym_iface(vm); -#endif + v3_init_mem_hooks(vm); - v3_init_dev_mgr(vm); + if (v3_init_shdw_impl(vm) == -1) { + PrintError("VM initialization error in shadow implementaion\n"); + return -1; + } -#ifdef CONFIG_SYMBIOTIC_SWAP - PrintDebug("initializing symbiotic swap\n"); - v3_init_sym_swap(vm); + +#ifdef CONFIG_SYMBIOTIC + v3_init_symbiotic_vm(vm); #endif + v3_init_dev_mgr(vm); // init SVM/VMX @@ -440,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; /* @@ -475,7 +538,7 @@ int v3_init_core(struct guest_info * core) { #endif if (core->shdw_pg_mode == SHADOW_PAGING) { - v3_init_shadow_page_state(core); + v3_init_shdw_pg_state(core); } v3_init_time(core); @@ -485,27 +548,35 @@ int v3_init_core(struct guest_info * core) { v3_init_decoder(core); +#ifdef CONFIG_SYMBIOTIC + v3_init_symbiotic_core(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"); - return -1; - } - } + 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 - else { - PrintError("Invalid CPU Type\n"); - return -1; + default: + PrintError("Invalid CPU Type 0x%x\n", cpu_type); + return -1; } return 0;