X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=7cf20ab0d9287a0bc517cc12ec8618590948cc05;hb=1c46db5ec8d086d76f7120a638199564947694d3;hp=28967fb0b71493074357a9cfa57881ad49d718da;hpb=9dd0a80f28ca47a1fb69992dcd96e7526bf5175c;p=palacios.releases.git diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c index 28967fb..7cf20ab 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,6 +92,20 @@ 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; @@ -135,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; @@ -150,7 +188,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { uchar_t * bitmap = (uchar_t *)io_port_bitmap; bitmap += (port / 8); - PrintDebug("Setting Bit for port 0x%x\n", port); + // PrintDebug("Setting Bit for port 0x%x\n", port); *bitmap |= 1 << (port % 8); } @@ -221,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"); @@ -245,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; @@ -260,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; @@ -287,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); @@ -319,7 +365,7 @@ static int start_svm_guest(struct guest_info *info) { PrintDebug("Host Address of rip = 0x%x\n", host_addr); PrintDebug("Instr (15 bytes) at %x:\n", host_addr); - PrintTraceMemDump((char*)host_addr, 15); + PrintTraceMemDump((uchar_t *)host_addr, 15); break; } @@ -330,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() { @@ -461,13 +508,15 @@ 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; + /* 64-BIT-ISSUE */ + // msr.e_reg.high = 0; + //msr.e_reg.low = (uint_t)host_state; + msr.r_reg = (addr_t)host_state; - PrintDebug("Host State being saved at %x\n", (uint_t)host_state); + PrintDebug("Host State being saved at %x\n", (addr_t)host_state); Set_MSR(SVM_VM_HSAVE_PA_MSR, msr.e_reg.high, msr.e_reg.low); @@ -582,10 +631,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; @@ -743,7 +792,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;