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.


I think I might have fixed the SHUTDOWN bug...
[palacios.git] / palacios / src / palacios / vmm_config.c
index 88db635..f0befa8 100644 (file)
 #include <devices/generic.h>
 #include <devices/ide.h>
 #include <devices/ram_cd.h>
+#include <devices/ram_hd.h>
 #include <devices/bochs_debug.h>
 #include <devices/os_debug.h>
 #include <devices/apic.h>
 #include <devices/io_apic.h>
 #include <devices/para_net.h>
 #include <devices/pci.h>
-
+#include <devices/i440fx.h>
+#include <devices/piix3.h>
 
 
 #include <palacios/vmm_host_events.h>
@@ -53,7 +55,6 @@
 
 
 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);
 
 
@@ -74,24 +75,35 @@ 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;
 
+    // Amount of ram the Guest will have, rounded to a 4K page boundary
+    info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff;
+
+
     // Initialize the subsystem data strutures
     v3_init_time(info);
     v3_init_io_map(info);
     v3_init_msr_map(info);
     v3_init_interrupt_state(info);
+    v3_init_exception_state(info);
     v3_init_dev_mgr(info);
     v3_init_host_events(info);
-    
+
+
     v3_init_decoder(info);
     
+    v3_init_hypercall_map(info);
+
+
+    // Initialize the memory map
     v3_init_shadow_map(info);
     
-    v3_init_hypercall_map(info);
     
-  
-    if (v3_cpu_type == V3_SVM_REV3_CPU) {
+    if ((v3_cpu_type == V3_SVM_REV3_CPU) && 
+       (config_ptr->enable_nested_paging == 1)) {
+       PrintDebug("Guest Page Mode: NESTED_PAGING\n");
        info->shdw_pg_mode = NESTED_PAGING;
     } else {
+       PrintDebug("Guest Page Mode: SHADOW_PAGING\n");
        v3_init_shadow_page_state(info);
        info->shdw_pg_mode = SHADOW_PAGING;
     }
@@ -100,19 +112,12 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
     info->cpu_mode = REAL;
     info->mem_mode = PHYSICAL_MEM;
     
-    // Amount of ram the Guest will have, rounded to a 4K page boundary
-    info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff;
-    
     // Configure the memory map for the guest
     if (setup_memory_map(info, config_ptr) == -1) {
        PrintError("Setting up guest memory map failed...\n");
        return -1;
     }
     
-    // Configure the devices for the guest
-    setup_devices(info, config_ptr);
-    
-
 
     if (config_ptr->enable_profiling) {
        info->enable_profiler = 1;
@@ -132,33 +137,16 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
 }
 
 
+
+
+
 /* 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) {
-    addr_t mem_pages = info->mem_size >> 12;
-    
     PrintDebug("Setting up memory map (memory size=%dMB)\n", (uint_t)(info->mem_size / (1024 * 1024)));
     
-    // Fill up to the 640K hole
-    if (mem_pages >= 160) {
-       if (v3_add_shadow_mem(info, 0x0, 0xa0000, (addr_t)V3_AllocPages(160)) == -1) {
-           PrintError("Could not map full conventional memory\n");
-           return -1;
-       }
-    } else {
-       // Less than 640k of memory
-       if (v3_add_shadow_mem(info, 0x0, (mem_pages * PAGE_SIZE), (addr_t)V3_AllocPages(mem_pages)) == -1) {
-           PrintError("Could not map subset of conventional memory\n");
-           return -1;
-       };
-    }
-
-
-#define VGABIOS_START 0x000c0000
-#define ROMBIOS_START 0x000f0000
-    
     // VGA frame buffer
     if (1) {
        if (v3_add_shadow_mem(info, 0xa0000, 0xc0000, 0xa0000) == -1) {
@@ -168,104 +156,31 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf
     } else {
        v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000,  passthrough_mem_write, NULL);
     }  
-    
-    
+
+#define VGABIOS_START 0x000c0000
+#define ROMBIOS_START 0x000f0000
+
     /* layout vgabios */
     {
-       uint_t num_pages = (config_ptr->vgabios_size + PAGE_SIZE - 1) / PAGE_SIZE;
-       void * guest_mem =  V3_AllocPages(num_pages);
-       addr_t vgabios_end = VGABIOS_START + (num_pages * PAGE_SIZE);
-       
-       PrintDebug("Layout Region %d bytes\n", config_ptr->vgabios_size);
-       memcpy(V3_VAddr(guest_mem), config_ptr->vgabios, config_ptr->vgabios_size);
-       
-       if (v3_add_shadow_mem(info, VGABIOS_START, vgabios_end, (addr_t)guest_mem) == -1) {
-           PrintError("Could not map VGABIOS\n");
-           return -1;
-       }
-       
-       PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", 
-                  (void *)VGABIOS_START, 
-                  (void *)vgabios_end, 
-                  (void *)guest_mem);
-       
-
-       // Fill in the space between the VGABIOS and the ROMBIOS
-       // We'll just back this to shadow memory for now....
-       if (v3_add_shadow_mem(info, vgabios_end, ROMBIOS_START, 
-                             (addr_t)V3_AllocPages((ROMBIOS_START - vgabios_end) / PAGE_SIZE)) == -1) {
-           PrintError("Could not map VGABIOS->ROMBIOS gap\n");
-           return -1;
-       }
+       addr_t vgabios_dst = v3_get_shadow_addr(&(info->mem_map.base_region), VGABIOS_START);
+       memcpy(V3_VAddr((void *)vgabios_dst), config_ptr->vgabios, config_ptr->vgabios_size);   
     }
     
     /* layout rombios */
     {
-       uint_t num_pages = (config_ptr->rombios_size + PAGE_SIZE - 1) / PAGE_SIZE;
-       void * guest_mem =  V3_AllocPages(num_pages);
-       addr_t rombios_end = ROMBIOS_START + (num_pages * PAGE_SIZE);
-       
-       PrintDebug("Layout Region %d bytes\n", config_ptr->rombios_size);
-       memcpy(V3_VAddr(guest_mem), config_ptr->rombios, config_ptr->rombios_size);
-       
-       if (v3_add_shadow_mem(info, ROMBIOS_START, rombios_end, (addr_t)guest_mem) == -1) {
-           PrintError("Could not map ROMBIOS\n");
-           return -1;
-       }
-       
-       PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", 
-                  (void *)ROMBIOS_START, 
-                  (void *)rombios_end, 
-                  (void *)guest_mem);
-       
-       if (rombios_end != 0x100000) {
-           PrintError("ROMBIOS must reach the 1MB barrier....\n");
-           return -1;
-       }
+       addr_t rombios_dst = v3_get_shadow_addr(&(info->mem_map.base_region), ROMBIOS_START);
+       memcpy(V3_VAddr((void *)rombios_dst), config_ptr->rombios, config_ptr->rombios_size);
     }
 
 #ifdef CRAY_XT
     {
 #define SEASTAR_START 0xffe00000 
 #define SEASTAR_END 0xffffffff 
-       
-       // Fill in generic memory below the seastar
-       addr_t top_of_mem = (SEASTAR_START < info->mem_size) ? SEASTAR_START : info->mem_size;
-       int num_low_pages = (top_of_mem - 0x100000) / PAGE_SIZE;
-       
-       if (v3_add_shadow_mem(info, 0x100000, top_of_mem, (addr_t)V3_AllocPages(num_low_pages)) == -1) {
-           PrintError("Could not extended memory below 4G\n");
-           return -1;
-       }
-       
        // Map the Seastar straight through
        if (v3_add_shadow_mem(info, SEASTAR_START, SEASTAR_END, SEASTAR_START) == -1) {
            PrintError("Could not map through the seastar\n");
            return -1;
        }
-       
-       
-       // Add memory above the seastar
-       if (info->mem_size > SEASTAR_END) {
-           int num_high_pages = mem_pages - (SEASTAR_END / PAGE_SIZE);    
-
-           if (v3_add_shadow_mem(info, SEASTAR_END, info->mem_size, (addr_t)V3_AllocPages(num_high_pages)) == -1) {
-               PrintError("Could not map extended memory above 4G\n");
-               return -1;
-           }
-       }
-    }
-#else 
-    // Fill in the extended memory map....
-    {
-       int num_ext_pages = mem_pages - (0x100000 / PAGE_SIZE);
-       
-       if (num_ext_pages > 0) {
-           if (v3_add_shadow_mem(info, 0x100000, info->mem_size, (addr_t)V3_AllocPages(num_ext_pages)) == -1) {
-               PrintError("Could not allocate extended shadow memory\n");
-               return -1;
-           }
-       }
     }
 #endif    
 
@@ -276,14 +191,16 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf
 
 
 
-static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
+int v3_config_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
+
     struct vm_device * ide = NULL;
-    struct vm_device * ram_cd = NULL;
-#ifdef DEBUG_PCI
-    struct vm_device * pci = v3_create_pci();
-#endif
-    struct vm_device * nvram = v3_create_nvram();
-    //struct vm_device * timer = v3_create_timer();
+    struct vm_device * ramdisk = NULL;
+    
+    struct vm_device * pci = NULL;
+    struct vm_device * northbridge = NULL;
+    struct vm_device * southbridge = NULL;
+
+    struct vm_device * nvram = NULL;
     struct vm_device * pic = v3_create_pic();
     struct vm_device * keyboard = v3_create_keyboard();
     struct vm_device * pit = v3_create_pit(); 
@@ -293,19 +210,36 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
     struct vm_device * ioapic = v3_create_io_apic(apic);
     struct vm_device * para_net = v3_create_para_net();
 
+
     //struct vm_device * serial = v3_create_serial();
     struct vm_device * generic = NULL;
 
-    int use_ramdisk = config_ptr->use_ramdisk;
+
     int use_generic = USE_GENERIC;
 
-    ide = v3_create_ide();
+    if (config_ptr->enable_pci == 1) {
+       pci = v3_create_pci();
+       northbridge = v3_create_i440fx(pci);
+       southbridge = v3_create_piix3(pci);
+       ide = v3_create_ide(pci, southbridge);
+    } else {
+       ide = v3_create_ide(NULL, NULL);
+    }
+
 
-    if (use_ramdisk) {
-       PrintDebug("Creating Ramdisk\n");
-       ram_cd = v3_create_ram_cd(ide, 0, 0, 
-                                 (addr_t)(config_ptr->ramdisk), 
-                                 config_ptr->ramdisk_size);
+
+    nvram = v3_create_nvram(ide);
+
+    if (config_ptr->use_ram_cd == 1) {
+       PrintDebug("Creating Ram CD\n");
+       ramdisk = v3_create_ram_cd(ide, 0, 0, 
+                                  (addr_t)(config_ptr->ramdisk), 
+                                  config_ptr->ramdisk_size);
+    } else if (config_ptr->use_ram_hd == 1) {
+       PrintDebug("Creating Ram HD\n");
+       ramdisk = v3_create_ram_hd(ide, 0, 0, 
+                                  (addr_t)(config_ptr->ramdisk), 
+                                  config_ptr->ramdisk_size);
     }
     
     
@@ -313,12 +247,10 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
        generic = configure_generic(info, config_ptr);
     }
 
-#ifdef DEBUG_PCI
-    v3_attach_device(info, pci);
-#endif
 
-    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);
@@ -331,50 +263,47 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
 
     v3_attach_device(info, para_net);
 
+    if (config_ptr->enable_pci == 1) {
+       PrintDebug("Attaching PCI\n");
+       v3_attach_device(info, pci);
+       PrintDebug("Attaching Northbridge\n");
+       v3_attach_device(info, northbridge);
+       PrintDebug("Attaching Southbridge\n");
+       v3_attach_device(info, southbridge);
+    }
+
+    PrintDebug("Attaching IDE\n");
     v3_attach_device(info, ide);
 
-    if (use_ramdisk) {
-       v3_attach_device(info, ram_cd);
+    if (ramdisk != NULL) {
+       v3_attach_device(info, ramdisk);
     }
 
     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);    
-    }  
+    // This should go last because it contains the hardware state
+    v3_attach_device(info, nvram);
     
+    PrintDebugDevMgr(info);
 
     return 0;
 }
 
 
 
+
+
 static struct vm_device *  configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr) {
     PrintDebug("Creating Generic Device\n");
     struct vm_device * generic = v3_create_generic();
     
+
+    // port 0x92: A20 enable/disable (bit 2) (This causes an MMU flush)
+
+
     // 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)
     v3_generic_add_port_range(generic, 0xc0, 0xc7, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channels 4,5,6,7 (address, counter)
@@ -408,8 +337,8 @@ static struct vm_device *  configure_generic(struct guest_info * info, struct v3
 
     // Make the PCI bus invisible (at least it's configuration)
     
-    v3_generic_add_port_range(generic, 0xcf8, 0xcf8, GENERIC_PRINT_AND_IGNORE); // PCI Config Address
-    v3_generic_add_port_range(generic, 0xcfc, 0xcfc, GENERIC_PRINT_AND_IGNORE); // PCI Config Data
+    //v3_generic_add_port_range(generic, 0xcf8, 0xcf8, GENERIC_PRINT_AND_IGNORE); // PCI Config Address
+    //v3_generic_add_port_range(generic, 0xcfc, 0xcfc, GENERIC_PRINT_AND_IGNORE); // PCI Config Data
     
     
     
@@ -472,11 +401,7 @@ static struct vm_device *  configure_generic(struct guest_info * info, struct v3
 #endif
 
 
-#if 1
-    // Make any Bus master ide controller invisible
-    
-    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);