X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=f7916fca4693132e791e48ac3e66fe022c969979;hb=a4b341afa075a6620dd087ee3a8ed850730c05c7;hp=a2e7e14e5443dcea85820d8db74eb11bf1705c6f;hpb=ace8f0532fa5650c6642a3a7174f3aa19b09095a;p=palacios.git

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index a2e7e14..f7916fc 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -2,12 +2,10 @@
 #include <palacios/vmm.h>
 #include <palacios/vm_guest_mem.h>
 #include <palacios/vmm_emulate.h>
-#include <palacios/svm_ctrl_regs.h>
+#include <palacios/vmm_ctrl_regs.h>
 #include <palacios/svm_io.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;
@@ -22,11 +20,28 @@ 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;
+  info->ctrl_regs.cr2 = guest_state->cr2;
+  info->ctrl_regs.cr3 = guest_state->cr3;
+  info->ctrl_regs.cr4 = guest_state->cr4;
+  info->ctrl_regs.cr8 = guest_ctrl->guest_ctrl.V_TPR;
+  info->ctrl_regs.rflags = guest_state->rflags;
+
+  get_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments));
 
 
   exit_code = guest_ctrl->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: %x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc); 
+    //  }
   // PrintDebugVMCB((vmcb_t*)(info->vmm_data));
 
 
@@ -66,25 +81,69 @@ int handle_svm_exit(struct guest_info * info) {
     if (handle_cr0_write(info) == -1) {
       return -1;
     }
+  } else if (exit_code == VMEXIT_CR0_READ) {
+    PrintDebug("CR0 Read\n");
+
+    if (handle_cr0_read(info) == -1) {
+      return -1;
+    }
+  } else if (exit_code == VMEXIT_CR3_WRITE) {
+    PrintDebug("CR3 Write\n");
+
+    if (handle_cr3_write(info) == -1) {
+      return -1;
+    }    
+  } else if (exit_code == VMEXIT_CR3_READ) {
+    PrintDebug("CR3 Read\n");
+
+    if (handle_cr3_read(info) == -1) {
+      return -1;
+    }
+
+  } else if (exit_code == VMEXIT_EXCP14) {
+    addr_t fault_addr = guest_ctrl->exit_info2;
+    pf_error_t * error_code = (pf_error_t *)&(guest_ctrl->exit_info1);
+    
+    PrintDebug("PageFault at %x (error=%d)\n", fault_addr, *error_code);
+
+    if (info->page_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->page_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);
+      (exit_code == VMEXIT_INVLPGA)   || 
     */
-
+    
   } else if (exit_code == VMEXIT_INTR) {
 
     //    handle_svm_intr(info);
+
+  } else if (exit_code == VMEXIT_HLT) {
+    PrintDebug("Guest halted\n");
+    return -1;
   } else {
-    addr_t rip_addr = get_addr_linear(info, guest_state->rip, guest_state->cs.selector);
+    addr_t rip_addr;
     char buf[15];
     addr_t host_addr;
 
 
+    rip_addr = get_addr_linear(info, guest_state->rip, &(info->segments.cs));
+
+
+
     PrintDebug("SVM Returned:(VMCB=%x)\n", info->vmm_data); 
     PrintDebug("RIP: %x\n", guest_state->rip);
     PrintDebug("RIP Linear: %x\n", rip_addr);
@@ -121,21 +180,49 @@ int handle_svm_exit(struct guest_info * info) {
 
   // Update the low level state
 
-  if (intr_pending(&(info->intr_state))) {
-    guest_ctrl->EVENTINJ.vector = get_intr_number(&(info->intr_state));
-    guest_ctrl->EVENTINJ.valid = 1;
- 
-    switch (get_intr_type(&(info->intr_state))) {
-    case EXTERNAL_IRQ:
-      guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
-      break;
+  if (intr_pending(info)) {
+
+    switch (get_intr_type(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->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;
+      }
     case NMI:
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_NMI;
       break;
     case EXCEPTION:
-      guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION;
-      guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code;
-      break;
+      {
+	uint_t excp = get_intr_number(info);
+
+	guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION;
+	
+	if (info->intr_state.excp_error_code) {
+	  guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code;
+	  guest_ctrl->EVENTINJ.ev = 1;
+	}
+	
+	guest_ctrl->EVENTINJ.vector = excp;
+	
+	PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip);
+	injecting_intr(info, excp, EXCEPTION);
+	break;
+      }
     case SOFTWARE:
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR;
       break;
@@ -149,59 +236,30 @@ int handle_svm_exit(struct guest_info * info) {
       return -1;
     }
 
-    // IMPORTANT TODO
-    // We need to figure out stack parameters....
-
-    //EVENTINJ.error_code
-
   }
 
-  guest_state->rax = info->vm_regs.rax;
-  guest_state->rip = info->rip;
-  guest_state->rsp = info->vm_regs.rsp;
 
-  return 0;
-}
+  guest_state->cr0 = info->ctrl_regs.cr0;
+  guest_state->cr2 = info->ctrl_regs.cr2;
+  guest_state->cr3 = info->ctrl_regs.cr3;
+  guest_state->cr4 = info->ctrl_regs.cr4;
+  guest_ctrl->guest_ctrl.V_TPR = info->ctrl_regs.cr8 & 0xff;
+  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;
 
-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) {
+  set_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments));
 
+  if (exit_code == VMEXIT_INTR) {
+    PrintDebug("INTR ret IP = %x\n", guest_state->rip);
   }
 
   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;
-}