X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=32e386227c7f0ef30e7de21bcb9c7b7c4e3a9fca;hb=f44ca084bc46b20de6414920ab3a6fe53688095f;hp=fd472dd8f0600a8e1cb9962de6de51c763a02965;hpb=165560d91368d638b177022f883d3723d7618944;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index fd472dd..32e3862 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -21,6 +21,10 @@ #include #include #include +#include +#include +#include +#include #include @@ -32,6 +36,10 @@ #include #include #include +#include +#include +#include + #include @@ -39,8 +47,6 @@ #define USE_GENERIC 1 -#define ROMBIOS_START 0x000f0000 -#define VGABIOS_START 0x000c0000 @@ -50,23 +56,14 @@ static struct vm_device * configure_generic(struct guest_info * info, struct v3 -static int mem_test_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) { - int foo = 20; +static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) { - memcpy(dst, &foo, length); - - PrintDebug("Passthrough mem read returning: %p (length=%d)\n", (void *)(foo + (guest_addr & 0xfff)), 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_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) { - memcpy(dst, (void*)guest_addr, length); - return length; -} - -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; } @@ -77,14 +74,18 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) // Initialize the subsystem data strutures v3_init_time(info); - v3_init_vmm_io_map(info); + v3_init_io_map(info); v3_init_msr_map(info); v3_init_interrupt_state(info); v3_init_dev_mgr(info); - v3_init_emulator(info); v3_init_host_events(info); - init_shadow_map(info); + v3_init_decoder(info); + + v3_init_shadow_map(info); + + v3_init_hypercall_map(info); + if (v3_cpu_type == V3_SVM_REV3_CPU) { info->shdw_pg_mode = NESTED_PAGING; @@ -97,16 +98,27 @@ 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 - info->mem_size = config_ptr->mem_size; + // 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 - setup_memory_map(info, config_ptr); + 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; + v3_init_profiler(info); + } else { + info->enable_profiler = 0; + } + //v3_hook_io_port(info, 1234, &IO_Read, NULL, info); // Setup initial cpu register state @@ -123,79 +135,108 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) * 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; - /* layout rombios */ - { - uint_t num_pages = (config_ptr->rombios_size + PAGE_SIZE - 1) / PAGE_SIZE; - void * guest_mem = V3_AllocPages(num_pages); + PrintDebug("Setting up memory map (memory size=%dMB)\n", (uint_t)(info->mem_size / (1024 * 1024))); - 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); - - PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", - (void *)ROMBIOS_START, - (void *)ROMBIOS_START + (num_pages * PAGE_SIZE), - (void *)guest_mem); + // 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) { + PrintError("Could not map VGA framebuffer\n"); + return -1; + } + } else { + v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000, passthrough_mem_write, NULL); + } + + /* 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); - add_shadow_region_passthrough(info, VGABIOS_START, VGABIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem); - + 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_START + (num_pages * PAGE_SIZE), + (void *)vgabios_end, (void *)guest_mem); - } - // - add_shadow_region_passthrough(info, 0x0, 0xa0000, (addr_t)V3_AllocPages(160)); - - if (1) { - add_shadow_region_passthrough(info, 0xa0000, 0xc0000, 0xa0000); - } else { - hook_guest_mem(info, 0xa0000, 0xc0000, passthrough_mem_read, 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) { - PrintDebug("Error adding shadow region\n"); + + // 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; } - } else { - add_shadow_region_passthrough(info, 0xc0000, 0xc8000, 0xc0000); - add_shadow_region_passthrough(info, 0xc8000, 0xf0000, 0xc8000); } - - - if (1) { - add_shadow_region_passthrough(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)); + + /* 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; + } } - add_shadow_region_passthrough(info, 0x1000000, 0x8000000, (addr_t)V3_AllocPages(32768)); - - // test - give linux accesss to PCI space - PAD - add_shadow_region_passthrough(info, 0xc0000000,0xffffffff,0xc0000000); - + + + // 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; + } + } + } - print_shadow_map(&(info->mem_map)); + print_shadow_map(info); return 0; } @@ -211,6 +252,9 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ 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; @@ -238,6 +282,10 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ 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 (use_ramdisk) { v3_attach_device(info, ramdisk);