X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=2e720dad18cdb9ddd4b6e2dbb1ebf3e57c103fda;hb=f9bb3db89469169bb5775dc031d89e570c6fed70;hp=2f11c0c98697260e5874c05d0304b1b1c4b5051f;hpb=702150ed1fe2151f0fcaa111998f09aa461aaf8e;p=palacios.git

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 2f11c0c..2e720da 100644
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -1,3 +1,7 @@
+/* Northwestern University */
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+
+
 #include <palacios/svm.h>
 #include <palacios/vmm.h>
 
@@ -12,7 +16,7 @@
 #include <palacios/vmm_decoder.h>
 
 
-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 +41,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 +72,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 +153,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;
@@ -221,13 +239,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 +256,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,15 +273,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;
 
@@ -302,6 +320,8 @@ static int start_svm_guest(struct guest_info *info) {
       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);
@@ -336,6 +356,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() {
@@ -467,7 +488,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;
@@ -588,10 +609,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;
@@ -749,7 +770,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;