X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fmain.c;h=5e1d714484d7ffbff631fc0cc5bbf9b8f5b714eb;hb=eb7dda8d4a92a2e8d0c8f867c65317d756ca6c11;hp=e92e70d109badbcf0b7e6dae19d2181d35fae53b;hpb=b4963a8a43ca9103946f926e062e609e4498c2e2;p=palacios.git diff --git a/palacios/src/geekos/main.c b/palacios/src/geekos/main.c index e92e70d..5e1d714 100644 --- a/palacios/src/geekos/main.c +++ b/palacios/src/geekos/main.c @@ -3,7 +3,7 @@ * Copyright (c) 2001,2003,2004 David H. Hovemeyer * Copyright (c) 2003, Jeffrey K. Hollingsworth * Copyright (c) 2004, Iulian Neamtiu - * $Revision: 1.14 $ + * $Revision: 1.46 $ * * This is free software. You are permitted to use, * redistribute, and modify it as specified in the file "COPYING". @@ -26,41 +26,61 @@ #include #include #include +#include #include -#include + +#include #include -#include #include -/* - static inline unsigned int cpuid_ecx(unsigned int op) - { - unsigned int eax, ecx; - - __asm__("cpuid" - : "=a" (eax), "=c" (ecx) - : "0" (op) - : "bx", "dx" ); - - return ecx; - } -*/ +#include +#if 0 +#include +#include +#include +#endif +#include +//#include -extern void Get_MSR(ulong_t msr, unsigned int *val1, unsigned int *val2); -extern void Set_MSR(ulong_t msr, ulong_t val1, ulong_t val2); -extern uint_t Get_EIP(); -extern uint_t Get_ESP(); -extern uint_t Get_EBP(); +#define SPEAKER_PORT 0x61 +#define TEST_NE2K 0 +#define BUF ((struct uip_eth_hdr *)&uip_buf[0]) +#if TEST_NE2K +u8_t uip_buf[UIP_BUFSIZE+2]; +u16_t uip_len; -int foo=42; +int Packet_Received(struct NE2K_Packet_Info* info, uchar_t *pkt) { + uip_len = info->size; + int i; + for(i = 0; i < info->size; i++) { + PrintBoth("%x ", *(pkt+i)); + uip_buf[i] = *(pkt+i); + if(i % 10 == 0) + PrintBoth("\n"); + } + Free(pkt); + if(BUF->type == htons(UIP_ETHTYPE_ARP)) { + uip_arp_arpin(); + } else { + uip_arp_ipin(); + uip_input(); + } + return 0; +} +#endif -#define SPEAKER_PORT 0x61 +void Spin() +{ + // hack - competing thread + while (1) {}; + +} void Buzz(unsigned delay, unsigned num) @@ -109,44 +129,6 @@ inline uchar_t MyIn_Byte(ushort_t port) } -extern void MyBuzzVM(); - -#define MYBUZZVM_START MyBuzzVM -#define MYBUZZVM_LEN 0x3d - -void BuzzVM() -{ - int x; - int j; - unsigned char init; - - - SerialPrint("Starting To Buzz\n"); - - init=MyIn_Byte(SPEAKER_PORT); - - while (1) { - MyOut_Byte(SPEAKER_PORT, init|0x2); - for (j=0;j<1000000;j++) { - x+=j; - } - MyOut_Byte(SPEAKER_PORT, init); - for (j=0;j<1000000;j++) { - x+=j; - } - } -} - -extern void RunVM(); - -int vmRunning = 0; - -void RunVM() { - vmRunning = 1; - - while(1); -} - @@ -168,20 +150,6 @@ void Buzzer(ulong_t arg) { -void Hello(ulong_t arg) -{ - char *b="hello "; - char byte; - short port=0xe9; - int i; - while(1){ - for (i=0;i<6;i++) { - byte=b[i]; - __asm__ __volatile__ ("outb %b0, %w1" : : "a"(byte), "Nd"(port) ); - } - } -} - void Keyboard_Listener(ulong_t arg) { ulong_t * doIBuzz = (ulong_t*)arg; Keycode key_press; @@ -208,47 +176,13 @@ extern char BSS_START, BSS_END; extern char end; -/* -void VM_Thread(ulong_t arg) -{ - int ret; - struct VMDescriptor *vm = (struct VMDescriptor *) arg; - - SerialPrintLevel(100,"VM_Thread: Launching VM with (entry_ip=%x, exit_eip=%x, guest_esp=%x)\n", - vm->entry_ip, vm->exit_eip, vm->guest_esp); - - SerialPrintLevel(100,"VM_Thread: You should see nothing further from me\n"); - - - ret = VMLaunch(vm); - - - SerialPrintLevel(100,"VM_Thread: uh oh..."); - - switch (ret) { - case VMX_SUCCESS: - SerialPrintLevel(100,"Normal VMExit Occurred\n"); - break; - case VMX_FAIL_INVALID: - SerialPrintLevel(100,"Possibile invalid VMCS (%.8x)\n", ret); - break; - case VMX_FAIL_VALID: - SerialPrintLevel(100,"Valid VMCS, errorcode recorded in VMCS\n"); - break; - case VMM_ERROR: - SerialPrintLevel(100,"VMM Error\n"); - break; - default: - SerialPrintLevel(100,"VMLaunch returned unknown error (%.8x)\n", ret); - break; - } - - SerialPrintLevel(100,"VM_Thread: Spinning\n"); - while (1) {} - -} -*/ +/* This is an ugly hack to get at the VM memory */ +ulong_t vm_range_start; +ulong_t vm_range_end; +ulong_t guest_kernel_start; +ulong_t guest_kernel_end; +/* ** */ int AllocateAndMapPagesForRange(uint_t start, uint_t length, pte_t template_pte) @@ -279,18 +213,27 @@ int AllocateAndMapPagesForRange(uint_t start, uint_t length, pte_t template_pte) */ void Main(struct Boot_Info* bootInfo) { - struct Kernel_Thread * key_thread; - struct Kernel_Thread * spkr_thread; - // struct Kernel_Thread * vm_thread; - // struct VMDescriptor vm; - ulong_t doIBuzz = 0; + + //Out_Byte(0x1234,5); + //Out_Byte(0x1234,5); Init_BSS(); Init_Screen(); - Init_Serial(); + + /* { + extern char BSS_START, BSS_END; + + SerialPrint("BSS 0x%x->0x%x\n", &BSS_START, &BSS_END); + + }*/ + + + // SerialPrint("Guest Mem Dump at 0x%x\n", 0x100000); + //SerialMemDump((unsigned char *)(0x100000), 261 * 1024); + Init_Mem(bootInfo); Init_CRC32(); Init_TSS(); @@ -301,126 +244,120 @@ void Main(struct Boot_Info* bootInfo) Init_Keyboard(); Init_VM(bootInfo); Init_Paging(); + + //Init_PCI(); - // Init_IDE(); + Init_Stubs(); - Print("Done; stalling\n"); +#if 0 + { + init_network(); + uchar_t local_addr[4]; + uchar_t remote_addr[4]; + local_addr[0] = 10; + local_addr[1] = 0; + local_addr[2] = 2; + local_addr[3] = 21; - -#if 0 - SerialPrint("Dumping VM kernel Code (first 512 bytes @ 0x%x)\n",VM_KERNEL_START); - SerialMemDump((unsigned char *)VM_KERNEL_START, 512); - /* - SerialPrint("Dumping kernel Code (first 512 bytes @ 0x%x)\n",KERNEL_START); - SerialMemDump((unsigned char *)VM_KERNEL_START, 512); - */ -#endif + set_ip_addr(local_addr); -#if 0 - SerialPrint("Dumping GUEST KERNEL CODE (first 512*2 bytes @ 0x100000)\n"); - SerialMemDump((unsigned char *)0x100000, 512*2); -#endif + remote_addr[0] = 10; + remote_addr[1] = 0; + remote_addr[2] = 2; + remote_addr[3] = 20; + connect(remote_addr, 4301); + } +#elif 0 + Init_Ne2k(&Packet_Received); + uip_init(); + uip_arp_init(); - { - struct vmm_os_hooks os_hooks; - struct vmm_ctrl_ops vmm_ops; - guest_info_t vm_info; - memset(&os_hooks, 0, sizeof(struct vmm_os_hooks)); - memset(&vmm_ops, 0, sizeof(struct vmm_ctrl_ops)); - memset(&vm_info, 0, sizeof(guest_info_t)); - - 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; - - Init_VMM(&os_hooks, &vmm_ops); + uip_ipaddr_t ipaddr; + uip_ipaddr(ipaddr, 10,0,2,21); /* Local IP address */ + uip_sethostaddr(ipaddr); + + uip_ipaddr_t ripaddr; + uip_ipaddr(ripaddr, 10,0,2,20); /* Remote IP address */ + /* Attempt a connection to port 8080 at address 10.0.2.20 */ + struct uip_conn *conn; + conn = uip_connect(&ripaddr, HTONS(8080)); + while(uip_len <= 0) { + uip_periodic_conn(conn); + } + NE2K_Transmit(uip_len+UIP_LLH_LEN); /* This will transmit an ARP packet */ - vm_info.rip = (ullong_t)(void*)&BuzzVM; - vm_info.rsp = (ulong_t)Alloc_Page(); + int l = 0; + while(l++ < 5000); /* When this is done, a response to the ARP should have been received. */ + conn = uip_connect(&ripaddr, HTONS(8080)); - SerialPrint("Initializing Guest\n"); - (vmm_ops).init_guest(&vm_info); - SerialPrint("Starting Guest\n"); - (vmm_ops).start_guest(&vm_info); - + while(uip_len <= 0) { + uip_periodic_conn(conn); } + NE2K_Transmit(uip_len+UIP_LLH_LEN); /* This *should* transmit a SYN packet */ +#endif /* TEST_NE2K */ - SerialPrintLevel(1000,"Launching Noisemaker and keyboard listener threads\n"); - - key_thread = Start_Kernel_Thread(Keyboard_Listener, (ulong_t)&doIBuzz, PRIORITY_NORMAL, false); - spkr_thread = Start_Kernel_Thread(Buzzer, (ulong_t)&doIBuzz, PRIORITY_NORMAL, false); - + // Init_IDE(); + // Print("Done; stalling\n"); + +#if 0 + SerialPrint("Dumping VM kernel Code (first 128 bytes @ 0x%x)\n", 0x100000); + SerialMemDump((unsigned char *)0x100000, 256); + /* + SerialPrint("Dumping kernel Code (first 512 bytes @ 0x%x)\n",KERNEL_START); + SerialMemDump((unsigned char *)VM_KERNEL_START, 512); + */ +#endif - // Try to launch a real VM +#if 1 + struct Kernel_Thread *spin_thread; + spin_thread=Start_Kernel_Thread(Spin,0,PRIORITY_NORMAL,false); - // We now map pages of physical memory into where we are going - // to slap the vmxassist, bios, and vgabios code - /* - pte_t template_pte; - - template_pte.present=1; - template_pte.flags=VM_WRITE|VM_READ|VM_USER|VM_EXEC; - template_pte.accessed=0; - template_pte.dirty=0; - template_pte.pteAttribute=0; - template_pte.globalPage=0; - template_pte.kernelInfo=0; - - SerialPrintLevel(1000,"Allocating Pages for VM kernel\n"); - -#define SEGLEN (1024*64) +#endif - AllocateAndMapPagesForRange(START_OF_VM+0x100000, VM_KERNEL_LENGTH / 512, template_pte); -*/ - // Now we should be copying into actual memory +#if 0 + { - //SerialPrintLevel(1000,"Copying VM code from %x to %x (%d bytes)\n", VM_KERNEL_START, START_OF_VM+0x100000,VM_KERNEL_LENGTH); - //memcpy((char*)(START_OF_VM+0x100000),(char*)VM_KERNEL_START,VM_KERNEL_LENGTH); + struct Kernel_Thread * key_thread; + struct Kernel_Thread * spkr_thread; - //SerialPrintLevel(1000, "VM copied\n"); + ulong_t doIBuzz = 0; + SerialPrint("Dumping BIOS code ffff0-fffff\n\n"); + SerialMemDump((unsigned char *)0x10fff0, 16); /* - // jump into vmxassist - vm.entry_ip=(uint_t)0x00107fd0; - vm.exit_eip=0; - // Put the stack at 512K - vm.guest_esp=(uint_t)4096 + 8192 - 4; - *(unsigned int *)(vm.guest_esp) = 1024 * 1024; - vm.guest_esp -= 4; - *(unsigned int *)(vm.guest_esp) = 8; - vm.guest_esp -= 4; - *(unsigned int *)(vm.guest_esp) = vm.guest_esp + 4;; - vm.guest_esp -= 4; - *(unsigned int *)(vm.guest_esp) = vm.entry_ip; - // vm.guest_esp -= 4; - - - SerialMemDump((unsigned char *)vm.entry_ip, 512); + SerialPrint("Dumping kernel Code (first 512 bytes @ 0x%x)\n",KERNEL_START); + SerialMemDump((unsigned char *)VM_KERNEL_START, 512); */ - - // vm_thread = Start_Kernel_Thread(VM_Thread, (ulong_t)&vm,PRIORITY_NORMAL,false); - - SerialPrintLevel(1000,"Next: setup GDT\n"); + SerialPrint("Noisemaker and keyboard listener threads\n"); + key_thread = Start_Kernel_Thread(Keyboard_Listener, (ulong_t)&doIBuzz, PRIORITY_NORMAL, false); + spkr_thread = Start_Kernel_Thread(Buzzer, (ulong_t)&doIBuzz, PRIORITY_NORMAL, false); + } +#endif + { + RunVMM(bootInfo); + } + + + SerialPrint("RunVMM returned, spinning\n"); + while (1) {} + TODO("Write a Virtual Machine Monitor"); - - /* Now this thread is done. */ + Exit(0); }