X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fmm_phys.c;h=1e7c4c2a7ab6e731802b991bee9b784dd281c7f4;hb=4bc68df387ca7de4a0616d779509e5ebc05d0de4;hp=3f5df3755d356d00b52a9523ec5a93f10f4eb70c;hpb=375dd210e083ab233903ba3804ad629fc7365189;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86_64/mm_phys.c b/Kernel/arch/x86_64/mm_phys.c index 3f5df375..1e7c4c2a 100644 --- a/Kernel/arch/x86_64/mm_phys.c +++ b/Kernel/arch/x86_64/mm_phys.c @@ -3,6 +3,7 @@ * * Physical Memory Manager */ +#define DEBUG 0 #include #include #include @@ -21,6 +22,14 @@ enum eMMPhys_Ranges extern void gKernelBase; extern void gKernelEnd; +// === PROTOTYPES === +void MM_InitPhys_Multiboot(tMBoot_Info *MBoot); +tPAddr MM_AllocPhysRange(int Num, int Bits); +tPAddr MM_AllocPhys(void); +void MM_RefPhys(tPAddr PAddr); +void MM_DerefPhys(tPAddr PAddr); + int MM_int_GetRangeID( tPAddr Addr ); + // === GLOBALS === tSpinlock glPhysicalPages; Uint64 *gaSuperBitmap; // 1 bit = 64 Pages, 16 MiB Per Word @@ -53,18 +62,18 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot) tVAddr vaddr; tPAddr paddr, firstFreePage; - Log("MM_InitPhys_Multiboot: (MBoot=%p)", MBoot); + ENTER("pMBoot=%p", MBoot); // Scan the physical memory map // Looking for the top of physical memory mmapStart = (void *)( KERNEL_BASE | MBoot->MMapAddr ); - Log(" MM_InitPhys_Multiboot: mmapStart = %p", mmapStart); + LOG("mmapStart = %p", mmapStart); ent = mmapStart; while( (Uint)ent < (Uint)mmapStart + MBoot->MMapLength ) { // Adjust for the size of the entry ent->Size += 4; - Log(" MM_InitPhys_Multiboot: ent={Type:%i,Base:0x%x,Length:%x", + LOG("ent={Type:%i,Base:0x%x,Length:%x", ent->Type, ent->Base, ent->Length); // If entry is RAM and is above `maxAddr`, change `maxAddr` @@ -84,7 +93,7 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot) // Goodie, goodie gumdrops giMaxPhysPage = maxAddr >> 12; } - Log(" MM_InitPhys_Multiboot: giMaxPhysPage = 0x%x", giMaxPhysPage); + LOG("giMaxPhysPage = 0x%x", giMaxPhysPage); // Find a contigous section of memory to hold it in // - Starting from the end of the kernel @@ -92,8 +101,7 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot) superPages = ((giMaxPhysPage+64*8-1)/(64*8) + 0xFFF) >> 12; numPages = (giMaxPhysPage + 7) / 8; numPages = (numPages + 0xFFF) >> 12; - Log(" MM_InitPhys_Multiboot: numPages = %i, superPages = %i", - numPages, superPages); + LOG("numPages = %i, superPages = %i", numPages, superPages); if(maxAddr == 0) { int todo = numPages*2 + superPages; @@ -145,9 +153,13 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot) if( ent->Base + ent->Size < (tPAddr)&gKernelBase ) continue; + LOG("%x <= %x && %x > %x", + ent->Base, (tPAddr)&gKernelBase, + ent->Base + ent->Size, (tPAddr)&gKernelEnd - KERNEL_BASE + ); // Check if the kernel is in this range if( ent->Base <= (tPAddr)&gKernelBase - && ent->Base + ent->Size > (tPAddr)&gKernelEnd - KERNEL_BASE ) + && ent->Base + ent->Length > (tPAddr)&gKernelEnd - KERNEL_BASE ) { avail = ent->Length >> 12; avail -= ((tPAddr)&gKernelEnd - KERNEL_BASE - ent->Base) >> 12; @@ -194,14 +206,14 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot) // Save the current value of paddr to simplify the allocation later firstFreePage = paddr; - Log(" MM_InitPhys_Multiboot: Clearing multi bitmap"); + LOG("Clearing multi bitmap"); // Fill the bitmaps memset(gaMultiBitmap, 0, numPages<<12); // - initialise to one, then clear the avaliable areas memset(gaMainBitmap, -1, numPages<<12); - Log(" MM_InitPhys_Multiboot: Setting main bitmap"); + LOG("Setting main bitmap"); // - Clear all Type=1 areas - Log(" MM_InitPhys_Multiboot: Clearing valid regions"); + LOG("Clearing valid regions"); for( ent = mmapStart; (Uint)ent < (Uint)mmapStart + MBoot->MMapLength; @@ -250,6 +262,7 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot) val <<= (size/8)&7; gaMainBitmap[base / 64] |= val; } + // Free the unused static allocs for( i = 0; i < NUM_STATIC_ALLOC; i++) { if(gaiStaticAllocPages[i] != 0) @@ -259,13 +272,36 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot) } // Fill the super bitmap - Log(" MM_InitPhys_Multiboot: Filling super bitmap"); + LOG("Filling super bitmap"); memset(gaSuperBitmap, 0, superPages<<12); - for( base = 0; base < giMaxPhysPage/64; base ++) + for( base = 0; base < (size+63)/64; base ++) { if( gaMainBitmap[ base ] == -1 ) gaSuperBitmap[ base/64 ] |= 1 << (base&63); } + + // Set free page counts + for( base = 1; base < giMaxPhysPage; base ++ ) + { + int rangeID; + // Skip allocated + if( gaMainBitmap[ base >> 6 ] & (1 << (base&63)) ) continue; + + // Get range ID + rangeID = MM_int_GetRangeID( base << 12 ); + + // Increment free page count + giPhysRangeFree[ rangeID ] ++; + + // Check for first free page in range + if(giPhysRangeFirst[ rangeID ] == 0) + giPhysRangeFirst[ rangeID ] = base; + // Set last (when the last free page is reached, this won't be + // updated anymore, hence will be correct) + giPhysRangeLast[ rangeID ] = base; + } + + LEAVE('-'); } /** @@ -282,31 +318,22 @@ tPAddr MM_AllocPhysRange(int Num, int Bits) int rangeID; int nFree = 0, i; - Log("MM_AllocPhysRange: (Num=%i,Bits=%i)", Num, Bits); + ENTER("iNum iBits", Num, Bits); - if( Bits <= 0 ) // Speedup for the common case + if( Bits <= 0 || Bits >= 64 ) // Speedup for the common case rangeID = MM_PHYS_MAX; - else if( Bits > 32 ) - rangeID = MM_PHYS_MAX; - else if( Bits > 24 ) - rangeID = MM_PHYS_32BIT; - else if( Bits > 20 ) - rangeID = MM_PHYS_24BIT; - else if( Bits > 16 ) - rangeID = MM_PHYS_20BIT; else - rangeID = MM_PHYS_16BIT; + rangeID = MM_int_GetRangeID( (1 << Bits) -1 ); - Log(" MM_AllocPhysRange: rangeID = %i", rangeID); + LOG("rangeID = %i", rangeID); LOCK(&glPhysicalPages); - Log(" MM_AllocPhysRange: i has lock"); // Check if the range actually has any free pages while(giPhysRangeFree[rangeID] == 0 && rangeID) rangeID --; - Log(" MM_AllocPhysRange: rangeID = %i", rangeID); + LOG("rangeID = %i", rangeID); // What the? Oh, man. No free pages if(giPhysRangeFree[rangeID] == 0) { @@ -318,20 +345,27 @@ tPAddr MM_AllocPhysRange(int Num, int Bits) "Out of memory (unable to fulfil request for %i pages), zero remaining", Num ); + LEAVE('i', 0); return 0; } // Check if there is enough in the range if(giPhysRangeFree[rangeID] >= Num) { + LOG("{%i,0x%x -> 0x%x}", + giPhysRangeFree[rangeID], + giPhysRangeFirst[rangeID], giPhysRangeLast[rangeID] + ); // Do a cheap scan, scanning upwards from the first free page in // the range - nFree = 1; + nFree = 0; addr = giPhysRangeFirst[ rangeID ]; - while( addr < giPhysRangeLast[ rangeID ] ) + while( addr <= giPhysRangeLast[ rangeID ] ) { + //Log(" MM_AllocPhysRange: addr = 0x%x", addr); // Check the super bitmap if( gaSuperBitmap[addr >> (6+6)] == -1 ) { + LOG("nFree = %i = 0 (super) (0x%x)", nFree, addr); nFree = 0; addr += 1 << (6+6); addr &= (1 << (6+6)) - 1; @@ -339,6 +373,7 @@ tPAddr MM_AllocPhysRange(int Num, int Bits) } // Check page block (64 pages) if( gaSuperBitmap[addr >> (6+6)] & (1 << (addr>>6)&63)) { + LOG("nFree = %i = 0 (main) (0x%x)", nFree, addr); nFree = 0; addr += 1 << (12+6); addr &= (1 << (12+6)) - 1; @@ -346,15 +381,18 @@ tPAddr MM_AllocPhysRange(int Num, int Bits) } // Check individual page if( gaMainBitmap[addr >> 6] & (1 << (addr & 63)) ) { + LOG("nFree = %i = 0 (page) (0x%x)", nFree, addr); nFree = 0; addr ++; continue; } nFree ++; addr ++; + LOG("nFree(%i) == %i (0x%x)", nFree, Num, addr); if(nFree == Num) break; } + LOG("nFree = %i", nFree); // If we don't find a contiguous block, nFree will not be equal // to Num, so we set it to zero and do the expensive lookup. if(nFree != Num) nFree = 0; @@ -370,28 +408,26 @@ tPAddr MM_AllocPhysRange(int Num, int Bits) RELEASE(&glPhysicalPages); // TODO: Page out // ATM. Just Warning + Warning(" MM_AllocPhysRange: Out of memory (unable to fulfil request for %i pages)", Num); Log_Warning("Arch", "Out of memory (unable to fulfil request for %i pages)", Num ); + LEAVE('i', 0); return 0; } - Log(" MM_AllocPhysRange: nFree = %i, addr = 0x%08x", nFree, addr); + LOG("nFree = %i, addr = 0x%08x", nFree, addr); // Mark pages as allocated addr -= Num; for( i = 0; i < Num; i++ ) { - gaiPageReferences[addr >> 6] |= 1 << (addr & 63); - - if(addr >> 32) rangeID = MM_PHYS_MAX; - else if(addr >> 24) rangeID = MM_PHYS_32BIT; - else if(addr >> 20) rangeID = MM_PHYS_24BIT; - else if(addr >> 16) rangeID = MM_PHYS_20BIT; - else if(addr >> 0) rangeID = MM_PHYS_16BIT; + gaMainBitmap[addr >> 6] |= 1 << (addr & 63); + rangeID = MM_int_GetRangeID(addr); giPhysRangeFree[ rangeID ] --; } - // Fill super bitmap + + // Update super bitmap Num += addr & (64-1); addr &= ~(64-1); Num = (Num + (64-1)) & ~(64-1); @@ -402,6 +438,7 @@ tPAddr MM_AllocPhysRange(int Num, int Bits) } RELEASE(&glPhysicalPages); + LEAVE('x', addr << 12); return addr << 12; } @@ -418,6 +455,7 @@ tPAddr MM_AllocPhys(void) if( gaiStaticAllocPages[i] ) { tPAddr ret = gaiStaticAllocPages[i]; gaiStaticAllocPages[i] = 0; + Log("MM_AllocPhys: Return %x, static alloc %i", ret, i); return ret; } } @@ -468,7 +506,34 @@ void MM_DerefPhys(tPAddr PAddr) else gaMainBitmap[ page >> 6 ] &= ~(1 << (page&63)); + // TODO: Update free counts + if( !(gaMainBitmap[ page >> 6 ] & (1 << (page&63))) ) + { + int rangeID; + rangeID = MM_int_GetRangeID( PAddr ); + giPhysRangeFree[ rangeID ] ++; + } + if(gaMainBitmap[ page >> 6 ] == 0) { gaSuperBitmap[page >> 12] &= ~(1 << ((page >> 6) & 63)); } } + +/** + * \brief Takes a physical address and returns the ID of its range + * \param Addr Physical address of page + * \return Range ID from eMMPhys_Ranges + */ +int MM_int_GetRangeID( tPAddr Addr ) +{ + if(Addr >> 32) + return MM_PHYS_MAX; + else if(Addr >> 24) + return MM_PHYS_32BIT; + else if(Addr >> 20) + return MM_PHYS_24BIT; + else if(Addr >> 16) + return MM_PHYS_20BIT; + else + return MM_PHYS_16BIT; +}