X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=37e022438aa417f53291a5bf7ea6583bb438755a;hb=783acda8c0173cb6ad0331ca26c69f7a83b2f377;hp=1bd42419ce12ba9149c53d64fe6e5e520fff9a4a;hpb=d4073a9dbe24ae160b8d6bd8fd5fd4ad8aa995a3;p=palacios.releases.git diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c index 1bd4241..37e0224 100644 --- a/palacios/src/palacios/svm.c +++ b/palacios/src/palacios/svm.c @@ -12,7 +12,7 @@ #include -extern struct vmm_os_hooks * os_hooks; + extern uint_t cpuid_ecx(uint_t op); extern uint_t cpuid_edx(uint_t op); @@ -37,7 +37,7 @@ extern void EnableInts(); static vmcb_t * Allocate_VMCB() { - vmcb_t * vmcb_page = (vmcb_t*)os_hooks->allocate_pages(1); + vmcb_t * vmcb_page = (vmcb_t *)V3_AllocPages(1); memset(vmcb_page, 0, 4096); @@ -49,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; @@ -72,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; @@ -122,18 +134,18 @@ 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) { - vmm_io_hook_t * iter; + if (vm_info->io_map.num_ports > 0) { + struct vmm_io_hook * iter; addr_t io_port_bitmap; - io_port_bitmap = (addr_t)os_hooks->allocate_pages(3); + io_port_bitmap = (addr_t)V3_AllocPages(3); memset((uchar_t*)io_port_bitmap, 0, PAGE_SIZE * 3); ctrl_area->IOPM_BASE_PA = io_port_bitmap; //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; @@ -155,15 +167,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.shdw_pg_state.guest_cr0 = 0x0000000000000010LL; + 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; @@ -172,6 +185,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; @@ -182,7 +197,7 @@ 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; @@ -192,7 +207,8 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info vm_info) { PrintDebug("NP_Enable at 0x%x\n", &(ctrl_area->NP_ENABLE)); // Set the Nested Page Table pointer - ctrl_area->N_CR3 = ((addr_t)create_passthrough_pde32_pts(&vm_info) & ~0xfff); + 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); @@ -205,13 +221,6 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info vm_info) { } - - - - - - - static int init_svm_guest(struct guest_info *info) { PrintDebug("Allocating VMCB\n"); @@ -226,7 +235,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,6 +257,7 @@ static int init_svm_guest(struct guest_info *info) { static int start_svm_guest(struct guest_info *info) { vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data)); vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data)); + uint_t num_exits = 0; PrintDebug("Launching SVM VM (vmcb=%x)\n", info->vmm_data); //PrintDebugVMCB((vmcb_t*)(info->vmm_data)); @@ -259,12 +269,11 @@ static int start_svm_guest(struct guest_info *info) { EnableInts(); CLGI(); - PrintDebug("SVM Entry to rip=%x...\n", info->rip); + // 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; - PrintDebug("Launching\n"); safe_svm_launch((vmcb_t*)(info->vmm_data), &(info->vm_regs)); rdtscll(tmp_tsc); @@ -272,9 +281,14 @@ static int start_svm_guest(struct guest_info *info) { v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc); + num_exits++; STGI(); + if ((num_exits % 25) == 0) { + PrintDebug("SVM Exit number %d\n", num_exits); + } + if (handle_svm_exit(info) != 0) { @@ -290,9 +304,9 @@ static int start_svm_guest(struct guest_info *info) { PrintDebug("RIP Linear: %x\n", linear_addr); - PrintV3Segments(&(info->segments)); - PrintV3CtrlRegs(&(info->ctrl_regs)); - + PrintV3Segments(info); + PrintV3CtrlRegs(info); + PrintV3GPRs(info); if (info->mem_mode == PHYSICAL_MEM) { guest_pa_to_host_pa(info, linear_addr, &host_addr); @@ -446,7 +460,7 @@ void Init_SVM(struct vmm_ctrl_ops * vmm_ops) { // Setup the host state save area - host_state = os_hooks->allocate_pages(4); + host_state = V3_AllocPages(4); msr.e_reg.high = 0; msr.e_reg.low = (uint_t)host_state; @@ -567,10 +581,10 @@ void Init_SVM(struct vmm_ctrl_ops * vmm_ops) { } if (vm_info.io_map.num_ports > 0) { - vmm_io_hook_t * iter; + struct vmm_io_hook * iter; addr_t io_port_bitmap; - io_port_bitmap = (addr_t)os_hooks->allocate_pages(3); + io_port_bitmap = (addr_t)V3_AllocPages(3); memset((uchar_t*)io_port_bitmap, 0, PAGE_SIZE * 3); ctrl_area->IOPM_BASE_PA = io_port_bitmap; @@ -728,7 +742,7 @@ void Init_VMCB_pe(vmcb_t *vmcb, struct guest_info vm_info) { ctrl_area->instrs.IOIO_PROT = 1; - ctrl_area->IOPM_BASE_PA = (uint_t)os_hooks->allocate_pages(3); + ctrl_area->IOPM_BASE_PA = (uint_t)V3_AllocPages(3); { reg_ex_t tmp_reg;