X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=300ac56202371fe62282ee8a26b5897e613afa09;hb=624a05de781c51ed5d34a6db2583f884918a9594;hp=0f588a5f5f0780da91e0311d7372ca10759878ce;hpb=1cf6b8a334fd683681665c177d33ad6c452ad366;p=palacios.git diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c index 0f588a5..300ac56 100644 --- a/palacios/src/geekos/vm.c +++ b/palacios/src/geekos/vm.c @@ -2,6 +2,14 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #define SPEAKER_PORT 0x61 @@ -36,54 +44,70 @@ inline uchar_t VM_In_Byte(ushort_t port) -int IO_Read(ushort_t port, void * dst, uint_t length) { - uchar_t * iter = dst; - uint_t i; +int IO_Read(ushort_t port, void * dst, uint_t length, void * priv_data) { - for (i = 0; i < length; i++) { - *iter = VM_In_Byte(port); - iter++; + if (length != 1) { + return 0; } - - return 0; -} + *(uchar_t*)dst = VM_In_Byte(port); + return 1; +} -int IO_Write(ushort_t port, void * src, uint_t length) { - uchar_t * iter = src; - uint_t i; +int IO_Write(ushort_t port, void * src, uint_t length, void * priv_data) { - for (i = 0; i < length; i++) { - VM_Out_Byte(port, *iter); - iter++; + if (length != 1) { + return 0; } - return 0; + VM_Out_Byte(port, *(uchar_t *)src); + + return 1; } -int IO_Read_to_Serial(ushort_t port, void * dst, uint_t length) { +int IO_Read_to_Serial(ushort_t port, void * dst, uint_t length, void * priv_data) { PrintBoth("Input from Guest on port %d (0x%x) Length=%d\n", port, port, length); return 0; } +char * bochs_debug_buf = NULL; +int bochs_debug_offset = 0; + + +int IO_BOCHS_debug(ushort_t port, void * src, uint_t length, void * priv_data) { + if (!bochs_debug_buf) { + bochs_debug_buf = (char*)Malloc(1024); + } + + bochs_debug_buf[bochs_debug_offset++] = *(char*)src; -int IO_Write_to_Serial(ushort_t port, void * src, uint_t length) { - PrintBoth("Output from Guest on port %d (0x%x) Length=%d\n", port, port, length); + if ((*(char*)src == 0xa) || (bochs_debug_offset == 1023)) { + SerialPrint("BOCHS>%s", bochs_debug_buf); + memset(bochs_debug_buf, 0, 1024); + bochs_debug_offset = 0; + } + + return length; +} + + +int IO_Write_to_Serial(ushort_t port, void * src, uint_t length, void * priv_data) { + SerialPrint("Output from Guest on port %d (0x%x) Length=%d\n", port, port, length); switch (length) { case 1: - PrintBoth(">0x%.2x\n", *(char*)src); + SerialPrint(">0x%.2x\n", *(char*)src); break; case 2: - PrintBoth(">0x%.4x\n", *(ushort_t*)src); + SerialPrint(">0x%.4x\n", *(ushort_t*)src); break; case 4: - PrintBoth(">0x%.8x\n", *(uint_t*)src); + SerialPrint(">0x%.8x\n", *(uint_t*)src); break; default: break; @@ -137,11 +161,13 @@ int RunVMM(struct Boot_Info * bootInfo) { addr_t rsp; addr_t rip; + + memset(&os_hooks, 0, sizeof(struct vmm_os_hooks)); memset(&vmm_ops, 0, sizeof(struct vmm_ctrl_ops)); memset(&vm_info, 0, sizeof(struct guest_info)); - os_hooks.print_debug = &PrintBoth; + os_hooks.print_debug = &SerialPrint; os_hooks.print_info = &Print; os_hooks.print_trace = &SerialPrint; os_hooks.allocate_pages = &Allocate_VMM_Pages; @@ -150,8 +176,9 @@ int RunVMM(struct Boot_Info * bootInfo) { os_hooks.free = &VMM_Free; os_hooks.vaddr_to_paddr = &Identity; os_hooks.paddr_to_vaddr = &Identity; - - + os_hooks.hook_interrupt = &hook_irq_stub; + os_hooks.ack_irq = &ack_irq; + // DumpGDT(); Init_VMM(&os_hooks, &vmm_ops); @@ -161,8 +188,11 @@ int RunVMM(struct Boot_Info * bootInfo) { vm_info.cpu_mode = REAL; + //init_irq_map(&(vm_info.irq_map)); init_vmm_io_map(&(vm_info.io_map)); + init_interrupt_state(&vm_info); + dev_mgr_init(&(vm_info.dev_mgr)); if (0) { @@ -183,51 +213,110 @@ int RunVMM(struct Boot_Info * bootInfo) { //add_shared_mem_range(&(vm_info.mem_layout), 0x0, 0x1000, 0x100000); // add_shared_mem_range(&(vm_info.mem_layout), 0x0, 0x100000, 0x0); - shadow_region_t *ent = Malloc(sizeof(shadow_region_t));; - init_shadow_region_physical(ent,0,0x100000,GUEST_REGION_PHYSICAL_MEMORY, - 0x100000, HOST_REGION_PHYSICAL_MEMORY); - add_shadow_region(&(vm_info.mem_map),ent); + /* + shadow_region_t *ent = Malloc(sizeof(shadow_region_t));; + init_shadow_region_physical(ent,0,0x100000,GUEST_REGION_PHYSICAL_MEMORY, + 0x100000, HOST_REGION_PHYSICAL_MEMORY); + add_shadow_region(&(vm_info.mem_map),ent); + */ + + add_shadow_region_passthrough(&vm_info, 0x0, 0x100000, 0x100000); - hook_io_port(&(vm_info.io_map), 0x61, &IO_Read, &IO_Write); - hook_io_port(&(vm_info.io_map), 0x05, &IO_Read, &IO_Write_to_Serial); + hook_io_port(&(vm_info.io_map), 0x61, &IO_Read, &IO_Write, NULL); + hook_io_port(&(vm_info.io_map), 0x05, &IO_Read, &IO_Write_to_Serial, NULL); /* - vm_info.cr0 = 0; - vm_info.cs.base=0xf000; - vm_info.cs.limit=0xffff; + vm_info.cr0 = 0; + vm_info.cs.base=0xf000; + vm_info.cs.limit=0xffff; */ //vm_info.rip = 0xfff0; vm_info.rip = 0; vm_info.vm_regs.rsp = 0x0; } else { - shadow_region_t *ent = Malloc(sizeof(shadow_region_t)); - /* - init_shadow_region_physical(ent,0xf0000,0x100000,GUEST_REGION_PHYSICAL_MEMORY, - 0x100000, HOST_REGION_PHYSICAL_MEMORY); - add_shadow_region(&(vm_info.mem_map),ent); - ent = Malloc(sizeof(shadow_region_t)); - */ - void * guest_mem = Allocate_VMM_Pages(256); + int i; + void * region_start; + PrintDebug("Guest Size: %lu\n", bootInfo->guest_size); - memcpy((void *)(guest_mem + 0xf0000), (void *)0x100000, bootInfo->guest_size); + struct guest_mem_layout * layout = (struct guest_mem_layout *)0x100000; + + if (layout->magic != MAGIC_CODE) { + PrintDebug("Layout Magic Mismatch (0x%x)\n", layout->magic); + } + + PrintDebug("%d layout regions\n", layout->num_regions); + + region_start = (void *)&(layout->regions[layout->num_regions]); + + PrintDebug("region start = 0x%x\n", region_start); + + for (i = 0; i < layout->num_regions; i++) { + struct layout_region * reg = &(layout->regions[i]); + uint_t num_pages = (reg->length / PAGE_SIZE) + ((reg->length % PAGE_SIZE) ? 1 : 0); + void * guest_mem = Allocate_VMM_Pages(num_pages); + + PrintDebug("Layout Region %d bytes\n", reg->length); + memcpy(guest_mem, region_start, reg->length); + + SerialMemDump((unsigned char *)(guest_mem), 16); + add_shadow_region_passthrough(&vm_info, reg->final_addr, reg->final_addr + (num_pages * PAGE_SIZE), (addr_t)guest_mem); - SerialMemDump((unsigned char *)(guest_mem + 0xffff0), 16); + PrintDebug("Adding Shadow Region (0x%x-0x%x) -> 0x%x\n", reg->final_addr, reg->final_addr + (num_pages * PAGE_SIZE), guest_mem); - init_shadow_region_physical(ent, 0x0, 0x100000, GUEST_REGION_PHYSICAL_MEMORY, - (addr_t)guest_mem, HOST_REGION_PHYSICAL_MEMORY); - add_shadow_region(&(vm_info.mem_map),ent); + region_start += reg->length; + } + + // + add_shadow_region_passthrough(&vm_info, 0x0, 0xa0000, (addr_t)Allocate_VMM_Pages(160)); + add_shadow_region_passthrough(&vm_info, 0xa0000, 0xc0000, 0xa0000); + + + if (1) { + add_shadow_region_passthrough(&vm_info, 0xc7000, 0xc8000, (addr_t)Allocate_VMM_Pages(1)); + if (add_shadow_region_passthrough(&vm_info, 0xc8000, 0xf0000, (addr_t)Allocate_VMM_Pages(40)) == -1) { + PrintDebug("Error adding shadow region\n"); + } + } else { + add_shadow_region_passthrough(&vm_info, 0xc0000, 0xc8000, 0xc0000); + add_shadow_region_passthrough(&vm_info, 0xc8000, 0xf0000, 0xc8000); + } + + + print_shadow_map(&(vm_info.mem_map)); + + hook_io_port(&(vm_info.io_map), 0x61, &IO_Read, &IO_Write, NULL); + hook_io_port(&(vm_info.io_map), 0x05, &IO_Read, &IO_Write_to_Serial, NULL); - hook_io_port(&(vm_info.io_map), 0x61, &IO_Read, &IO_Write); - hook_io_port(&(vm_info.io_map), 0x05, &IO_Read, &IO_Write_to_Serial); + /* + hook_io_port(&(vm_info.io_map), 0x20, &IO_Read, &IO_Write_to_Serial, NULL); + hook_io_port(&(vm_info.io_map), 0x21, &IO_Read, &IO_Write_to_Serial, NULL); + hook_io_port(&(vm_info.io_map), 0xa0, &IO_Read, &IO_Write_to_Serial, NULL); + hook_io_port(&(vm_info.io_map), 0xa1, &IO_Read, &IO_Write_to_Serial, NULL); + */ + hook_io_port(&(vm_info.io_map), 0x400, &IO_Read, &IO_Write_to_Serial, NULL); + hook_io_port(&(vm_info.io_map), 0x401, &IO_Read, &IO_Write_to_Serial, NULL); + hook_io_port(&(vm_info.io_map), 0x402, &IO_Read, &IO_BOCHS_debug, NULL); + hook_io_port(&(vm_info.io_map), 0x403, &IO_Read, &IO_Write_to_Serial, NULL); + + { + struct vm_device * nvram = create_nvram(); + //struct vm_device * timer = create_timer(); + struct vm_device * pic = create_pic(); - hook_io_port(&(vm_info.io_map), 0x20, &IO_Read, &IO_Write_to_Serial); - hook_io_port(&(vm_info.io_map), 0x21, &IO_Read, &IO_Write_to_Serial); - hook_io_port(&(vm_info.io_map), 0xa0, &IO_Read, &IO_Write_to_Serial); - hook_io_port(&(vm_info.io_map), 0xa1, &IO_Read, &IO_Write_to_Serial); + attach_device(&(vm_info), nvram); + //attach_device(&(vm_info), timer); + attach_device(&(vm_info), pic); + + PrintDebugDevMgr(&(vm_info.dev_mgr)); + } + + hook_irq(&vm_info, 6); + hook_irq(&vm_info, 14); + hook_irq(&vm_info, 15); vm_info.rip = 0xfff0; vm_info.vm_regs.rsp = 0x0; @@ -236,8 +325,8 @@ int RunVMM(struct Boot_Info * bootInfo) { PrintBoth("Initializing Guest (eip=0x%.8x) (esp=0x%.8x)\n", (uint_t)vm_info.rip,(uint_t)vm_info.vm_regs.rsp); (vmm_ops).init_guest(&vm_info); PrintBoth("Starting Guest\n"); + //Clear_Screen(); (vmm_ops).start_guest(&vm_info); return 0; - }