X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=0b69b6abfec81f632ded6588d365f5ddeaabe432;hb=3b49b57d1f3b8bccdf7390c26ea9cda1f8dac8c3;hp=72940ed2aac7d0963e508d0ec80724051c62de17;hpb=a109eb919a162bd7de58d62020801bc2e633be50;p=palacios.git diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c index 72940ed..0b69b6a 100644 --- a/palacios/src/geekos/vm.c +++ b/palacios/src/geekos/vm.c @@ -2,14 +2,24 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#define SPEAKER_PORT 0x61 - - +#include +#include +#include +#define SPEAKER_PORT 0x61 -inline void VM_Out_Byte(ushort_t port, uchar_t value) +static inline void VM_Out_Byte(ushort_t port, uchar_t value) { __asm__ __volatile__ ( "outb %b0, %w1" @@ -21,7 +31,7 @@ inline void VM_Out_Byte(ushort_t port, uchar_t value) /* * Read a byte from an I/O port. */ -inline uchar_t VM_In_Byte(ushort_t port) +static inline uchar_t VM_In_Byte(ushort_t port) { uchar_t value; @@ -36,47 +46,71 @@ 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; - for (i = 0; i < length; i++) { - *iter = VM_In_Byte(port); - iter++; +int IO_Read(ushort_t port, void * dst, uint_t length, void * priv_data) { + + if (length != 1) { + return 0; } + + *(uchar_t*)dst = VM_In_Byte(port); + return 1; +} + + + +int IO_Write(ushort_t port, void * src, uint_t length, void * priv_data) { + + if (length != 1) { + return 0; + } + + VM_Out_Byte(port, *(uchar_t *)src); + + return 1; +} + + +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_Write(ushort_t port, void * src, uint_t length) { - uchar_t * iter = src; - uint_t i; +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); + } - for (i = 0; i < length; i++) { - VM_Out_Byte(port, *iter); - iter++; + bochs_debug_buf[bochs_debug_offset++] = *(char*)src; + + 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 0; + return length; } - -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); +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; @@ -119,10 +153,23 @@ void BuzzVM() +int passthrough_mem_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) { + memcpy(dst, (void*)guest_addr, length); + return length; +} + +int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) { + memcpy((void*)guest_addr, src, length); + return length; +} + +/* We need a configuration mechanism, so we can wrap this completely inside the VMM code, + * with no pollution into the HOST OS + */ -int RunVMM() { +int RunVMM(struct Boot_Info * bootInfo) { struct vmm_os_hooks os_hooks; struct vmm_ctrl_ops vmm_ops; @@ -130,11 +177,13 @@ int RunVMM() { 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; @@ -143,19 +192,27 @@ int RunVMM() { 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; + os_hooks.get_cpu_khz = &get_cpu_khz; - - // DumpGDT(); Init_VMM(&os_hooks, &vmm_ops); + + /* MOVE THIS TO AN INIT GUEST ROUTINE */ init_shadow_map(&(vm_info.mem_map)); init_shadow_page_state(&(vm_info.shdw_pg_state)); + v3_init_time(&(vm_info.time_state)); vm_info.page_mode = SHADOW_PAGING; 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) { @@ -172,34 +229,178 @@ int RunVMM() { vm_info.vm_regs.rsp = (rsp +4092 );// - 0x2000; - } else { + } else if (0) { //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 { + int i; + void * region_start; + + + PrintBoth("Guest Size: %lu\n", bootInfo->guest_size); + + struct guest_mem_layout * layout = (struct guest_mem_layout *)0x100000; + + if (layout->magic != MAGIC_CODE) { + PrintBoth("Layout Magic Mismatch (0x%x)\n", layout->magic); + } + + PrintBoth("%d layout regions\n", layout->num_regions); + + region_start = (void *)&(layout->regions[layout->num_regions]); + + PrintBoth("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); + + PrintBoth("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); + + PrintBoth("Adding Shadow Region (0x%x-0x%x) -> 0x%x\n", reg->final_addr, reg->final_addr + (num_pages * PAGE_SIZE), guest_mem); + + 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); + //hook_guest_mem(&vm_info, 0xa0000, 0xc0000, passthrough_mem_read, passthrough_mem_write, NULL); + + + // TEMP + //add_shadow_region_passthrough(&vm_info, 0xc0000, 0xc8000, 0xc0000); + + 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) { + PrintBoth("Error adding shadow region\n"); + } + } else { + add_shadow_region_passthrough(&vm_info, 0xc0000, 0xc8000, 0xc0000); + add_shadow_region_passthrough(&vm_info, 0xc8000, 0xf0000, 0xc8000); + } + + + //add_shadow_region_passthrough(&vm_info, 0x100000, 0x2000000, (addr_t)Allocate_VMM_Pages(8192)); + add_shadow_region_passthrough(&vm_info, 0x100000, 0x1000000, (addr_t)Allocate_VMM_Pages(4096)); + + + 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), 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(); + struct vm_device * keyboard = create_keyboard(); + struct vm_device * pit = create_pit(); + + + +#if GENERIC + generic_port_range_type range[] = { + {0x00, 0x07}, // DMA 1 channels 0,1,2,3 (address, counter) + {0xc0, 0xc7}, // DMA 2 channels 4,5,6,7 (address, counter) + {0x87, 0x87}, // DMA 1 channel 0 page register + {0x83, 0x83}, // DMA 1 channel 1 page register + {0x81, 0x81}, // DMA 1 channel 2 page register + {0x82, 0x82}, // DMA 1 channel 3 page register + {0x8f, 0x8f}, // DMA 2 channel 4 page register + {0x8b, 0x8b}, // DMA 2 channel 5 page register + {0x89, 0x89}, // DMA 2 channel 6 page register + {0x8a, 0x8a}, // DMA 2 channel 7 page register + {0x08, 0x0f}, // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask) + {0xd0, 0xde}, // DMA 2 misc registers + {0x3f0, 0x3f2}, // Primary floppy controller (base,statusa/statusb,DOR) + {0x3f4, 0x3f5}, // Primary floppy controller (mainstat/datarate,data) + {0x3f7, 0x3f7}, // Primary floppy controller (DIR) + {0x370, 0x372}, // Secondary floppy controller (base,statusa/statusb,DOR) + {0x374, 0x375}, // Secondary floppy controller (mainstat/datarate,data) + {0x377, 0x377}, // Secondary floppy controller (DIR) + {0x378, 0x400} + }; + + struct vm_device * generic = create_generic(range,19,NULL,0,NULL,0); + +#endif + + attach_device(&(vm_info), nvram); + //attach_device(&(vm_info), timer); + attach_device(&(vm_info), pic); + attach_device(&(vm_info), pit); + attach_device(&(vm_info), keyboard); + + +#if GENERIC + // Important that this be attached last! + attach_device(&(vm_info), generic); + +#endif + + PrintDebugDevMgr(&(vm_info.dev_mgr)); + } + + // give keyboard interrupts to vm + //hook_irq(&vm_info, 1); + + // give floppy controller to vm + //hook_irq(&vm_info, 6); + + // primary ide + //hook_irq(&vm_info, 14); + + // secondary ide + //hook_irq(&vm_info, 15); + + + vm_info.rip = 0xfff0; + vm_info.vm_regs.rsp = 0x0; } 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; - }