X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=28967fb0b71493074357a9cfa57881ad49d718da;hb=9dd0a80f28ca47a1fb69992dcd96e7526bf5175c;hp=057685dcacf691c94e4aef8ae79f945a948d7d00;hpb=a4b341afa075a6620dd087ee3a8ed850730c05c7;p=palacios.git diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c index 057685d..28967fb 100644 --- a/palacios/src/palacios/svm.c +++ b/palacios/src/palacios/svm.c @@ -9,7 +9,7 @@ #include #include -#include +#include extern struct vmm_os_hooks * os_hooks; @@ -28,6 +28,7 @@ extern uint_t Get_CR3(); extern void DisableInts(); +extern void EnableInts(); @@ -48,14 +49,14 @@ static vmcb_t * Allocate_VMCB() { -static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info vm_info) { +static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA(vmcb); vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA(vmcb); uint_t i; - guest_state->rsp = vm_info.vm_regs.rsp; - // guest_state->rip = vm_info.rip; + guest_state->rsp = vm_info->vm_regs.rsp; + // guest_state->rip = vm_info->rip; guest_state->rip = 0xfff0; guest_state->cpl = 0; @@ -71,20 +72,32 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info vm_info) { // guest_state->cr0 = 0x00000001; // PE ctrl_area->guest_ASID = 1; - ctrl_area->exceptions.de = 1; - ctrl_area->exceptions.df = 1; - ctrl_area->exceptions.pf = 1; - ctrl_area->exceptions.ts = 1; - ctrl_area->exceptions.ss = 1; - ctrl_area->exceptions.ac = 1; - ctrl_area->exceptions.mc = 1; - ctrl_area->exceptions.gp = 1; - ctrl_area->exceptions.ud = 1; - ctrl_area->exceptions.np = 1; - ctrl_area->exceptions.of = 1; - ctrl_area->exceptions.nmi = 1; + + /* + ctrl_area->exceptions.de = 1; + ctrl_area->exceptions.df = 1; + + ctrl_area->exceptions.ts = 1; + ctrl_area->exceptions.ss = 1; + ctrl_area->exceptions.ac = 1; + ctrl_area->exceptions.mc = 1; + ctrl_area->exceptions.gp = 1; + ctrl_area->exceptions.ud = 1; + ctrl_area->exceptions.np = 1; + ctrl_area->exceptions.of = 1; + + ctrl_area->exceptions.nmi = 1; + */ + // Debug of boot on physical machines - 7/14/08 + ctrl_area->instrs.NMI=1; + ctrl_area->instrs.SMI=1; + ctrl_area->instrs.INIT=1; + ctrl_area->instrs.PAUSE=1; + ctrl_area->instrs.shutdown_evts=1; + + - vm_info.vm_regs.rdx = 0x00000f00; + vm_info->vm_regs.rdx = 0x00000f00; guest_state->cr0 = 0x60000010; @@ -121,7 +134,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info vm_info) { guest_state->dr6 = 0x00000000ffff0ff0LL; guest_state->dr7 = 0x0000000000000400LL; - if (vm_info.io_map.num_ports > 0) { + if (vm_info->io_map.num_ports > 0) { vmm_io_hook_t * iter; addr_t io_port_bitmap; @@ -132,7 +145,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info vm_info) { //PrintDebug("Setting up IO Map at 0x%x\n", io_port_bitmap); - FOREACH_IO_HOOK(vm_info.io_map, iter) { + FOREACH_IO_HOOK(vm_info->io_map, iter) { ushort_t port = iter->port; uchar_t * bitmap = (uchar_t *)io_port_bitmap; @@ -154,14 +167,16 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info vm_info) { ctrl_area->instrs.INTR = 1; - if (vm_info.page_mode == SHADOW_PAGING) { + if (vm_info->shdw_pg_mode == SHADOW_PAGING) { PrintDebug("Creating initial shadow page table\n"); - vm_info.shdw_pg_state.shadow_cr3 |= ((addr_t)create_passthrough_pde32_pts(&vm_info) & ~0xfff); + 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->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; - //PrintDebugPageTables((pde32_t*)(vm_info.shdw_pg_state.shadow_cr3.e_reg.low)); + //PrintDebugPageTables((pde32_t*)(vm_info->shdw_pg_state.shadow_cr3.e_reg.low)); ctrl_area->cr_reads.cr3 = 1; ctrl_area->cr_writes.cr3 = 1; @@ -170,26 +185,35 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info vm_info) { ctrl_area->instrs.INVLPG = 1; ctrl_area->instrs.INVLPGA = 1; + ctrl_area->exceptions.pf = 1; + + /* JRL: This is a performance killer, and a simplistic solution */ + /* We need to fix this */ + ctrl_area->TLB_CONTROL = 1; + + + guest_state->g_pat = 0x7040600070406ULL; guest_state->cr0 |= 0x80000000; - } else if (vm_info.page_mode == NESTED_PAGING) { + + } else if (vm_info->shdw_pg_mode == NESTED_PAGING) { // Flush the TLB on entries/exits - //ctrl_area->TLB_CONTROL = 1; + ctrl_area->TLB_CONTROL = 1; // Enable Nested Paging - //ctrl_area->NP_ENABLE = 1; + ctrl_area->NP_ENABLE = 1; - //PrintDebug("NP_Enable at 0x%x\n", &(ctrl_area->NP_ENABLE)); + PrintDebug("NP_Enable at 0x%x\n", &(ctrl_area->NP_ENABLE)); - // Set the Nested Page Table pointer - // ctrl_area->N_CR3 = ((addr_t)vm_info.page_tables); - // ctrl_area->N_CR3 = (addr_t)(vm_info.page_tables); + // Set the Nested Page Table pointer + vm_info->direct_map_pt = ((addr_t)create_passthrough_pde32_pts(vm_info) & ~0xfff); + ctrl_area->N_CR3 = vm_info->direct_map_pt; // ctrl_area->N_CR3 = Get_CR3(); // guest_state->cr3 |= (Get_CR3() & 0xfffff000); - // guest_state->g_pat = 0x7040600070406ULL; + guest_state->g_pat = 0x7040600070406ULL; } @@ -218,7 +242,7 @@ static int init_svm_guest(struct guest_info *info) { PrintDebug("Initializing VMCB (addr=%x)\n", info->vmm_data); - Init_VMCB_BIOS((vmcb_t*)(info->vmm_data), *info); + Init_VMCB_BIOS((vmcb_t*)(info->vmm_data), info); // info->rip = 0; @@ -248,9 +272,10 @@ static int start_svm_guest(struct guest_info *info) { ullong_t tmp_tsc; + EnableInts(); CLGI(); - PrintDebug("SVM Entry...\n"); + // PrintDebug("SVM Entry to rip=%x...\n", info->rip); rdtscll(info->time_state.cached_host_tsc); guest_ctrl->TSC_OFFSET = info->time_state.guest_tsc - info->time_state.cached_host_tsc; @@ -258,7 +283,7 @@ static int start_svm_guest(struct guest_info *info) { safe_svm_launch((vmcb_t*)(info->vmm_data), &(info->vm_regs)); rdtscll(tmp_tsc); - PrintDebug("SVM Returned\n"); + //PrintDebug("SVM Returned\n"); v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc); @@ -273,7 +298,6 @@ static int start_svm_guest(struct guest_info *info) { PrintDebug("SVM ERROR!!\n"); - PrintDebug("RIP: %x\n", guest_state->rip); @@ -281,8 +305,16 @@ static int start_svm_guest(struct guest_info *info) { PrintDebug("RIP Linear: %x\n", linear_addr); + PrintV3Segments(info); + PrintV3CtrlRegs(info); + PrintV3GPRs(info); + + if (info->mem_mode == PHYSICAL_MEM) { + guest_pa_to_host_pa(info, linear_addr, &host_addr); + } else if (info->mem_mode == VIRTUAL_MEM) { + guest_va_to_host_pa(info, linear_addr, &host_addr); + } - guest_pa_to_host_pa(info, linear_addr, &host_addr); PrintDebug("Host Address of rip = 0x%x\n", host_addr); @@ -301,6 +333,60 @@ static int start_svm_guest(struct guest_info *info) { /* Checks machine SVM capability */ /* Implemented from: AMD Arch Manual 3, sect 15.4 */ int is_svm_capable() { + +#if 1 + // Dinda + + uint_t ret; + uint_t vm_cr_low = 0, vm_cr_high = 0; + + + ret = cpuid_ecx(CPUID_FEATURE_IDS); + + PrintDebug("CPUID_FEATURE_IDS_ecx=0x%x\n",ret); + + if ((ret & CPUID_FEATURE_IDS_ecx_svm_avail) == 0) { + PrintDebug("SVM Not Available\n"); + return 0; + } else { + Get_MSR(SVM_VM_CR_MSR, &vm_cr_high, &vm_cr_low); + + PrintDebug("SVM_VM_CR_MSR = 0x%x 0x%x\n",vm_cr_high,vm_cr_low); + + if ((vm_cr_low & SVM_VM_CR_MSR_svmdis) == 1) { + PrintDebug("SVM is available but is disabled.\n"); + + ret = cpuid_edx(CPUID_SVM_REV_AND_FEATURE_IDS); + + PrintDebug("CPUID_FEATURE_IDS_edx=0x%x\n",ret); + + if ((ret & CPUID_SVM_REV_AND_FEATURE_IDS_edx_svml) == 0) { + PrintDebug("SVM BIOS Disabled, not unlockable\n"); + } else { + PrintDebug("SVM is locked with a key\n"); + } + return 0; + + } else { + PrintDebug("SVM is available and enabled.\n"); + + ret = cpuid_edx(CPUID_SVM_REV_AND_FEATURE_IDS); + + PrintDebug("CPUID_FEATURE_IDS_edx=0x%x\n",ret); + + if ((ret & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 0) { + PrintDebug("SVM Nested Paging not supported\n"); + } else { + PrintDebug("SVM Nested Paging supported\n"); + } + + return 1; + + } + } + +#else + uint_t ret = cpuid_ecx(CPUID_FEATURE_IDS); uint_t vm_cr_low = 0, vm_cr_high = 0; @@ -312,11 +398,19 @@ int is_svm_capable() { Get_MSR(SVM_VM_CR_MSR, &vm_cr_high, &vm_cr_low); + PrintDebug("SVM_VM_CR_MSR = 0x%x 0x%x\n",vm_cr_high,vm_cr_low); + + + // this part is clearly wrong, since the np bit is in + // edx, not ecx if ((ret & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 1) { PrintDebug("Nested Paging not supported\n"); + } else { + PrintDebug("Nested Paging supported\n"); } if ((vm_cr_low & SVM_VM_CR_MSR_svmdis) == 0) { + PrintDebug("SVM is disabled.\n"); return 1; } @@ -329,6 +423,26 @@ int is_svm_capable() { } return 0; + +#endif + +} + +int has_svm_nested_paging() { + uint32_t ret; + + ret = cpuid_edx(CPUID_SVM_REV_AND_FEATURE_IDS); + + //PrintDebug("CPUID_FEATURE_IDS_edx=0x%x\n",ret); + + if ((ret & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 0) { + PrintDebug("SVM Nested Paging not supported\n"); + return 0; + } else { + PrintDebug("SVM Nested Paging supported\n"); + return 1; + } + } @@ -361,7 +475,7 @@ void Init_SVM(struct vmm_ctrl_ops * vmm_ops) { // Setup the SVM specific vmm operations vmm_ops->init_guest = &init_svm_guest; vmm_ops->start_guest = &start_svm_guest; - + vmm_ops->has_nested_paging = &has_svm_nested_paging; return; }