X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fmem.c;h=b7ae0266f6180d915d43a4faf793a56272a8d635;hb=f9bb3db89469169bb5775dc031d89e570c6fed70;hp=6b3263d307a73ce26ff1e1eca489dd409dfc04e6;hpb=1831ffe56d9eeb2bde9b5584227dcaf958dad70d;p=palacios.git diff --git a/palacios/src/geekos/mem.c b/palacios/src/geekos/mem.c index 6b3263d..b7ae026 100644 --- a/palacios/src/geekos/mem.c +++ b/palacios/src/geekos/mem.c @@ -2,7 +2,8 @@ * Physical memory allocation * Copyright (c) 2001,2003,2004 David H. Hovemeyer * Copyright (c) 2003, Jeffrey K. Hollingsworth - * $Revision: 1.8 $ + * Copyright (c) 2008, Jack Lange + * $Revision: 1.13 $ * * This is free software. You are permitted to use, * redistribute, and modify it as specified in the file "COPYING". @@ -32,6 +33,11 @@ */ struct Page* g_pageList; +#ifdef RAMDISK_BOOT +ulong_t g_ramdiskImage; +ulong_t s_ramdiskSize; +#endif + /* * Number of pages currently available on the freelist. */ @@ -79,7 +85,7 @@ static void Add_Page_Range(ulong_t start, ulong_t end, int flags) { ulong_t addr; - PrintBoth("Start: %u, End: %u (Type=0x%.4x)\n", (unsigned int)start, (unsigned int)end, flags); + PrintBoth("Start: %u (0x%x), End: %u(0x%x) (Type=0x%.4x)\n", (unsigned int)start, start, (unsigned int)end, end, flags); KASSERT(Is_Page_Multiple(start)); KASSERT(Is_Page_Multiple(end)); @@ -131,11 +137,18 @@ void Init_Mem(struct Boot_Info* bootInfo) ulong_t pageListAddr; ulong_t pageListEnd; ulong_t kernEnd; - ulong_t guestEnd; ulong_t heapAddr; ulong_t heapEnd; ulong_t vmmMemEnd; + /*Zheng 08/03/2008*/ +#ifdef RAMDISK_BOOT + g_ramdiskImage = bootInfo->ramdisk_image; + s_ramdiskSize = bootInfo->ramdisk_size; + ulong_t initrdAddr; + ulong_t initrdEnd; +#endif + KASSERT(bootInfo->memSizeKB > 0); @@ -148,7 +161,7 @@ void Init_Mem(struct Boot_Info* bootInfo) PrintBoth("Total Memory Size: %u MBytes\n", bootInfo->memSizeKB/1024); - PrintBoth("Page List Size: %u bytes\n", numPageListBytes); + PrintBoth("Page List (at 0x%x) Size: %u bytes\n", &s_freeList, numPageListBytes); /* Memory Layout: @@ -156,18 +169,21 @@ void Init_Mem(struct Boot_Info* bootInfo) * kernel_thread_obj (1 page) * kernel_stack (1 page) * available space - * start - end: kernel * available space * ISA_HOLE_START - ISA_HOLE_END: hardware * EXTENDED_MEMORY: + * start - end: kernel * VM Guest (variable pages) * Heap (512 Pages) * Page List (variable pages) * Available Memory for VMM (4096 pages) + * Ramdisk //Zheng 08/03/2008 * VM Memory (everything else) */ - kernEnd = Round_Up_To_Page((ulong_t)&end); + //kernEnd = Round_Up_To_Page((ulong_t)&end); + kernEnd = (ulong_t)&end; + PrintBoth("Kernel End=%lx\n", kernEnd); @@ -175,8 +191,8 @@ void Init_Mem(struct Boot_Info* bootInfo) /* If we have dynamic loading of the guest kernel, we should put the relocation code here */ /* ************************************************************************************** */ - guestEnd = Round_Up_To_Page(ISA_HOLE_END + bootInfo->guest_size); - heapAddr = guestEnd; + kernEnd = Round_Up_To_Page(kernEnd); + heapAddr = kernEnd; heapEnd = Round_Up_To_Page(heapAddr + KERNEL_HEAP_SIZE); pageListAddr = heapEnd; pageListEnd = Round_Up_To_Page(pageListAddr + numPageListBytes); @@ -187,29 +203,57 @@ void Init_Mem(struct Boot_Info* bootInfo) /* ** */ vmmMemEnd = Round_Up_To_Page(pageListEnd + VMM_AVAIL_MEM_SIZE); +#ifdef RAMDISK_BOOT + /* + * Zheng 08/03/2008 + * copy the ramdisk to this area + */ + initrdAddr = vmmMemEnd; + initrdEnd = Round_Up_To_Page(initrdAddr + s_ramdiskSize); + PrintBoth("mem.c(%d) Move ramdisk(%dB) from %x to %x", __LINE__, s_ramdiskSize, g_ramdiskImage, initrdAddr); + memcpy((ulong_t *)initrdAddr, (ulong_t *)g_ramdiskImage, s_ramdiskSize); + PrintBoth(" done\n"); + PrintBoth("mem.c(%d) Set 0 to unused bytes in the last ramdisk page from %x to %x", __LINE__, initrdAddr+s_ramdiskSize, initrdEnd); + memset((ulong_t *)initrdAddr+s_ramdiskSize, 0, initrdEnd-(initrdAddr+s_ramdiskSize)); + PrintBoth(" done\n"); + /* + * Zheng 08/03/2008 + */ + vm_range_start = initrdEnd; + vm_range_end = endOfMem; +#else + /* * the disgusting way to get at the memory assigned to a VM */ + vm_range_start = vmmMemEnd; vm_range_end = endOfMem; - guest_kernel_start = ISA_HOLE_END; - guest_kernel_end = guestEnd; + +#endif Add_Page_Range(0, PAGE_SIZE, PAGE_UNUSED); // BIOS area Add_Page_Range(PAGE_SIZE, PAGE_SIZE * 3, PAGE_ALLOCATED); // Intial kernel thread obj + stack - Add_Page_Range(PAGE_SIZE * 3, KERNEL_START_ADDR, PAGE_AVAIL); // Available space - Add_Page_Range(KERNEL_START_ADDR, kernEnd, PAGE_KERN); // VMM Kernel - Add_Page_Range(kernEnd, ISA_HOLE_START, PAGE_AVAIL); // Available Space + Add_Page_Range(PAGE_SIZE * 3, ISA_HOLE_START, PAGE_AVAIL); // Available space Add_Page_Range(ISA_HOLE_START, ISA_HOLE_END, PAGE_HW); // Hardware ROMs - Add_Page_Range(ISA_HOLE_END, guestEnd, PAGE_VM); // Guest kernel location + Add_Page_Range(KERNEL_START_ADDR, kernEnd, PAGE_KERN); // VMM Kernel + // Add_Page_Range(guest_kernel_start, guestEnd, PAGE_VM); // Guest kernel location Add_Page_Range(heapAddr, heapEnd, PAGE_HEAP); // Heap - Add_Page_Range(pageListAddr, pageListEnd, PAGE_KERN); // Page List - Add_Page_Range(pageListEnd, vmmMemEnd, PAGE_AVAIL); // Available VMM memory - // Add_Page_Range(vmmMemEnd, endOfMem, PAGE_VM); // Memory allocated to the VM - // Until we get a more intelligent memory allocator - Add_Page_Range(vmmMemEnd, endOfMem, PAGE_AVAIL); // Memory allocated to the VM + Add_Page_Range(pageListAddr, pageListEnd, PAGE_KERN); // Page List + Add_Page_Range(pageListEnd, vmmMemEnd, PAGE_AVAIL); // Available VMM memory +#ifdef RAMDISK_BOOT + /* + * Zheng 08/03/2008 + */ + Add_Page_Range(vmmMemEnd, initrdEnd, PAGE_ALLOCATED); //Ramdisk memory area + // Add_Page_Range(vmmMemEnd, endOfMem, PAGE_VM); // Memory allocated to the VM + // Until we get a more intelligent memory allocator + Add_Page_Range(initrdEnd, endOfMem, PAGE_AVAIL); // Memory allocated to the VM +#else + Add_Page_Range(vmmMemEnd, endOfMem, PAGE_AVAIL); // Memory allocated to the VM +#endif /* Initialize the kernel heap */ Init_Heap(heapAddr, KERNEL_HEAP_SIZE); @@ -221,15 +265,24 @@ void Init_Mem(struct Boot_Info* bootInfo) PrintBoth("%x to %x - BIOS AREA\n", 0, PAGE_SIZE - 1); PrintBoth("%x to %x - KERNEL_THREAD_OBJ\n", PAGE_SIZE, PAGE_SIZE * 2 - 1); PrintBoth("%x to %x - KERNEL_STACK\n", PAGE_SIZE * 2, PAGE_SIZE * 3 - 1); - PrintBoth("%lx to %x - FREE\n", PAGE_SIZE * 3, KERNEL_START_ADDR - 1); - PrintBoth("%x to %x - KERNEL CODE\n", KERNEL_START_ADDR, kernEnd - 1); - PrintBoth("%lx to %x - FREE\n", kernEnd, ISA_HOLE_START - 1); + PrintBoth("%lx to %x - FREE\n", PAGE_SIZE * 3, ISA_HOLE_START - 1); PrintBoth("%x to %x - ISA_HOLE\n", ISA_HOLE_START, ISA_HOLE_END - 1); - PrintBoth("%x to %x - VM_KERNEL\n", ISA_HOLE_END, guestEnd - 1); + PrintBoth("%x to %x - KERNEL CODE + VM_KERNEL\n", KERNEL_START_ADDR, kernEnd - 1); + // PrintBoth("%x to %x - VM_KERNEL\n", kernEnd, guestEnd - 1); PrintBoth("%x to %x - KERNEL HEAP\n", heapAddr, heapEnd - 1); PrintBoth("%lx to %lx - PAGE LIST\n", pageListAddr, pageListEnd - 1); PrintBoth("%lx to %x - FREE\n", pageListEnd, vmmMemEnd - 1); + +#ifdef RAMDISK_BOOT + /* + * Zheng 08/03/2008 + */ + PrintBoth("%lx to %x - RAMDISK\n", vmmMemEnd, initrdEnd - 1); + + PrintBoth("%lx to %x - GUEST_MEMORY (also free)\n", initrdEnd, endOfMem - 1); +#else PrintBoth("%lx to %x - GUEST_MEMORY (also free)\n", vmmMemEnd, endOfMem - 1); +#endif } /*