changed the io_map implementation to use red-black trees instead of linked list

[palacios.git] / palacios / src / palacios / svm.c

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index f9edbb2..b052eee 100644 (file)
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -35,7 +35,9 @@
 #include <palacios/vmm_decoder.h>
 #include <palacios/vmm_string.h>
 #include <palacios/vmm_lowlevel.h>
+#include <palacios/svm_msr.h>
 
+#include <palacios/vmm_rbtree.h>
 
 
 extern void v3_stgi();
@@ -72,9 +74,12 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
   //ctrl_area->instrs.instrs.CR0 = 1;
   ctrl_area->cr_reads.cr0 = 1;
   ctrl_area->cr_writes.cr0 = 1;
+  //ctrl_area->cr_reads.cr4 = 1;
+  ctrl_area->cr_writes.cr4 = 1;
 
 
   /* Set up the efer to enable 64 bit page tables */
+  /*
   {
     struct efer_64 * efer = (struct efer_64 *)&(guest_state->efer);
     struct cr4_32 * cr4 = (struct cr4_32 *)&(guest_state->cr4);
@@ -83,8 +88,15 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
 
     cr4->pae = 1;
   }
+  */
 
   guest_state->efer |= EFER_MSR_svm_enable;
+  vm_info->guest_efer.value = 0x0LL;
+
+  v3_hook_msr(vm_info, EFER_MSR, 
+             &v3_handle_efer_read,
+             &v3_handle_efer_write, 
+             vm_info);
 
 
 
@@ -124,6 +136,8 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
   
     ctrl_area->exceptions.nmi = 1;
   */
+
+
   // Debug of boot on physical machines - 7/14/08
   ctrl_area->instrs.NMI=1;
   ctrl_area->instrs.SMI=1;
@@ -131,12 +145,11 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
   ctrl_area->instrs.PAUSE=1;
   ctrl_area->instrs.shutdown_evts=1;
 
-
-
   vm_info->vm_regs.rdx = 0x00000f00;
 
   guest_state->cr0 = 0x60000010;
 
+
   guest_state->cs.selector = 0xf000;
   guest_state->cs.limit=0xffff;
   guest_state->cs.base = 0x0000000f0000LL;
@@ -174,8 +187,14 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
   guest_state->dr6 = 0x00000000ffff0ff0LL;
   guest_state->dr7 = 0x0000000000000400LL;
 
-  if (vm_info->io_map.num_ports > 0) {
-    struct vmm_io_hook * iter;
+  
+  
+
+
+
+  if ( !RB_EMPTY_ROOT(&(vm_info->io_map)) ) {
+    struct v3_io_hook * iter;
+    struct rb_node * io_node = v3_rb_first(&(vm_info->io_map));
     addr_t io_port_bitmap;
     
     io_port_bitmap = (addr_t)V3_VAddr(V3_AllocPages(3));
@@ -185,22 +204,23 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
 
     //PrintDebug("Setting up IO Map at 0x%x\n", io_port_bitmap);
 
-    FOREACH_IO_HOOK(vm_info->io_map, iter) {
+    do {
+      iter = rb_entry(io_node, struct v3_io_hook, tree_node);
+
       ushort_t port = iter->port;
       uchar_t * bitmap = (uchar_t *)io_port_bitmap;
 
       bitmap += (port / 8);
       //      PrintDebug("Setting Bit for port 0x%x\n", port);
       *bitmap |= 1 << (port % 8);
-    }
+    } while ((io_node = v3_rb_next(io_node)));
 
 
     //PrintDebugMemDump((uchar_t*)io_port_bitmap, PAGE_SIZE *2);
 
     ctrl_area->instrs.IOIO_PROT = 1;
   }
-
-
+  
 
   PrintDebug("Exiting on interrupts\n");
   ctrl_area->guest_ctrl.V_INTR_MASKING = 1;
@@ -213,16 +233,13 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
 
 
     /* Testing 64 bit page tables for long paged real mode guests */
-    vm_info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pts_64(vm_info));
-    //vm_info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pts_32(vm_info));
+    //    vm_info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pts_64(vm_info));
+    vm_info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pts_32(vm_info));
     /* End Test */
 
-    //vm_info->shdw_pg_state.shadow_cr3 |= (vm_info->direct_map_pt & ~0xfff);
-    vm_info->shdw_pg_state.shadow_cr3 = 0;
     vm_info->shdw_pg_state.guest_cr0 = 0x0000000000000010LL;
     PrintDebug("Created\n");
 
-    //guest_state->cr3 = vm_info->shdw_pg_state.shadow_cr3;
 
     guest_state->cr3 = vm_info->direct_map_pt;
 
@@ -243,7 +260,6 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
     ctrl_area->TLB_CONTROL = 1;
     
 
-
     guest_state->g_pat = 0x7040600070406ULL;
 
     guest_state->cr0 |= 0x80000000;
@@ -268,6 +284,14 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
   }
 
 
+  if (vm_info->msr_map.num_hooks > 0) {
+    PrintDebug("Hooking %d msrs\n", vm_info->msr_map.num_hooks);
+    ctrl_area->MSRPM_BASE_PA = v3_init_svm_msr_map(vm_info);
+    ctrl_area->instrs.MSR_PROT = 1;
+
+  }
+
+
 
 }
 
@@ -344,13 +368,6 @@ static int start_svm_guest(struct guest_info *info) {
     //PrintDebug("SVM Returned\n");
 
 
-#if PrintDebug
-    {
-      uint_t x = 0;
-      PrintDebug("RSP=%p\n", (void *)&x);
-    }
-#endif
-
 
     v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc);
     num_exits++;
@@ -359,12 +376,13 @@ static int start_svm_guest(struct guest_info *info) {
     v3_stgi();
 
 
-    //PrintDebug("SVM Exit number %d\n", num_exits);
-
+    if (num_exits % 25 == 0) {
+      PrintDebug("SVM Exit number %d\n", num_exits);
+    }
 
      
     if (v3_handle_svm_exit(info) != 0) {
-
+      vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
       addr_t host_addr;
       addr_t linear_addr = 0;
 
@@ -381,7 +399,26 @@ static int start_svm_guest(struct guest_info *info) {
       PrintDebug("RIP Linear: %p\n", (void *)linear_addr);
       v3_print_segments(info);
       v3_print_ctrl_regs(info);
+      if (info->shdw_pg_mode == SHADOW_PAGING) {
+       PrintDebug("Shadow Paging Guest Registers:\n");
+       PrintDebug("\tGuest CR0=%p\n", (void *)(addr_t)(info->shdw_pg_state.guest_cr0));
+       PrintDebug("\tGuest CR3=%p\n", (void *)(addr_t)(info->shdw_pg_state.guest_cr3));
+       // efer
+       // CR4
+      }
       v3_print_GPRs(info);
+
+
+      
+
+
+      PrintDebug("SVM Exit Code: %p\n", (void *)(addr_t)guest_ctrl->exit_code); 
+      
+      PrintDebug("exit_info1 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info1));
+      PrintDebug("exit_info1 high = 0x%.8x\n", *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info1)) + 4));
+      
+      PrintDebug("exit_info2 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info2));
+      PrintDebug("exit_info2 high = 0x%.8x\n", *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info2)) + 4));
       
       if (info->mem_mode == PHYSICAL_MEM) {
        guest_pa_to_host_va(info, linear_addr, &host_addr);