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.


timer fixes
[palacios.git] / palacios / src / palacios / vmm_config.c
index 5114521..4067160 100644 (file)
 #include <palacios/vmm_config.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_debug.h>
+#include <palacios/vmm_msr.h>
+#include <palacios/vmm_decoder.h>
+#include <palacios/vmm_profiler.h>
+#include <palacios/vmm_mem.h>
 
 
 #include <devices/serial.h>
@@ -31,6 +35,9 @@
 #include <devices/ramdisk.h>
 #include <devices/cdrom.h>
 #include <devices/bochs_debug.h>
+#include <devices/os_debug.h>
+#include <devices/apic.h>
+
 
 
 #include <palacios/vmm_host_events.h>
 
 
 
+static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr);
+static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr);
+static struct vm_device *  configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr);
 
-static int mem_test_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) {
-  int foo = 20;
 
 
-  memcpy(dst, &foo, length);
 
-  PrintDebug("Passthrough mem read returning: %p (length=%d)\n", (void *)(foo + (guest_addr & 0xfff)), length);
-  return length;
-}
+static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) {
 
-static int passthrough_mem_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) {
-    memcpy(dst, (void*)guest_addr, length);
-    return length;
-}
+  return length;
+  //  memcpy((void*)guest_addr, src, length);
+  PrintDebug("Write of %d bytes to %p\n", length, (void *)guest_addr);
+  PrintDebug("Write Value = %p\n", (void *)*(addr_t *)src);
 
-static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) {
-  memcpy((void*)guest_addr, src, length);
   return length;
 }
 
@@ -69,13 +72,17 @@ static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, v
 int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
   extern v3_cpu_arch_t v3_cpu_type;
 
-
-  int use_ramdisk = config_ptr->use_ramdisk;
-  int use_generic = USE_GENERIC;
-
-
+  // Initialize the subsystem data strutures
   v3_init_time(info);
-  init_shadow_map(info);
+  v3_init_io_map(info);
+  v3_init_msr_map(info);
+  v3_init_interrupt_state(info);
+  v3_init_dev_mgr(info);
+  v3_init_host_events(info);
+
+  v3_init_decoder(info);
+  
+  v3_init_shadow_map(info);
   
   if (v3_cpu_type == V3_SVM_REV3_CPU) {
     info->shdw_pg_mode = NESTED_PAGING;
@@ -84,20 +91,44 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
     info->shdw_pg_mode = SHADOW_PAGING;
   }
   
+  // Initial CPU operating mode
   info->cpu_mode = REAL;
   info->mem_mode = PHYSICAL_MEM;
-  
+
+  // Amount of ram the Guest will have
+  info->mem_size = config_ptr->mem_size;
+
+  // Configure the memory map for the guest
+  setup_memory_map(info, config_ptr);
+
+  // Configure the devices for the guest
+  setup_devices(info, config_ptr);
  
-  v3_init_vmm_io_map(info);
-  v3_init_interrupt_state(info);
-  
-  v3_init_dev_mgr(info);
 
-  v3_init_emulator(info);
+
+  if (config_ptr->enable_profiling) {
+    info->enable_profiler = 1;
+    v3_init_profiler(info);
+  } else {
+    info->enable_profiler = 0;
+  }
+
+  //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
+
+  // Setup initial cpu register state
+  info->rip = 0xfff0;
+  info->vm_regs.rsp = 0x0;
   
-  v3_init_host_events(info);
 
+  return 0;
+}
+
+
+/* TODO:
+ * The amount of guest memory is stored in info->mem_size
+ * We need to make sure the memory map extends to cover it
+ */
+static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr) {
 
   /* layout rombios */
   {
@@ -107,7 +138,7 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
     PrintDebug("Layout Region %d bytes\n", config_ptr->rombios_size);
     memcpy(V3_VAddr(guest_mem), config_ptr->rombios, config_ptr->rombios_size);
 
-    add_shadow_region_passthrough(info, ROMBIOS_START, ROMBIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
+    v3_add_shadow_mem(info, ROMBIOS_START, ROMBIOS_START + (num_pages * PAGE_SIZE) - 1, (addr_t)guest_mem);
     
     PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", 
               (void *)ROMBIOS_START, 
@@ -124,7 +155,7 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
     PrintDebug("Layout Region %d bytes\n", config_ptr->vgabios_size);
     memcpy(V3_VAddr(guest_mem), config_ptr->vgabios, config_ptr->vgabios_size);
 
-    add_shadow_region_passthrough(info, VGABIOS_START, VGABIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
+    v3_add_shadow_mem(info, VGABIOS_START, VGABIOS_START + (num_pages * PAGE_SIZE) - 1, (addr_t)guest_mem);
     
     PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", 
               (void *)VGABIOS_START, 
@@ -133,46 +164,51 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
   }
 
       //     
-  add_shadow_region_passthrough(info, 0x0, 0xa0000, (addr_t)V3_AllocPages(160));
+  v3_add_shadow_mem(info, 0x0, 0x9ffff, (addr_t)V3_AllocPages(160));
   
-  if (1) {
-    add_shadow_region_passthrough(info, 0xa0000, 0xc0000, 0xa0000); 
+  if (0) {
+    v3_add_shadow_mem(info, 0xa0000, 0xbffff, 0xa0000); 
   } else {
-    hook_guest_mem(info, 0xa0000, 0xc0000, passthrough_mem_read, passthrough_mem_write, NULL);
+    v3_hook_write_mem(info, 0xa0000, 0xbffff, 0xa0000,  passthrough_mem_write, NULL);
   }  
   
   // TEMP
   //add_shadow_region_passthrough(info, 0xc0000, 0xc8000, 0xc0000);
   
   if (1) {
-    add_shadow_region_passthrough(info, 0xc7000, 0xc8000, (addr_t)V3_AllocPages(1));
-    if (add_shadow_region_passthrough(info, 0xc8000, 0xf0000, (addr_t)V3_AllocPages(40)) == -1) {
+    v3_add_shadow_mem(info, 0xc7000, 0xc8000, (addr_t)V3_AllocPages(1));
+    if (v3_add_shadow_mem(info, 0xc8000, 0xf0000, (addr_t)V3_AllocPages(40)) == -1) {
       PrintDebug("Error adding shadow region\n");
     }
   } else {
-    add_shadow_region_passthrough(info, 0xc0000, 0xc8000, 0xc0000);
-    add_shadow_region_passthrough(info, 0xc8000, 0xf0000, 0xc8000);
+    v3_add_shadow_mem(info, 0xc0000, 0xc8000, 0xc0000);
+    v3_add_shadow_mem(info, 0xc8000, 0xf0000, 0xc8000);
   }
   
   
   if (1) {
-  add_shadow_region_passthrough(info, 0x100000, 0x1000000, (addr_t)V3_AllocPages(4096));
+    v3_add_shadow_mem(info, 0x100000, 0x1000000, (addr_t)V3_AllocPages(4096));
   } else {
     /* MEMORY HOOK TEST */
-    add_shadow_region_passthrough(info, 0x100000, 0xa00000, (addr_t)V3_AllocPages(2304));
-    hook_guest_mem(info, 0xa00000, 0xa01000, mem_test_read, passthrough_mem_write, NULL); 
-    add_shadow_region_passthrough(info, 0xa01000, 0x1000000, (addr_t)V3_AllocPages(1791));
+    v3_add_shadow_mem(info, 0x100000, 0xa00000, (addr_t)V3_AllocPages(2304));
+    v3_hook_write_mem(info, 0xa00000, 0xa01000, (addr_t)V3_AllocPages(1), passthrough_mem_write, NULL); 
+    v3_add_shadow_mem(info, 0xa01000, 0x1000000, (addr_t)V3_AllocPages(1791));
   }
 
-    add_shadow_region_passthrough(info, 0x1000000, 0x8000000, (addr_t)V3_AllocPages(32768));
+  v3_add_shadow_mem(info, 0x1000000, 0x8000000, (addr_t)V3_AllocPages(32768));
  
   // test - give linux accesss to PCI space - PAD
-  add_shadow_region_passthrough(info, 0xc0000000,0xffffffff,0xc0000000);
+  //v3_add_shadow_mem(info, 0xc0000000,0xffffffff,0xc0000000);
   
   
-  print_shadow_map(&(info->mem_map));
-  
-  {
+  print_shadow_map(info);
+
+  return 0;
+}
+
+
+
+static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
     struct vm_device * ramdisk = NULL;
     struct vm_device * cdrom = NULL;
     struct vm_device * nvram = v3_create_nvram();
@@ -181,11 +217,14 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
     struct vm_device * keyboard = v3_create_keyboard();
     struct vm_device * pit = v3_create_pit(); 
     struct vm_device * bochs_debug = v3_create_bochs_debug();
+    struct vm_device * os_debug = v3_create_os_debug();
+    struct vm_device * apic = v3_create_apic();
 
     //struct vm_device * serial = v3_create_serial();
     struct vm_device * generic = NULL;
 
-
+    int use_ramdisk = config_ptr->use_ramdisk;
+    int use_generic = USE_GENERIC;
 
 
     if (use_ramdisk) {
@@ -196,8 +235,63 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
     
     
     if (use_generic) {
+      generic = configure_generic(info, config_ptr);
+    }
+
+
+    v3_attach_device(info, nvram);
+    //v3_attach_device(info, timer);
+    v3_attach_device(info, pic);
+    v3_attach_device(info, pit);
+    v3_attach_device(info, keyboard);
+    // v3_attach_device(info, serial);
+    v3_attach_device(info, bochs_debug);
+    v3_attach_device(info, os_debug);
+
+    v3_attach_device(info, apic);
+
+    if (use_ramdisk) {
+      v3_attach_device(info, ramdisk);
+      v3_attach_device(info, cdrom);
+    }
+
+    if (use_generic) {
+      // Important that this be attached last!
+      v3_attach_device(info, generic);
+    }
+    
+    PrintDebugDevMgr(info);
+
+
+    // give keyboard interrupts to vm
+    // no longer needed since we have a keyboard device
+    //hook_irq(&vm_info, 1);
+    
+#if 0
+    // give floppy controller to vm
+    v3_hook_passthrough_irq(info, 6);
+#endif
+    
+    
+    if (!use_ramdisk) {
+      PrintDebug("Hooking IDE IRQs\n");
+      
+      //primary ide
+      v3_hook_passthrough_irq(info, 14);
+      
+      // secondary ide
+      v3_hook_passthrough_irq(info, 15);    
+    }  
+    
+
+  return 0;
+}
+
+
+
+static struct vm_device *  configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr) {
       PrintDebug("Creating Generic Device\n");
-      generic = v3_create_generic();
+      struct vm_device * generic = v3_create_generic();
       
       // Make the DMA controller invisible
       v3_generic_add_port_range(generic, 0x00, 0x07, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channels 0,1,2,3 (address, counter)
@@ -301,60 +395,9 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
       
       v3_generic_add_port_range(generic, 0xc000, 0xc00f, GENERIC_PRINT_AND_IGNORE);
 #endif
-      
-    }
       //  v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE);
       
 
+      return generic;
 
-    
-
-    v3_attach_device(info, nvram);
-    //v3_attach_device(info, timer);
-    v3_attach_device(info, pic);
-    v3_attach_device(info, pit);
-    v3_attach_device(info, keyboard);
-    // v3_attach_device(info, serial);
-    v3_attach_device(info, bochs_debug);
-
-    if (use_ramdisk) {
-      v3_attach_device(info, ramdisk);
-      v3_attach_device(info, cdrom);
-    }
-
-    if (use_generic) {
-      // Important that this be attached last!
-      v3_attach_device(info, generic);
-    }
-    
-    PrintDebugDevMgr(info);
-  }
-  
-  // give keyboard interrupts to vm
-  // no longer needed since we have a keyboard device
-  //hook_irq(&vm_info, 1);
-  
-#if 0
-  // give floppy controller to vm
-  v3_hook_passthrough_irq(info, 6);
-#endif
-  
-
-  if (!use_ramdisk) {
-    PrintDebug("Hooking IDE IRQs\n");
-
-    //primary ide
-    v3_hook_passthrough_irq(info, 14);
-  
-    // secondary ide
-    v3_hook_passthrough_irq(info, 15);    
-  }  
-
-  //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
-
-  info->rip = 0xfff0;
-  info->vm_regs.rsp = 0x0;
-  
-
-  return 0;
 }