X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=5bfe537350a43e5a4deef2bba5f550eabd602ac7;hb=e23a867d9dcecc70fc76adc0f89404dbc50e5b78;hp=f5ca6635d9a07a64113b436c801279c9c9a115cd;hpb=266af4b5b19da7bee8e7445288c7c1cb3ee194c7;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index f5ca663..5bfe537 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -1,4 +1,4 @@ -/* + /* * This file is part of the Palacios Virtual Machine Monitor developed * by the V3VEE Project with funding from the United States National * Science Foundation and the Department of Energy. @@ -25,21 +25,15 @@ #include #include #include +#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include - +#include +#include +#include +#include +#include #include @@ -47,12 +41,12 @@ #define USE_GENERIC 1 - +#include 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 configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr); @@ -68,95 +62,105 @@ static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, v } +int v3_pre_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; -int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) { - extern v3_cpu_arch_t v3_cpu_type; // 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_shadow_map(info); - v3_init_hypercall_map(info); + + + // Initialize the memory map + v3_init_shadow_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; } + + if (config_ptr->enable_profiling) { + info->enable_profiler = 1; + v3_init_profiler(info); + } else { + info->enable_profiler = 0; + } + + if (config_ptr->schedule_freq == 0) { + // set the schedule frequency to 100 HZ + config_ptr->schedule_freq = 100; + } + + PrintDebug("CPU_KHZ = %d, schedule_freq=%p\n", V3_CPU_KHZ(), (void *)config_ptr->schedule_freq); + + info->yield_cycle_period = (V3_CPU_KHZ() * 1000) / config_ptr->schedule_freq; // Initial CPU operating mode 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; - + + return 0; +} + + +int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) { + // 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); - + //v3_hook_io_port(info, 1234, &IO_Read, NULL, info); + + if (setup_devices(info, config_ptr) == -1) { + PrintError("Failed to setup devices\n"); + return -1; + } + info->run_state = VM_STOPPED; - if (config_ptr->enable_profiling) { - info->enable_profiler = 1; - v3_init_profiler(info); - } else { - info->enable_profiler = 0; - } + info->vm_regs.rdi = 0; + info->vm_regs.rsi = 0; + info->vm_regs.rbp = 0; + info->vm_regs.rsp = 0; + info->vm_regs.rbx = 0; + info->vm_regs.rdx = 0; + info->vm_regs.rcx = 0; + info->vm_regs.rax = 0; - //v3_hook_io_port(info, 1234, &IO_Read, NULL, info); - - // Setup initial cpu register state - info->rip = 0xfff0; - info->vm_regs.rsp = 0x0; - - 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) { - 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) { @@ -165,77 +169,35 @@ 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); } - - - // Fill in the extended memory map.... +#ifdef CRAY_XT { - 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; - } +#define SEASTAR_START 0xffe00000 +#define SEASTAR_END 0xffffffff + // 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; } } - +#endif + print_shadow_map(info); return 0; @@ -244,92 +206,145 @@ 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) { - struct vm_device * ramdisk = NULL; - struct vm_device * cdrom = NULL; - struct vm_device * nvram = v3_create_nvram(); - //struct vm_device * timer = v3_create_timer(); - struct vm_device * pic = v3_create_pic(); - 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 * ioapic = v3_create_io_apic(apic); - - //struct vm_device * serial = v3_create_serial(); - struct vm_device * generic = NULL; - - int use_ramdisk = config_ptr->use_ramdisk; + + v3_create_device(info, "8259A", NULL); + v3_create_device(info, "KEYBOARD", NULL); + v3_create_device(info, "8254_PIT", NULL); + v3_create_device(info, "BOCHS_DEBUG", NULL); + v3_create_device(info, "OS_DEBUG", NULL); + v3_create_device(info, "LAPIC", NULL); + v3_create_device(info, "IOAPIC", "LAPIC"); + v3_create_device(info, "VMNET", NULL); + int use_generic = USE_GENERIC; + if (config_ptr->enable_pci == 1) { + struct ide_cfg ide_config = {"PCI", "PIIX3"}; + + v3_create_device(info, "PCI", NULL); + v3_create_device(info, "i440FX", "PCI"); + v3_create_device(info, "PIIX3", "PCI"); + + + v3_create_device(info, "LNX_VIRTIO_BLK", "PCI"); + v3_create_device(info, "LNX_VIRTIO_BALLOON", "PCI"); + v3_create_device(info, "SYM_SWAP", "LNX_VIRTIO_BLK"); - if (use_ramdisk) { - PrintDebug("Creating Ramdisk\n"); - ramdisk = v3_create_ramdisk(); - cdrom = v3_create_cdrom(ramdisk, config_ptr->ramdisk, config_ptr->ramdisk_size); + v3_create_device(info, "IDE", &ide_config); + } else { + v3_create_device(info, "IDE", NULL); } - - - if (use_generic) { - generic = configure_generic(info, config_ptr); + + + if (config_ptr->pri_disk_type != NONE) { + if (config_ptr->pri_disk_type == CDROM) { + if (config_ptr->pri_disk_con == RAM) { + struct ram_cd_cfg cfg = {"IDE", 0, 0, + (addr_t)(config_ptr->pri_disk_info.ram.data_ptr), + config_ptr->pri_disk_info.ram.size}; + + PrintDebug("Creating RAM CD\n"); + + v3_create_device(info, "RAM-CD", &cfg); + } else if (config_ptr->pri_disk_con == NETWORK) { + struct net_cd_cfg cfg = {"IDE", 0, 0, + config_ptr->pri_disk_info.net.ip_str, + config_ptr->pri_disk_info.net.port, + config_ptr->pri_disk_info.net.disk_name}; + PrintDebug("Creating NET CD\n"); + + v3_create_device(info, "NET-CD", &cfg); + } + } else if (config_ptr->pri_disk_type == HARDDRIVE) { + if (config_ptr->pri_disk_con == RAM) { + struct ram_hd_cfg cfg = {"IDE", 0, 0, + (addr_t)(config_ptr->pri_disk_info.ram.data_ptr), + config_ptr->pri_disk_info.ram.size}; + + PrintDebug("Creating RAM HD\n"); + + v3_create_device(info, "RAM-HD", &cfg); + } else if (config_ptr->pri_disk_con == NETWORK) { + struct net_hd_cfg cfg = {"IDE", 0, 0, + config_ptr->pri_disk_info.net.ip_str, + config_ptr->pri_disk_info.net.port, + config_ptr->pri_disk_info.net.disk_name}; + PrintDebug("Creating NET HD\n"); + v3_create_device(info, "NET-HD", &cfg); + } + } } - 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); - v3_attach_device(info, ioapic); + if (config_ptr->sec_disk_type != NONE) { + if (config_ptr->sec_disk_type == CDROM) { + if (config_ptr->sec_disk_con == RAM) { + struct ram_cd_cfg cfg = {"IDE", 0, 1, + (addr_t)(config_ptr->sec_disk_info.ram.data_ptr), + config_ptr->sec_disk_info.ram.size}; + + PrintDebug("Creating RAM CD\n"); + v3_create_device(info, "RAM-CD", &cfg); + } else if (config_ptr->sec_disk_con == NETWORK) { + struct net_cd_cfg cfg = {"IDE", 0, 1, + config_ptr->sec_disk_info.net.ip_str, + config_ptr->sec_disk_info.net.port, + config_ptr->sec_disk_info.net.disk_name}; - if (use_ramdisk) { - v3_attach_device(info, ramdisk); - v3_attach_device(info, cdrom); + PrintDebug("Creating NET CD\n"); + v3_create_device(info, "NET-CD", &cfg); + } + } else if (config_ptr->sec_disk_type == HARDDRIVE) { + if (config_ptr->sec_disk_con == RAM) { + struct ram_hd_cfg cfg = {"IDE", 0, 1, + (addr_t)(config_ptr->sec_disk_info.ram.data_ptr), + config_ptr->sec_disk_info.ram.size}; + PrintDebug("Creating RAM HD\n"); + v3_create_device(info, "RAM-HD", &cfg); + } else if (config_ptr->sec_disk_con == NETWORK) { + struct net_hd_cfg cfg = {"IDE", 0, 1, + config_ptr->sec_disk_info.net.ip_str, + config_ptr->sec_disk_info.net.port, + config_ptr->sec_disk_info.net.disk_name}; + PrintDebug("Creating NET HD\n"); + v3_create_device(info, "NET-HD", &cfg); + } + } } + + if (use_generic) { - // Important that this be attached last! - v3_attach_device(info, generic); + configure_generic(info, config_ptr); } - - 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 requires information about the Harddrives + v3_create_device(info, "NVRAM", "IDE"); + PrintDebugDevMgr(info); return 0; } -static struct vm_device * configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr) { + +static int configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr) { PrintDebug("Creating Generic Device\n"); - struct vm_device * generic = v3_create_generic(); + v3_create_device(info, "GENERIC", NULL); + + struct vm_device * generic = v3_find_dev(info, "GENERIC"); + + if (!generic) { + PrintError("Could not find generic device\n"); + return -1; + } + + // 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) @@ -363,8 +378,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 @@ -426,14 +441,7 @@ static struct vm_device * configure_generic(struct guest_info * info, struct v3 v3_generic_add_port_range(generic, 0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH); #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); - - return generic; + return 0; }