X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=7bd275f77a2aef9c5fa7edacb226c8fb5b8ce853;hb=9a9c14099c09e9ed86d8ac2f73f7406d0ac8a90b;hp=7a10e6641551d9dd43d5afb82a00db0a5fe5218b;hpb=c44555f7fa9a90c1934f5b74c8fe1dee1c09d325;p=palacios.git diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c index 7a10e66..7bd275f 100644 --- a/palacios/src/palacios/vm_guest.c +++ b/palacios/src/palacios/vm_guest.c @@ -28,10 +28,9 @@ #include #include #include -#include #include #include - +#include v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info) { @@ -361,6 +360,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; @@ -369,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) { @@ -391,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))); @@ -449,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(); } @@ -471,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 @@ -487,11 +525,9 @@ 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 + +#ifdef V3_CONFIG_TELEMETRY v3_init_telemetry(vm); #endif @@ -503,6 +539,8 @@ int v3_init_vm(struct v3_vm_info * 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) { PrintError("Could not initialize shadow map\n"); @@ -520,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 @@ -529,16 +567,17 @@ int v3_init_vm(struct v3_vm_info * vm) { // init SVM/VMX switch (cpu_type) { -#ifdef CONFIG_SVM +#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 +#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; @@ -563,22 +602,23 @@ int v3_free_vm_internal(struct v3_vm_info * vm) { -#ifdef CONFIG_SYMBIOTIC +#ifdef V3_CONFIG_SYMBIOTIC v3_deinit_symbiotic_vm(vm); #endif // init SVM/VMX switch (cpu_type) { -#ifdef CONFIG_SVM +#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 CONFIG_VMX +#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; @@ -599,12 +639,14 @@ int v3_free_vm_internal(struct v3_vm_info * 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 CONFIG_TELEMETRY +#ifdef V3_CONFIG_TELEMETRY v3_deinit_telemetry(vm); #endif @@ -618,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 @@ -636,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 @@ -644,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) { @@ -653,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; @@ -676,7 +721,7 @@ int v3_free_core(struct guest_info * core) { v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU()); -#ifdef CONFIG_SYMBIOTIC +#ifdef V3_CONFIG_SYMBIOTIC v3_deinit_symbiotic_core(core); #endif @@ -691,12 +736,12 @@ int v3_free_core(struct guest_info * core) { v3_free_passthrough_pts(core); -#ifdef CONFIG_TELEMETRY +#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) { @@ -705,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;