X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=7a10e6641551d9dd43d5afb82a00db0a5fe5218b;hb=a71f35bcb2dc587326be18345adb1ad1d81b9435;hp=9c37b6f7856aa6fab0f19bfdec007ba761978272;hpb=fe719150440abe776a01faed02a2e40bed8029f9;p=palacios-OLD.git diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c index 9c37b6f..7a10e66 100644 --- a/palacios/src/palacios/vm_guest.c +++ b/palacios/src/palacios/vm_guest.c @@ -33,6 +33,7 @@ #include + v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info) { struct cr0_32 * cr0; struct efer_64 * efer; @@ -251,14 +252,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 +282,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 +305,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,7 +338,27 @@ 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"); } @@ -389,7 +414,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 +432,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])); } } @@ -461,7 +486,6 @@ 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); @@ -477,6 +501,7 @@ 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); // Initialize the memory map if (v3_init_mem_map(vm) == -1) { @@ -503,23 +528,24 @@ int v3_init_vm(struct v3_vm_info * vm) { // init SVM/VMX + switch (cpu_type) { #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; - } + 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; - } + case V3_VMX_CPU: + case V3_VMX_EPT_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 +557,59 @@ 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 CONFIG_SYMBIOTIC + v3_deinit_symbiotic_vm(vm); +#endif + + // init SVM/VMX + switch (cpu_type) { +#ifdef 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 CONFIG_VMX + case V3_VMX_CPU: + case V3_VMX_EPT_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_cpuid_map(vm); + v3_deinit_msr_map(vm); + v3_deinit_io_map(vm); + v3_deinit_hypercall_map(vm); + +#ifdef CONFIG_TELEMETRY + v3_deinit_telemetry(vm); +#endif + + - return 0; } @@ -600,7 +677,7 @@ int v3_free_core(struct guest_info * core) { #ifdef CONFIG_SYMBIOTIC - //v3_deinit_symbiotic_core(core); + v3_deinit_symbiotic_core(core); #endif v3_deinit_decoder(core); @@ -614,6 +691,10 @@ int v3_free_core(struct guest_info * core) { v3_free_passthrough_pts(core); +#ifdef CONFIG_TELEMETRY + v3_deinit_core_telemetry(core); +#endif + switch (cpu_type) { #ifdef CONFIG_SVM case V3_SVM_CPU: