X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fmem.c;h=b7054254250e447d34d1b1687860a652a38d5b4c;hb=f7cc83b3bae64c853f5b7b63e2830b1ea92dfed9;hp=5267ee139b1f1c5feb9f1a2f635544c2f17d5791;hpb=190b2ef9470c23c275754b74745933d973f8c439;p=palacios.releases.git diff --git a/palacios/src/geekos/mem.c b/palacios/src/geekos/mem.c index 5267ee1..b705425 100644 --- a/palacios/src/geekos/mem.c +++ b/palacios/src/geekos/mem.c @@ -1,8 +1,8 @@ -/* + /* * Physical memory allocation * Copyright (c) 2001,2003,2004 David H. Hovemeyer * Copyright (c) 2003, Jeffrey K. Hollingsworth - * $Revision: 1.4 $ + * $Revision: 1.9 $ * * This is free software. You are permitted to use, * redistribute, and modify it as specified in the file "COPYING". @@ -22,6 +22,7 @@ #include #include + /* ---------------------------------------------------------------------- * Global data * ---------------------------------------------------------------------- */ @@ -36,6 +37,18 @@ struct Page* g_pageList; */ uint_t g_freePageCount = 0; + + +/* + * the disgusting way to get at the memory assigned to a VM + */ +extern ulong_t vm_range_start; +extern ulong_t vm_range_end; +extern ulong_t guest_kernel_start; +extern ulong_t guest_kernel_end; + + + /* ---------------------------------------------------------------------- * Private data and functions * ---------------------------------------------------------------------- */ @@ -56,6 +69,9 @@ static struct Page_List s_freeList; */ int unsigned s_numPages; + + + /* * Add a range of pages to the inventory of physical memory. */ @@ -63,7 +79,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)); @@ -115,7 +131,6 @@ 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; @@ -132,7 +147,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: @@ -140,10 +155,10 @@ 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) @@ -151,7 +166,9 @@ void Init_Mem(struct Boot_Info* bootInfo) * 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); @@ -159,8 +176,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); @@ -172,20 +189,24 @@ void Init_Mem(struct Boot_Info* bootInfo) vmmMemEnd = Round_Up_To_Page(pageListEnd + VMM_AVAIL_MEM_SIZE); - + /* + * the disgusting way to get at the memory assigned to a VM + */ + vm_range_start = vmmMemEnd; + vm_range_end = endOfMem; 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 - + // 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 /* Initialize the kernel heap */ @@ -198,15 +219,14 @@ 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); - PrintBoth("%lx to %x - GUEST_MEMORY\n", vmmMemEnd, endOfMem - 1); + PrintBoth("%lx to %x - GUEST_MEMORY (also free)\n", vmmMemEnd, endOfMem - 1); } /* @@ -218,7 +238,8 @@ void Init_BSS(void) /* Fill .bss with zeroes */ memset(&BSS_START, '\0', &BSS_END - &BSS_START); - PrintBoth("BSS Inited, BSS_START=%x, BSS_END=%x\n",BSS_START,BSS_END); + // screen is not inited yet - PAD + // PrintBoth("BSS Inited, BSS_START=%x, BSS_END=%x\n",BSS_START,BSS_END); } /*