X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=46d2e0dac164efdee6133d5a4dfdec715631b425;hb=d38e1d6edeee83bfb1e3e3c6e2367faa5055bdfe;hp=8c650ffa6606113a2350bdbcef91732222689068;hpb=526ffdd06c1afb982d0d9831b99f337b6a094960;p=palacios.git diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c index 8c650ff..46d2e0d 100644 --- a/palacios/src/palacios/svm.c +++ b/palacios/src/palacios/svm.c @@ -1,3 +1,26 @@ +/* + * This file is part of the Palacios Virtual Machine Monitor developed + * by the V3VEE Project with funding from the United States National + * Science Foundation and the Department of Energy. + * + * The V3VEE Project is a joint project between Northwestern University + * and the University of New Mexico. You can find out more at + * http://www.v3vee.org + * + * Copyright (c) 2008, Jack Lange + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Jack Lange + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + + + + + #include #include @@ -10,9 +33,10 @@ #include #include +#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 +61,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); @@ -68,22 +92,48 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { guest_state->efer |= EFER_MSR_svm_enable; guest_state->rflags = 0x00000002; // The reserved bit is always 1 ctrl_area->svm_instrs.VMRUN = 1; + ctrl_area->svm_instrs.VMMCALL = 1; + ctrl_area->svm_instrs.VMLOAD = 1; + ctrl_area->svm_instrs.VMSAVE = 1; + ctrl_area->svm_instrs.STGI = 1; + ctrl_area->svm_instrs.CLGI = 1; + ctrl_area->svm_instrs.SKINIT = 1; + ctrl_area->svm_instrs.RDTSCP = 1; + ctrl_area->svm_instrs.ICEBP = 1; + ctrl_area->svm_instrs.WBINVD = 1; + ctrl_area->svm_instrs.MONITOR = 1; + ctrl_area->svm_instrs.MWAIT_always = 1; + ctrl_area->svm_instrs.MWAIT_if_armed = 1; + + ctrl_area->instrs.HLT = 1; // 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; @@ -123,10 +173,10 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { guest_state->dr7 = 0x0000000000000400LL; 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; @@ -173,6 +223,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; @@ -207,13 +259,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"); @@ -231,6 +276,8 @@ static int init_svm_guest(struct guest_info *info) { Init_VMCB_BIOS((vmcb_t*)(info->vmm_data), info); + info->run_state = VM_STOPPED; + // info->rip = 0; info->vm_regs.rdi = 0; @@ -246,14 +293,20 @@ static int init_svm_guest(struct guest_info *info) { } + // can we start a kernel thread here... -static int start_svm_guest(struct guest_info *info) { + 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)); + info->run_state = VM_RUNNING; + while (1) { ullong_t tmp_tsc; @@ -261,12 +314,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); @@ -274,15 +326,22 @@ 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) { addr_t host_addr; addr_t linear_addr = 0; + info->run_state = VM_ERROR; + PrintDebug("SVM ERROR!!\n"); PrintDebug("RIP: %x\n", guest_state->rip); @@ -292,9 +351,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); @@ -317,6 +376,7 @@ 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() { @@ -448,7 +508,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; @@ -569,10 +629,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; @@ -730,7 +790,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;