X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=bd5decacda66da42cb8e40f5fe6fd87229ac9a22;hb=8f73ff87ab96b79b87854a2135c16b81cff879a3;hp=4913513a55b5b1465c31df6a5b2b04222ce16a0e;hpb=a6abc36ea941eb0f63783eb077d4073c8773719d;p=palacios.git diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c index 4913513..bd5deca 100644 --- a/palacios/src/palacios/svm.c +++ b/palacios/src/palacios/svm.c @@ -199,12 +199,17 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { if (vm_info->shdw_pg_mode == SHADOW_PAGING) { PrintDebug("Creating initial shadow page table\n"); - vm_info->direct_map_pt = (addr_t)create_passthrough_pde32_pts(vm_info); - vm_info->shdw_pg_state.shadow_cr3 |= (vm_info->direct_map_pt & ~0xfff); + vm_info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pde32_pts(vm_info)); + + //vm_info->shdw_pg_state.shadow_cr3 |= (vm_info->direct_map_pt & ~0xfff); + vm_info->shdw_pg_state.shadow_cr3 = 0; vm_info->shdw_pg_state.guest_cr0 = 0x0000000000000010LL; PrintDebug("Created\n"); - guest_state->cr3 = vm_info->shdw_pg_state.shadow_cr3; + //guest_state->cr3 = vm_info->shdw_pg_state.shadow_cr3; + + guest_state->cr3 = vm_info->direct_map_pt; + //PrintDebugPageTables((pde32_t*)(vm_info->shdw_pg_state.shadow_cr3.e_reg.low)); @@ -234,7 +239,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { // Enable Nested Paging ctrl_area->NP_ENABLE = 1; - PrintDebug("NP_Enable at 0x%x\n", &(ctrl_area->NP_ENABLE)); + PrintDebug("NP_Enable at 0x%p\n", (void *)&(ctrl_area->NP_ENABLE)); // Set the Nested Page Table pointer vm_info->direct_map_pt = ((addr_t)create_passthrough_pde32_pts(vm_info) & ~0xfff); @@ -264,7 +269,7 @@ static int init_svm_guest(struct guest_info *info) { // PrintDebugPageTables(info->page_tables); - PrintDebug("Initializing VMCB (addr=%x)\n", info->vmm_data); + PrintDebug("Initializing VMCB (addr=%p)\n", (void *)info->vmm_data); Init_VMCB_BIOS((vmcb_t*)(info->vmm_data), info); @@ -294,7 +299,7 @@ static int start_svm_guest(struct guest_info *info) { - PrintDebug("Launching SVM VM (vmcb=%x)\n", info->vmm_data); + PrintDebug("Launching SVM VM (vmcb=%p)\n", (void *)info->vmm_data); //PrintDebugVMCB((vmcb_t*)(info->vmm_data)); info->run_state = VM_RUNNING; @@ -307,48 +312,28 @@ static int start_svm_guest(struct guest_info *info) { v3_enable_ints(); v3_clgi(); - { - - v3_get_msr(0xc0000101, &vm_cr_high, &vm_cr_low); - PrintDebug("GS.Base: %x:%x\n", vm_cr_high, vm_cr_low); - /* - v3_get_msr(0xc0000102, &vm_cr_high, &vm_cr_low); + PrintDebug("SVM Entry to rip=%p...\n", (void *)info->rip); - PrintDebug("KernelGSBase: %x:%x\n", vm_cr_high, vm_cr_low); - */ - - } - - PrintDebug("SVM Entry to rip=%x...\n", info->rip); + v3_get_msr(0xc0000101, &vm_cr_high, &vm_cr_low); rdtscll(info->time_state.cached_host_tsc); + guest_ctrl->TSC_OFFSET = info->time_state.guest_tsc - info->time_state.cached_host_tsc; v3_svm_launch((vmcb_t*)V3_PAddr(info->vmm_data), &(info->vm_regs)); - rdtscll(tmp_tsc); - PrintDebug("SVM Returned\n"); - - - { - - v3_set_msr(0xc0000101, vm_cr_high, vm_cr_low); - PrintDebug("GS.Base: %x:%x\n", vm_cr_high, vm_cr_low); - - /* - v3_get_msr(0xc0000102, &vm_cr_high, &vm_cr_low); + v3_set_msr(0xc0000101, vm_cr_high, vm_cr_low); + PrintDebug("SVM Returned\n"); - PrintDebug("KernelGSBase: %x:%x\n", vm_cr_high, vm_cr_low); - */ - } - +#if PrintDebug { uint_t x = 0; - PrintDebug("RSP=%p\n", &x); + PrintDebug("RSP=%p\n", (void *)&x); } +#endif v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc); @@ -371,13 +356,13 @@ static int start_svm_guest(struct guest_info *info) { PrintDebug("SVM ERROR!!\n"); - PrintDebug("RIP: %x\n", guest_state->rip); + PrintDebug("RIP: %p\n", (void *)guest_state->rip); linear_addr = get_addr_linear(info, guest_state->rip, &(info->segments.cs)); - PrintDebug("RIP Linear: %\n", linear_addr); + PrintDebug("RIP Linear: %p\n", (void *)linear_addr); v3_print_segments(info); v3_print_ctrl_regs(info); v3_print_GPRs(info); @@ -389,9 +374,9 @@ static int start_svm_guest(struct guest_info *info) { } - PrintDebug("Host Address of rip = 0x%x\n", host_addr); + PrintDebug("Host Address of rip = 0x%p\n", (void *)host_addr); - PrintDebug("Instr (15 bytes) at %x:\n", host_addr); + PrintDebug("Instr (15 bytes) at %p:\n", (void *)host_addr); PrintTraceMemDump((uchar_t *)host_addr, 15); break; @@ -415,7 +400,7 @@ int v3_is_svm_capable() { v3_cpuid(CPUID_FEATURE_IDS, &eax, &ebx, &ecx, &edx); - PrintDebug("CPUID_FEATURE_IDS_ecx=0x%x\n", ecx); + PrintDebug("CPUID_FEATURE_IDS_ecx=0x%p\n", (void *)ecx); if ((ecx & CPUID_FEATURE_IDS_ecx_svm_avail) == 0) { PrintDebug("SVM Not Available\n"); @@ -430,7 +415,7 @@ int v3_is_svm_capable() { v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx); - PrintDebug("CPUID_FEATURE_IDS_edx=0x%x\n", edx); + PrintDebug("CPUID_FEATURE_IDS_edx=0x%p\n", (void *)edx); if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_svml) == 0) { PrintDebug("SVM BIOS Disabled, not unlockable\n"); @@ -444,7 +429,7 @@ int v3_is_svm_capable() { v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx); - PrintDebug("CPUID_FEATURE_IDS_edx=0x%x\n", edx); + PrintDebug("CPUID_FEATURE_IDS_edx=0x%p\n", (void *)edx); if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 0) { PrintDebug("SVM Nested Paging not supported\n"); @@ -541,7 +526,7 @@ void v3_init_SVM(struct v3_ctrl_ops * vmm_ops) { //msr.e_reg.low = (uint_t)host_state; msr.r_reg = (addr_t)host_state; - PrintDebug("Host State being saved at %x\n", (addr_t)host_state); + PrintDebug("Host State being saved at %p\n", (void *)(addr_t)host_state); v3_set_msr(SVM_VM_HSAVE_PA_MSR, msr.e_reg.high, msr.e_reg.low);