X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=e23e64ea6ff1f9298d573974555de27a33ec59f3;hb=a1e0475bbefa968791679c5e71232ddca522868b;hp=72940ed2aac7d0963e508d0ec80724051c62de17;hpb=a109eb919a162bd7de58d62020801bc2e633be50;p=palacios.git diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c index 72940ed..e23e64e 100644 --- a/palacios/src/geekos/vm.c +++ b/palacios/src/geekos/vm.c @@ -1,15 +1,24 @@ #include -#include + #include #include +#include +#include +#include +#include -#define SPEAKER_PORT 0x61 +//test decoder +//#include -inline void VM_Out_Byte(ushort_t port, uchar_t value) +extern int parse(); + +#define SPEAKER_PORT 0x61 + +static inline void VM_Out_Byte(ushort_t port, uchar_t value) { __asm__ __volatile__ ( "outb %b0, %w1" @@ -21,7 +30,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 +45,90 @@ 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; +char * bochs_info_buf = NULL; +int bochs_info_offset = 0; - for (i = 0; i < length; i++) { - VM_Out_Byte(port, *iter); - iter++; +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); } - return 0; + bochs_debug_buf[bochs_debug_offset++] = *(char*)src; + + if ((*(char*)src == 0xa) || (bochs_debug_offset == 1023)) { + SerialPrint("BOCHSDEBUG>%s", bochs_debug_buf); + memset(bochs_debug_buf, 0, 1024); + bochs_debug_offset = 0; + } + + return length; } +int IO_BOCHS_info(ushort_t port, void * src, uint_t length, void * priv_data) { + if (!bochs_info_buf) { + bochs_info_buf = (char*)Malloc(1024); + } + bochs_info_buf[bochs_info_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_info_offset == 1023)) { + SerialPrint("BOCHSINFO>%s", bochs_info_buf); + memset(bochs_info_buf, 0, 1024); + bochs_info_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; @@ -119,87 +171,86 @@ void BuzzVM() +int passthrough_mem_read(void * guest_addr, void * dst, uint_t length, void * priv_data) { + memcpy(dst, (void*)guest_addr, length); + return length; +} +int passthrough_mem_write(void * guest_addr, void * src, uint_t length, void * priv_data) { + memcpy((void*)guest_addr, src, length); + return length; +} -int RunVMM() { - struct vmm_os_hooks os_hooks; - struct vmm_ctrl_ops vmm_ops; - struct guest_info vm_info; - addr_t rsp; - addr_t rip; +/* We need a configuration mechanism, so we can wrap this completely inside the VMM code, + * with no pollution into the HOST OS + */ - 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)); +int RunVMM(struct Boot_Info * bootInfo) { + void * config_data; - os_hooks.print_debug = &PrintBoth; - os_hooks.print_info = &Print; - os_hooks.print_trace = &SerialPrint; - os_hooks.allocate_pages = &Allocate_VMM_Pages; - os_hooks.free_page = &Free_VMM_Page; - os_hooks.malloc = &VMM_Malloc; - os_hooks.free = &VMM_Free; - os_hooks.vaddr_to_paddr = &Identity; - os_hooks.paddr_to_vaddr = &Identity; + struct vmm_os_hooks os_hooks; + struct vmm_ctrl_ops vmm_ops; + v3_guest_t* vm_info = 0; + - // DumpGDT(); - Init_VMM(&os_hooks, &vmm_ops); - init_shadow_map(&(vm_info.mem_map)); - init_shadow_page_state(&(vm_info.shdw_pg_state)); - vm_info.page_mode = SHADOW_PAGING; + memset(&os_hooks, 0, sizeof(struct vmm_os_hooks)); + memset(&vmm_ops, 0, sizeof(struct vmm_ctrl_ops)); - vm_info.cpu_mode = REAL; + + os_hooks.print_debug = &SerialPrint; + os_hooks.print_info = &Print; + os_hooks.print_trace = &SerialPrint; + os_hooks.allocate_pages = &Allocate_VMM_Pages; + os_hooks.free_page = &Free_VMM_Page; + os_hooks.malloc = &VMM_Malloc; + os_hooks.free = &VMM_Free; + os_hooks.vaddr_to_paddr = &Identity; + os_hooks.paddr_to_vaddr = &Identity; + os_hooks.hook_interrupt = &geekos_hook_interrupt_new; + os_hooks.ack_irq = &ack_irq; + os_hooks.get_cpu_khz = &get_cpu_khz; - init_vmm_io_map(&(vm_info.io_map)); - - if (0) { - - // add_shared_mem_range(&(vm_info.mem_layout), 0, 0x800000, 0x10000); - // add_shared_mem_range(&(vm_info.mem_layout), 0, 0x1000000, 0); - - rip = (ulong_t)(void*)&BuzzVM; - // rip -= 0x10000; - // rip = (addr_t)(void*)&exit_test; - // rip -= 0x2000; - vm_info.rip = rip; - rsp = (addr_t)Alloc_Page(); - - vm_info.vm_regs.rsp = (rsp +4092 );// - 0x2000; - - - } else { - //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); - - 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); - - /* - 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; - } + + Init_V3(&os_hooks, &vmm_ops); + + //test decoder + PrintBoth("testing decoder\n"); + parse(); + PrintBoth("testing decoder done\n"); + - 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"); - (vmm_ops).start_guest(&vm_info); + extern char _binary_vm_kernel_start; + PrintBoth(" Guest Load Addr: 0x%x\n", &_binary_vm_kernel_start); + + config_data = &_binary_vm_kernel_start; - return 0; + vm_info = (vmm_ops).allocate_guest(); + + PrintBoth("Allocated Guest\n"); + + (vmm_ops).config_guest(vm_info, config_data); + PrintBoth("Configured guest\n"); + + v3_hook_io_port(vm_info, 0x61, &IO_Read, &IO_Write, NULL); + //v3_hook_io_port(&vm_info, 0x05, &IO_Read, &IO_Write_to_Serial, NULL); + + + v3_hook_io_port(vm_info, 0x400, &IO_Read, &IO_Write_to_Serial, NULL); + v3_hook_io_port(vm_info, 0x401, &IO_Read, &IO_Write_to_Serial, NULL); + v3_hook_io_port(vm_info, 0x402, &IO_Read, &IO_BOCHS_info, NULL); + v3_hook_io_port(vm_info, 0x403, &IO_Read, &IO_BOCHS_debug, NULL); + + + (vmm_ops).init_guest(vm_info); + PrintBoth("Starting Guest\n"); + //Clear_Screen(); + (vmm_ops).start_guest(vm_info); + + return 0; }