#include <mboot.h>
#include <mm_virt.h>
-#define USE_STACK 1
+//#define USE_STACK 1
+#define TRACE_ALLOCS 0 // Print trace messages on AllocPhys/DerefPhys
-#define REFERENCE_BASE 0xE0400000
// === IMPORTS ===
extern void gKernelEnd;
// === PROTOTYPES ===
-tPAddr MM_AllocPhys(void);
-tPAddr MM_AllocPhysRange(int Pages, int MaxBits);
-void MM_RefPhys(tPAddr PAddr);
-void MM_DerefPhys(tPAddr PAddr);
+void MM_Install(tMBoot_Info *MBoot);
+//tPAddr MM_AllocPhys(void);
+//tPAddr MM_AllocPhysRange(int Pages, int MaxBits);
+//void MM_RefPhys(tPAddr PAddr);
+//void MM_DerefPhys(tPAddr PAddr);
+// int MM_GetRefCount(tPAddr PAddr);
// === GLOBALS ===
tMutex glPhysAlloc;
Uint32 gaSuperBitmap[1024]; // Blocks of 1024 Pages
Uint32 gaPageBitmap[1024*1024/32]; // Individual pages
-Uint32 *gaPageReferences;
+ int *gaPageReferences;
+void **gaPageNodes = (void*)MM_PAGENODE_BASE;
+#define REFENT_PER_PAGE (0x1000/sizeof(gaPageReferences[0]))
// === CODE ===
void MM_Install(tMBoot_Info *MBoot)
while(num--)
MM_RefPhys( (mods[i].Start & ~0xFFF) + (num<<12) );
}
-
- // Allocate References
- //LOG("Reference Pages %i", (giPageCount*4+0xFFF)>>12);
- for(num = 0; num < (giPageCount*4+0xFFF)>>12; num++)
- {
- MM_Allocate( REFERENCE_BASE + (num<<12) );
- }
-
- //LOG("Filling");
- // Fill references
- gaPageReferences = (void*)REFERENCE_BASE;
- memsetd(gaPageReferences, 1, kernelPages);
- for( num = kernelPages; num < giPageCount; num++ )
- {
- gaPageReferences[num] = (gaPageBitmap[ num / 32 ] >> (num&31)) & 1;
- }
+
+ gaPageReferences = (void*)MM_REFCOUNT_BASE;
+
+ Log_Log("PMem", "Physical memory set up");
}
/**
tPAddr MM_AllocPhys(void)
{
// int a, b, c;
- int indx;
+ int indx = -1;
tPAddr ret;
ENTER("");
Mutex_Acquire( &glPhysAlloc );
+ // Classful scan
+ #if 1
+ {
+ const int addrClasses[] = {0,16,20,24,32,64};
+ const int numAddrClasses = sizeof(addrClasses)/sizeof(addrClasses[0]);
+ int i;
+ int first, last;
+ for( i = numAddrClasses; i -- > 1; )
+ {
+ first = 1 << (addrClasses[i-1] - 12);
+ last = (1 << (addrClasses[i] - 12)) - 1;
+ // Range is above the last free page
+ if( first > giLastPossibleFree )
+ continue;
+ // Last possible free page is in the range
+ if( last > giLastPossibleFree )
+ last = giLastPossibleFree;
+
+ // Scan the range
+ for( indx = first; indx < last; )
+ {
+ if( gaSuperBitmap[indx>>10] == -1 ) {
+ indx += 1024;
+ continue;
+ }
+
+ if( gaPageBitmap[indx>>5] == -1 ) {
+ indx += 32;
+ continue;
+ }
+
+ if( gaPageBitmap[indx>>5] & (1 << (indx&31)) ) {
+ indx ++;
+ continue;
+ }
+ break;
+ }
+ if( indx < last ) break;
+
+ giLastPossibleFree = first; // Well, we couldn't find any in this range
+ }
+ // Out of memory?
+ if( i <= 1 ) indx = -1;
+ }
+ #elif 0
// Find free page
// Scan downwards
- #if 1
LOG("giLastPossibleFree = %i", giLastPossibleFree);
for( indx = giLastPossibleFree; indx >= 0; )
{
indx -= 1024;
continue;
}
+
if( gaPageBitmap[indx>>5] == -1 ) {
indx -= 32;
continue;
}
break;
}
+ if( indx >= 0 )
+ giLastPossibleFree = indx;
LOG("indx = %i", indx);
#else
c = giLastPossibleFree % 32;
for( ; gaSuperBitmap[a] == -1 && a >= 0; a-- );
if(a < 0) {
Mutex_Release( &glPhysAlloc );
- Warning("MM_AllocPhys - OUT OF MEMORY (Called by %p)", __builtin_return_address(0));
+ Warning("MM_AllocPhys - OUT OF MEMORY (Called by %p) - %lli/%lli used",
+ __builtin_return_address(0), giPhysAlloc, giPageCount);
LEAVE('i', 0);
return 0;
}
for( ; gaPageBitmap[a*32+b] & (1<<c); c-- );
LOG("a=%i,b=%i,c=%i", a, b, c);
indx = (a << 10) | (b << 5) | c;
+ if( indx >= 0 )
+ giLastPossibleFree = indx;
#endif
+ if( indx < 0 ) {
+ Mutex_Release( &glPhysAlloc );
+ Warning("MM_AllocPhys - OUT OF MEMORY (Called by %p) - %lli/%lli used (indx = %x)",
+ __builtin_return_address(0), giPhysAlloc, giPageCount, indx);
+ Log_Debug("PMem", "giLastPossibleFree = %lli", giLastPossibleFree);
+ LEAVE('i', 0);
+ return 0;
+ }
+
+ if( indx > 0xFFFFF ) {
+ Panic("The fuck? Too many pages! (indx = 0x%x)", indx);
+ }
+
+ if( indx >= giPageCount ) {
+ Mutex_Release( &glPhysAlloc );
+ Log_Error("PMem", "MM_AllocPhys - indx(%i) > giPageCount(%i)", indx, giPageCount);
+ LEAVE('i', 0);
+ return 0;
+ }
+
// Mark page used
- if(gaPageReferences)
- gaPageReferences[ indx ] = 1;
+ if( MM_GetPhysAddr( (tVAddr)&gaPageReferences[indx] ) )
+ gaPageReferences[indx] = 1;
gaPageBitmap[ indx>>5 ] |= 1 << (indx&31);
+ giPhysAlloc ++;
// Get address
ret = indx << 12;
- giLastPossibleFree = indx;
// Mark used block
- if(gaPageBitmap[ indx>>5 ] == -1)
+ if(gaPageBitmap[ indx>>5 ] == -1) {
gaSuperBitmap[indx>>10] |= 1 << ((indx>>5)&31);
+ }
// Release Spinlock
Mutex_Release( &glPhysAlloc );
LEAVE('X', ret);
- //Log("MM_AllocPhys: RETURN 0x%x", ret);
+ #if TRACE_ALLOCS
+ Log_Debug("PMem", "MM_AllocPhys: RETURN 0x%llx (%i free)", ret, giPageCount-giPhysAlloc);
+ #endif
return ret;
}
// Mark pages used
for( i = 0; i < Pages; i++ )
{
- if(gaPageReferences)
+ if( MM_GetPhysAddr( (tVAddr)&gaPageReferences[idx*32+sidx] ) )
gaPageReferences[idx*32+sidx] = 1;
gaPageBitmap[ idx ] |= 1 << sidx;
sidx ++;
+ giPhysAlloc ++;
if(sidx == 32) { sidx = 0; idx ++; }
}
Mutex_Release( &glPhysAlloc );
LEAVE('X', ret);
+ #if TRACE_ALLOCS
+ Log_Debug("PMem", "MM_AllocPhysRange: RETURN 0x%llx-0x%llx (%i free)",
+ ret, ret + (1<<Pages)-1, giPageCount-giPhysAlloc);
+ #endif
return ret;
}
{
// Get page number
PAddr >>= 12;
-
+
// We don't care about non-ram pages
if(PAddr >= giPageCount) return;
Mutex_Acquire( &glPhysAlloc );
// Reference the page
- if(gaPageReferences)
+ if( gaPageReferences )
+ {
+ if( MM_GetPhysAddr( (tVAddr)&gaPageReferences[PAddr] ) == 0 ) {
+ tVAddr addr = ((tVAddr)&gaPageReferences[PAddr]) & ~0xFFF;
+ Log_Debug("PMem", "MM_RefPhys: Allocating info for %X", PAddr);
+ Mutex_Release( &glPhysAlloc );
+ if( MM_Allocate( addr ) == 0 ) {
+ Log_KernelPanic("PMem", "MM_RefPhys: Out of physical memory");
+ }
+ Mutex_Acquire( &glPhysAlloc );
+ memset( (void*)addr, 0, 0x1000 );
+ }
gaPageReferences[ PAddr ] ++;
+ }
// Mark as used
gaPageBitmap[ PAddr / 32 ] |= 1 << (PAddr&31);
{
// Get page number
PAddr >>= 12;
-
+
// We don't care about non-ram pages
if(PAddr >= giPageCount) return;
// Check if it is freed
- if(gaPageReferences[ PAddr ] == 0) {
- Warning("MM_DerefPhys - Non-referenced memory dereferenced");
+ if( !(gaPageBitmap[PAddr / 32] & (1 << PAddr%32)) ) {
+ Log_Warning("MMVirt", "MM_DerefPhys - Non-referenced memory dereferenced");
return;
}
giLastPossibleFree = PAddr;
// Dereference
- gaPageReferences[ PAddr ] --;
-
- // Mark as free in bitmaps
- if( gaPageReferences[ PAddr ] == 0 )
+ if( !MM_GetPhysAddr( (tVAddr)&gaPageReferences[PAddr] ) || (-- gaPageReferences[PAddr]) == 0 )
{
+ #if TRACE_ALLOCS
+ Log_Debug("PMem", "MM_DerefPhys: Free'd 0x%x (%i free)", PAddr, giPageCount-giPhysAlloc);
+ #endif
//LOG("Freed 0x%x by %p\n", PAddr<<12, __builtin_return_address(0));
+ giPhysAlloc --;
gaPageBitmap[ PAddr / 32 ] &= ~(1 << (PAddr&31));
- if(gaPageReferences[ PAddr ] == 0)
+ if(gaPageBitmap[ PAddr / 32 ] == 0)
gaSuperBitmap[ PAddr >> 10 ] &= ~(1 << ((PAddr >> 5)&31));
}
+
+ if( MM_GetPhysAddr( (tVAddr) &gaPageNodes[PAddr] ) )
+ {
+ gaPageNodes[PAddr] = NULL;
+ // TODO: Free Node Page when fully unused
+ }
// Release spinlock
Mutex_Release( &glPhysAlloc );
/**
* \fn int MM_GetRefCount(tPAddr Addr)
*/
-int MM_GetRefCount(tPAddr Addr)
+int MM_GetRefCount(tPAddr PAddr)
{
// Get page number
- Addr >>= 12;
+ PAddr >>= 12;
// We don't care about non-ram pages
- if(Addr >= giPageCount) return -1;
+ if(PAddr >= giPageCount) return -1;
+
+ if( MM_GetPhysAddr( (tVAddr)&gaPageReferences[PAddr] ) == 0 )
+ return (gaPageBitmap[PAddr / 32] & (1 << PAddr%32)) ? 1 : 0;
// Check if it is freed
- return gaPageReferences[ Addr ];
+ return gaPageReferences[ PAddr ];
+}
+
+int MM_SetPageNode(tPAddr PAddr, void *Node)
+{
+ tVAddr block_addr;
+
+ if( MM_GetRefCount(PAddr) == 0 ) return 1;
+
+ PAddr /= PAGE_SIZE;
+
+ block_addr = (tVAddr) &gaPageNodes[PAddr];
+ block_addr &= ~(PAGE_SIZE-1);
+
+ if( !MM_GetPhysAddr( block_addr ) )
+ {
+ if( !MM_Allocate( block_addr ) ) {
+ Log_Warning("PMem", "Unable to allocate Node page");
+ return -1;
+ }
+ memset( (void*)block_addr, 0, PAGE_SIZE );
+ }
+
+ gaPageNodes[PAddr] = Node;
+ return 0;
}
+
+int MM_GetPageNode(tPAddr PAddr, void **Node)
+{
+ if( MM_GetRefCount(PAddr) == 0 ) {
+ return 1;
+ }
+ if( !MM_GetPhysAddr( (tVAddr) &gaPageNodes[PAddr] ) ) {
+ *Node = NULL;
+ return 0;
+ }
+ *Node = gaPageNodes[PAddr];
+ return 0;
+}
+
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au