X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=55bda95f784da3abf66ef94b2a6000b282e0a66f;hb=57e3d7d1e671a261befef967b4a441e5d7dc2303;hp=8f6d1dcb2894fe21369c452a8d07868973a66a28;hpb=4948dac4512d3087f05daeced0f60bafbcb8fd8f;p=palacios-OLD.git diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c index 8f6d1dc..55bda95 100644 --- a/palacios/src/palacios/svm.c +++ b/palacios/src/palacios/svm.c @@ -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; @@ -73,7 +74,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info vm_info) { 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; @@ -84,7 +85,16 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info vm_info) { ctrl_area->exceptions.of = 1; ctrl_area->exceptions.nmi = 1; - vm_info.vm_regs.rdx = 0x00000f00; + // 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; guest_state->cr0 = 0x60000010; @@ -121,7 +131,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 +142,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 +164,16 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info vm_info) { ctrl_area->instrs.INTR = 1; - if (vm_info.shdw_pg_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,6 +182,8 @@ 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; @@ -180,23 +194,23 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info vm_info) { guest_state->cr0 |= 0x80000000; - } else if (vm_info.shdw_pg_mode == NESTED_PAGING) { + } else if (vm_info->shdw_pg_mode == NESTED_PAGING) { // Flush the TLB on entries/exits - + 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; } @@ -225,7 +239,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; @@ -255,6 +269,7 @@ static int start_svm_guest(struct guest_info *info) { ullong_t tmp_tsc; + EnableInts(); CLGI(); PrintDebug("SVM Entry to rip=%x...\n", info->rip); @@ -287,7 +302,9 @@ 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); @@ -408,6 +425,23 @@ int is_svm_capable() { } +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; + } + +} + void Init_SVM(struct vmm_ctrl_ops * vmm_ops) { @@ -438,7 +472,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; }