X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=ee2c4fd0adeccadfa7f7dc4f9ed3878438e688d4;hb=62406cf6b87a27a62921ce09a0aa44780ea25c06;hp=52a0a5ff96bfeedc65b97c8b11414ab195336d9b;hpb=564e23ffc7505181975a4f82a5e8b0c88e535945;p=palacios.git diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c index 52a0a5f..ee2c4fd 100644 --- a/palacios/src/palacios/svm.c +++ b/palacios/src/palacios/svm.c @@ -35,10 +35,7 @@ #include #include #include - - - -extern uint_t Get_CR3(); +#include @@ -59,7 +56,7 @@ static vmcb_t * Allocate_VMCB() { - +#include static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA(vmcb); @@ -76,8 +73,31 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { //ctrl_area->instrs.instrs.CR0 = 1; ctrl_area->cr_reads.cr0 = 1; ctrl_area->cr_writes.cr0 = 1; + ctrl_area->cr_reads.cr4 = 1; + ctrl_area->cr_writes.cr4 = 1; + + + /* Set up the efer to enable 64 bit page tables */ + /* + { + struct efer_64 * efer = (struct efer_64 *)&(guest_state->efer); + struct cr4_32 * cr4 = (struct cr4_32 *)&(guest_state->cr4); + efer->lma = 1; + efer->lme = 1; + + cr4->pae = 1; + } + */ guest_state->efer |= EFER_MSR_svm_enable; + + v3_hook_msr(vm_info, EFER_MSR, + NULL, /*&v3_handle_efer_read,*/ + &v3_handle_efer_write, + vm_info); + + + guest_state->rflags = 0x00000002; // The reserved bit is always 1 ctrl_area->svm_instrs.VMRUN = 1; ctrl_area->svm_instrs.VMMCALL = 1; @@ -114,6 +134,8 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { ctrl_area->exceptions.nmi = 1; */ + + // Debug of boot on physical machines - 7/14/08 ctrl_area->instrs.NMI=1; ctrl_area->instrs.SMI=1; @@ -121,8 +143,6 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { ctrl_area->instrs.PAUSE=1; ctrl_area->instrs.shutdown_evts=1; - - vm_info->vm_regs.rdx = 0x00000f00; guest_state->cr0 = 0x60000010; @@ -164,6 +184,11 @@ 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) { struct vmm_io_hook * iter; addr_t io_port_bitmap; @@ -189,8 +214,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { ctrl_area->instrs.IOIO_PROT = 1; } - - + PrintDebug("Exiting on interrupts\n"); ctrl_area->guest_ctrl.V_INTR_MASKING = 1; @@ -199,13 +223,23 @@ 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 = V3_PAddr((addr_t)create_passthrough_pde32_pts(vm_info)); - vm_info->shdw_pg_state.shadow_cr3 |= (vm_info->direct_map_pt & ~0xfff); + + + /* Testing 64 bit page tables for long paged real mode guests */ + // vm_info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pts_64(vm_info)); + vm_info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pts_32(vm_info)); + /* End Test */ + + //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)); @@ -223,7 +257,6 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { ctrl_area->TLB_CONTROL = 1; - guest_state->g_pat = 0x7040600070406ULL; guest_state->cr0 |= 0x80000000; @@ -238,7 +271,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { 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); + vm_info->direct_map_pt = ((addr_t)create_passthrough_pts_32(vm_info) & ~0xfff); ctrl_area->N_CR3 = vm_info->direct_map_pt; // ctrl_area->N_CR3 = Get_CR3(); @@ -248,6 +281,14 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { } + if (vm_info->msr_map.num_hooks > 0) { + PrintDebug("Hooking %d msrs\n", vm_info->msr_map.num_hooks); + ctrl_area->MSRPM_BASE_PA = v3_init_svm_msr_map(vm_info); + ctrl_area->instrs.MSR_PROT = 1; + + } + + } @@ -324,13 +365,6 @@ static int start_svm_guest(struct guest_info *info) { //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++; @@ -339,12 +373,13 @@ static int start_svm_guest(struct guest_info *info) { v3_stgi(); - //PrintDebug("SVM Exit number %d\n", num_exits); - + if (num_exits % 25 == 0) { + PrintDebug("SVM Exit number %d\n", num_exits); + } if (v3_handle_svm_exit(info) != 0) { - + vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data)); addr_t host_addr; addr_t linear_addr = 0; @@ -352,7 +387,7 @@ static int start_svm_guest(struct guest_info *info) { PrintDebug("SVM ERROR!!\n"); - PrintDebug("RIP: %p\n", (void *)guest_state->rip); + PrintDebug("RIP: %p\n", (void *)(addr_t)(guest_state->rip)); linear_addr = get_addr_linear(info, guest_state->rip, &(info->segments.cs)); @@ -362,6 +397,16 @@ static int start_svm_guest(struct guest_info *info) { v3_print_segments(info); v3_print_ctrl_regs(info); v3_print_GPRs(info); + + + + PrintDebug("SVM Exit Code: %p\n", (void *)(addr_t)guest_ctrl->exit_code); + + PrintDebug("exit_info1 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info1)); + PrintDebug("exit_info1 high = 0x%.8x\n", *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info1)) + 4)); + + PrintDebug("exit_info2 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info2)); + PrintDebug("exit_info2 high = 0x%.8x\n", *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info2)) + 4)); if (info->mem_mode == PHYSICAL_MEM) { guest_pa_to_host_va(info, linear_addr, &host_addr); @@ -668,7 +713,7 @@ void v3_init_SVM(struct v3_ctrl_ops * vmm_ops) { if (vm_info.page_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.shdw_pg_state.shadow_cr3 |= ((addr_t)create_passthrough_pts_32(&vm_info) & ~0xfff); PrintDebug("Created\n"); guest_state->cr3 = vm_info.shdw_pg_state.shadow_cr3;