Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Added support for SMI interrupt
[palacios.git] / palacios / src / palacios / svm_handler.c
index 54be157..10d3af6 100644 (file)
@@ -1,15 +1,13 @@
 #include <palacios/svm_handler.h>
 #include <palacios/vmm.h>
 #include <palacios/vm_guest_mem.h>
-#include <palacios/vmm_emulate.h>
+#include <palacios/vmm_decoder.h>
 #include <palacios/vmm_ctrl_regs.h>
 #include <palacios/svm_io.h>
+#include <palacios/svm_halt.h>
 #include <palacios/vmm_intr.h>
 
 
-extern struct vmm_os_hooks * os_hooks;
-
-
 int handle_svm_exit(struct guest_info * info) {
   vmcb_ctrl_t * guest_ctrl = 0;
   vmcb_saved_state_t * guest_state = 0;
@@ -23,7 +21,8 @@ int handle_svm_exit(struct guest_info * info) {
   info->rip = guest_state->rip;
   info->vm_regs.rsp = guest_state->rsp;
   info->vm_regs.rax = guest_state->rax;
-  info->vm_regs.rsp = guest_state->rsp;  
+
+  info->cpl = guest_state->cpl;
 
 
   info->ctrl_regs.cr0 = guest_state->cr0;
@@ -38,7 +37,12 @@ int handle_svm_exit(struct guest_info * info) {
 
   exit_code = guest_ctrl->exit_code;
  
-  PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); 
+
+  // Disable printing io exits due to bochs debug messages
+  //if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) {
+
+  PrintDebug("SVM Returned: Exit Code: 0x%x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc); 
+    //  }
   // PrintDebugVMCB((vmcb_t*)(info->vmm_data));
 
 
@@ -103,29 +107,40 @@ int handle_svm_exit(struct guest_info * info) {
     
     PrintDebug("PageFault at %x (error=%d)\n", fault_addr, *error_code);
 
-  
-
-    if (handle_shadow_pagefault(info, fault_addr, *error_code) == -1) {
+    if (info->shdw_pg_mode == SHADOW_PAGING) {
+      if (handle_shadow_pagefault(info, fault_addr, *error_code) == -1) {
+       return -1;
+      }
+    } else {
+      PrintDebug("Page fault in un implemented paging mode\n");
       return -1;
     }
 
+  } else if (exit_code == VMEXIT_INVLPG) {
+    if (info->shdw_pg_mode == SHADOW_PAGING) {
+      PrintDebug("Invlpg\n");
+      if (handle_shadow_invlpg(info) == -1) {
+       return -1;
+      }
+    }
+   
     /*
-      } else if (( (exit_code == VMEXIT_CR3_READ)  ||
-      (exit_code == VMEXIT_CR3_WRITE) ||
-      (exit_code == VMEXIT_INVLPG)    ||
       (exit_code == VMEXIT_INVLPGA)   || 
-      (exit_code == VMEXIT_EXCP14)) && 
-      (info->page_mode == SHADOW_PAGING)) {
-      handle_shadow_paging(info);
     */
     
   } else if (exit_code == VMEXIT_INTR) {
 
     //    handle_svm_intr(info);
 
+  } else if (exit_code == VMEXIT_SMI) { 
+
+    //   handle_svm_smi(info); // ignored for now
+
   } else if (exit_code == VMEXIT_HLT) {
     PrintDebug("Guest halted\n");
-    return -1;
+    if (handle_svm_halt(info) == -1) {
+      return -1;
+    }
   } else {
     addr_t rip_addr;
     char buf[15];
@@ -150,8 +165,18 @@ int handle_svm_exit(struct guest_info * info) {
 
     
 
-    if (guest_pa_to_host_pa(info, guest_state->rip, &host_addr) == -1) {
-      PrintDebug("Could not translate guest_state->rip to host address\n");
+    if (info->mem_mode == PHYSICAL_MEM) {
+      if (guest_pa_to_host_pa(info, guest_state->rip, &host_addr) == -1) {
+       PrintDebug("Could not translate guest_state->rip to host address\n");
+       return -1;
+      }
+    } else if (info->mem_mode == VIRTUAL_MEM) {
+      if (guest_va_to_host_pa(info, guest_state->rip, &host_addr) == -1) {
+       PrintDebug("Could not translate guest_state->rip to host address\n");
+       return -1;
+      }
+    } else {
+      PrintDebug("Invalid memory mode\n");
       return -1;
     }
 
@@ -161,7 +186,11 @@ int handle_svm_exit(struct guest_info * info) {
     
     PrintDebug("Reading from 0x%x in guest\n", rip_addr);
     
-    read_guest_pa_memory(info, rip_addr, 15, buf);
+    if (info->mem_mode == PHYSICAL_MEM) {
+      read_guest_pa_memory(info, rip_addr, 15, buf);
+    } else {
+      read_guest_va_memory(info, rip_addr, 15, buf);
+    }
 
     PrintTraceMemDump(buf, 15);
 
@@ -178,10 +207,19 @@ int handle_svm_exit(struct guest_info * info) {
     case EXTERNAL_IRQ: 
       {
        uint_t irq = get_intr_number(info);
-       guest_ctrl->EVENTINJ.vector = irq;
-       guest_ctrl->EVENTINJ.valid = 1;
-       guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
+       /*      
+         guest_ctrl->EVENTINJ.vector = irq;
+         guest_ctrl->EVENTINJ.valid = 1;
+         guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
+       */
        
+       guest_ctrl->guest_ctrl.V_IRQ = 1;
+       guest_ctrl->guest_ctrl.V_INTR_VECTOR = irq;
+       guest_ctrl->guest_ctrl.V_IGN_TPR = 1;
+       guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf;
+
+       PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->guest_ctrl.V_INTR_VECTOR, info->rip);
+
        injecting_intr(info, irq, EXTERNAL_IRQ);
        
        break;
@@ -198,17 +236,20 @@ int handle_svm_exit(struct guest_info * info) {
        if (info->intr_state.excp_error_code) {
          guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code;
          guest_ctrl->EVENTINJ.ev = 1;
+         PrintDebug("Injecting error code %x\n", guest_ctrl->EVENTINJ.error_code);
        }
        
        guest_ctrl->EVENTINJ.vector = excp;
        
+       guest_ctrl->EVENTINJ.valid = 1;
+       PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip);
        injecting_intr(info, excp, EXCEPTION);
        break;
       }
-    case SOFTWARE:
+    case SOFTWARE_INTR:
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR;
       break;
-    case VIRTUAL:
+    case VIRTUAL_INTR:
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_VIRTUAL_INTR;
       break;
 
@@ -218,15 +259,6 @@ int handle_svm_exit(struct guest_info * info) {
       return -1;
     }
 
-
-    PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip);
-
-
-    // IMPORTANT TODO
-    // We need to figure out stack parameters....
-
-    //EVENTINJ.error_code
-
   }
 
 
@@ -238,6 +270,8 @@ int handle_svm_exit(struct guest_info * info) {
   guest_state->rflags = info->ctrl_regs.rflags;
 
 
+  guest_state->cpl = info->cpl;
+
   guest_state->rax = info->vm_regs.rax;
   guest_state->rip = info->rip;
   guest_state->rsp = info->vm_regs.rsp;
@@ -252,34 +286,3 @@ int handle_svm_exit(struct guest_info * info) {
   return 0;
 }
 
-
-
-
-int handle_shadow_paging(struct guest_info * info) {
-  vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
-  //  vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data));
-
-  if (guest_ctrl->exit_code == VMEXIT_CR3_READ) {
-
-  }
-
-  return 0;
-}
-
-
-
-int handle_svm_intr(struct guest_info * info) {
-  vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
-  // vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data));
-
-  //struct Interrupt_Info * int_info = &(guest_ctrl->exit_int_info);
-
-  //struct vmm_irq_hook * get_irq_hook(&(info->irq_map), int_info->vector);
-
-  PrintDebug("SVM Returned: Exit Code: %x\n",guest_ctrl->exit_code); 
-  PrintDebug("V_INTR_VECTOR: 0x%x\n", guest_ctrl->guest_ctrl.V_INTR_VECTOR);
-
-  while(1);
-    
-  return 0;
-}