X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=7bd275f77a2aef9c5fa7edacb226c8fb5b8ce853;hb=c1e5fa51e4f5b7055c677e2f9d5bc9808a32b351;hp=9c37b6f7856aa6fab0f19bfdec007ba761978272;hpb=fe719150440abe776a01faed02a2e40bed8029f9;p=palacios.git diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c index 9c37b6f..7bd275f 100644 --- a/palacios/src/palacios/vm_guest.c +++ b/palacios/src/palacios/vm_guest.c @@ -28,9 +28,9 @@ #include #include #include -#include #include #include +#include v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info) { @@ -251,14 +251,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) { @@ -281,6 +281,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) { @@ -302,11 +304,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; @@ -333,9 +337,63 @@ 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) { + int i = 0; + + V3_Print("VM Core states for %s\n", vm->name); + + for (i = 0; i < 80; i++) { + V3_Print("-"); + } + + for (i = 0; i < vm->num_cores; i++) { + v3_print_guest_state(&vm->cores[i]); + } + + for (i = 0; i < 80; i++) { + V3_Print("-"); + } + + 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; @@ -344,9 +402,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) { @@ -366,8 +431,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))); @@ -389,7 +452,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])); } } @@ -407,7 +470,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])); } } @@ -424,14 +487,14 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat v3_print_guest_state(core); // init SVM/VMX -#ifdef CONFIG_SVM +#ifdef V3_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 - if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) { +#ifdef V3_CONFIG_VMX + if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU) || (cpu_type == V3_VMX_EPT_UG_CPU)) { cpu_valid = 1; v3_print_vmcs(); } @@ -446,13 +509,13 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat } -#ifdef CONFIG_SVM +#ifdef V3_CONFIG_SVM #include #include #include #endif -#ifdef CONFIG_VMX +#ifdef V3_CONFIG_VMX #include #include #include @@ -461,13 +524,10 @@ 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()); - int cpu_valid = 0; - if (v3_get_foreground_vm() == NULL) { - v3_set_foreground_vm(vm); - } -#ifdef CONFIG_TELEMETRY + +#ifdef V3_CONFIG_TELEMETRY v3_init_telemetry(vm); #endif @@ -477,6 +537,9 @@ int v3_init_vm(struct v3_vm_info * vm) { v3_init_cpuid_map(vm); v3_init_host_events(vm); v3_init_intr_routers(vm); + v3_init_ext_manager(vm); + + v3_init_barrier(vm); // Initialize the memory map if (v3_init_mem_map(vm) == -1) { @@ -495,7 +558,7 @@ int v3_init_vm(struct v3_vm_info * vm) { v3_init_time_vm(vm); -#ifdef CONFIG_SYMBIOTIC +#ifdef V3_CONFIG_SYMBIOTIC v3_init_symbiotic_vm(vm); #endif @@ -503,23 +566,25 @@ int v3_init_vm(struct v3_vm_info * vm) { // init SVM/VMX -#ifdef CONFIG_SVM - 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; - } + switch (cpu_type) { +#ifdef V3_CONFIG_SVM + case V3_SVM_CPU: + case V3_SVM_REV3_CPU: + v3_init_svm_io_map(vm); + v3_init_svm_msr_map(vm); + break; #endif -#ifdef CONFIG_VMX - 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; - } +#ifdef V3_CONFIG_VMX + case V3_VMX_CPU: + case V3_VMX_EPT_CPU: + case V3_VMX_EPT_UG_CPU: + v3_init_vmx_io_map(vm); + v3_init_vmx_msr_map(vm); + break; #endif - if (!cpu_valid) { - PrintError("Invalid CPU Type 0x%x\n", cpu_type); - return -1; + default: + PrintError("Invalid CPU Type 0x%x\n", cpu_type); + return -1; } v3_register_hypercall(vm, GUEST_INFO_HCALL, info_hcall, NULL); @@ -531,8 +596,62 @@ int v3_init_vm(struct v3_vm_info * vm) { int v3_free_vm_internal(struct v3_vm_info * vm) { + v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU()); + + v3_remove_hypercall(vm, GUEST_INFO_HCALL); + + + +#ifdef V3_CONFIG_SYMBIOTIC + v3_deinit_symbiotic_vm(vm); +#endif + + // init SVM/VMX + switch (cpu_type) { +#ifdef V3_CONFIG_SVM + case V3_SVM_CPU: + case V3_SVM_REV3_CPU: + v3_deinit_svm_io_map(vm); + v3_deinit_svm_msr_map(vm); + break; +#endif +#ifdef V3_CONFIG_VMX + case V3_VMX_CPU: + case V3_VMX_EPT_CPU: + case V3_VMX_EPT_UG_CPU: + v3_deinit_vmx_io_map(vm); + v3_deinit_vmx_msr_map(vm); + break; +#endif + default: + PrintError("Invalid CPU Type 0x%x\n", cpu_type); + return -1; + } + + v3_deinit_dev_mgr(vm); + + v3_deinit_time_vm(vm); + + v3_deinit_mem_hooks(vm); + v3_delete_mem_map(vm); + v3_deinit_shdw_impl(vm); + + v3_deinit_intr_routers(vm); + v3_deinit_host_events(vm); + + v3_deinit_barrier(vm); + + v3_deinit_cpuid_map(vm); + v3_deinit_msr_map(vm); + v3_deinit_io_map(vm); + v3_deinit_hypercall_map(vm); + +#ifdef V3_CONFIG_TELEMETRY + v3_deinit_telemetry(vm); +#endif + + - return 0; } @@ -541,10 +660,12 @@ 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 */ -#ifdef CONFIG_TELEMETRY +#ifdef V3_CONFIG_TELEMETRY v3_init_core_telemetry(core); #endif @@ -559,7 +680,7 @@ int v3_init_core(struct guest_info * core) { v3_init_decoder(core); -#ifdef CONFIG_SYMBIOTIC +#ifdef V3_CONFIG_SYMBIOTIC v3_init_symbiotic_core(core); #endif @@ -567,7 +688,7 @@ int v3_init_core(struct guest_info * core) { switch (cpu_type) { -#ifdef CONFIG_SVM +#ifdef V3_CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: if (v3_init_svm_vmcb(core, vm->vm_class) == -1) { @@ -576,9 +697,10 @@ int v3_init_core(struct guest_info * core) { } break; #endif -#ifdef CONFIG_VMX +#ifdef V3_CONFIG_VMX case V3_VMX_CPU: case V3_VMX_EPT_CPU: + case V3_VMX_EPT_UG_CPU: if (v3_init_vmx_vmcs(core, vm->vm_class) == -1) { PrintError("Error in VMX initialization\n"); return -1; @@ -599,8 +721,8 @@ 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); +#ifdef V3_CONFIG_SYMBIOTIC + v3_deinit_symbiotic_core(core); #endif v3_deinit_decoder(core); @@ -614,8 +736,12 @@ int v3_free_core(struct guest_info * core) { v3_free_passthrough_pts(core); +#ifdef V3_CONFIG_TELEMETRY + v3_deinit_core_telemetry(core); +#endif + switch (cpu_type) { -#ifdef CONFIG_SVM +#ifdef V3_CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: if (v3_deinit_svm_vmcb(core) == -1) { @@ -624,9 +750,10 @@ int v3_free_core(struct guest_info * core) { } break; #endif -#ifdef CONFIG_VMX +#ifdef V3_CONFIG_VMX case V3_VMX_CPU: case V3_VMX_EPT_CPU: + case V3_VMX_EPT_UG_CPU: if (v3_deinit_vmx_vmcs(core) == -1) { PrintError("Error in VMX initialization\n"); return -1;