X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=7d91c4592e38c1fde06e43189d4c32f39fadf121;hb=ad434b4991ec5ab7e3f5e24edbaad1fb29a12feb;hp=bb0e2178eb35b3ad7c9674b98e7572703cbee1d1;hpb=04977d080b9850506ced2523b6130abc517b61df;p=palacios.git diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c index bb0e217..7d91c45 100644 --- a/palacios/src/palacios/svm.c +++ b/palacios/src/palacios/svm.c @@ -50,7 +50,7 @@ extern int v3_svm_launch(vmcb_t * vmcb, struct v3_gprs * vm_regs); static vmcb_t * Allocate_VMCB() { - vmcb_t * vmcb_page = (vmcb_t *)V3_AllocPages(1); + vmcb_t * vmcb_page = (vmcb_t *)V3_VAddr(V3_AllocPages(1)); memset(vmcb_page, 0, 4096); @@ -133,6 +133,10 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { guest_state->cs.attrib.raw = 0xf3; + /* DEBUG FOR RETURN CODE */ + ctrl_area->exit_code = 1; + + struct vmcb_selector *segregs [] = {&(guest_state->ss), &(guest_state->ds), &(guest_state->es), &(guest_state->fs), &(guest_state->gs), NULL}; for ( i = 0; segregs[i] != NULL; i++) { struct vmcb_selector * seg = segregs[i]; @@ -164,10 +168,10 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { struct vmm_io_hook * iter; addr_t io_port_bitmap; - io_port_bitmap = (addr_t)V3_AllocPages(3); + io_port_bitmap = (addr_t)V3_VAddr(V3_AllocPages(3)); memset((uchar_t*)io_port_bitmap, 0, PAGE_SIZE * 3); - ctrl_area->IOPM_BASE_PA = io_port_bitmap; + ctrl_area->IOPM_BASE_PA = (addr_t)V3_PAddr((void *)io_port_bitmap); //PrintDebug("Setting up IO Map at 0x%x\n", io_port_bitmap); @@ -195,7 +199,8 @@ 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->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.guest_cr0 = 0x0000000000000010LL; PrintDebug("Created\n"); @@ -230,7 +235,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); @@ -260,7 +265,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); @@ -290,37 +295,52 @@ 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; while (1) { ullong_t tmp_tsc; + uint_t vm_cr_low = 0, vm_cr_high = 0; v3_enable_ints(); v3_clgi(); - // PrintDebug("SVM Entry to rip=%x...\n", info->rip); + + PrintDebug("SVM Entry to rip=%p...\n", (void *)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*)(info->vmm_data), &(info->vm_regs)); + 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("SVM Returned\n"); + + +#if PrintDebug + { + uint_t x = 0; + PrintDebug("RSP=%p\n", (void *)&x); + } +#endif v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc); num_exits++; + PrintDebug("Turning on global interrupts\n"); v3_stgi(); - if ((num_exits % 25) == 0) { - PrintDebug("SVM Exit number %d\n", num_exits); - } + + PrintDebug("SVM Exit number %d\n", num_exits); + if (v3_handle_svm_exit(info) != 0) { @@ -332,27 +352,27 @@ 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: %x\n", linear_addr); + PrintDebug("RIP Linear: %p\n", (void *)linear_addr); v3_print_segments(info); v3_print_ctrl_regs(info); v3_print_GPRs(info); if (info->mem_mode == PHYSICAL_MEM) { - guest_pa_to_host_pa(info, linear_addr, &host_addr); + guest_pa_to_host_va(info, linear_addr, &host_addr); } else if (info->mem_mode == VIRTUAL_MEM) { - guest_va_to_host_pa(info, linear_addr, &host_addr); + guest_va_to_host_va(info, linear_addr, &host_addr); } - 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; @@ -376,7 +396,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"); @@ -391,7 +411,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"); @@ -405,7 +425,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"); @@ -502,7 +522,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);