X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fmm_phys.c;h=3abe4133545c8ecf970a465ea00778fc05d8d198;hb=4d04d710e6d90ac28524925859a7ef621c675bcb;hp=988a15e474e3b6e9cdce36fec198fa012e122ca7;hpb=88ad2daf974ce4c4c770307546a9b4968c6183c2;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/mm_phys.c b/Kernel/arch/x86/mm_phys.c
index 988a15e4..3abe4133 100644
--- a/Kernel/arch/x86/mm_phys.c
+++ b/Kernel/arch/x86/mm_phys.c
@@ -7,7 +7,8 @@
 #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
 
@@ -15,12 +16,13 @@
 extern void	gKernelEnd;
 
 // === PROTOTYPES ===
-tPAddr	MM_AllocPhys();
+tPAddr	MM_AllocPhys(void);
 tPAddr	MM_AllocPhysRange(int Pages, int MaxBits);
 void	MM_RefPhys(tPAddr PAddr);
 void	MM_DerefPhys(tPAddr PAddr);
 
 // === GLOBALS ===
+tMutex	glPhysAlloc;
 Uint64	giPhysAlloc = 0;	// Number of allocated pages
 Uint64	giPageCount = 0;	// Total number of pages
 Uint64	giLastPossibleFree = 0;	// Last possible free page (before all pages are used)
@@ -39,12 +41,10 @@ void MM_Install(tMBoot_Info *MBoot)
 	tMBoot_MMapEnt	*ent;
 	
 	// --- Find largest address
-	Log("MBoot->MMapAddr = %08x", MBoot->MMapAddr);
 	MBoot->MMapAddr |= KERNEL_BASE;
 	ent = (void *)( MBoot->MMapAddr );
 	while( (Uint)ent < MBoot->MMapAddr + MBoot->MMapLength )
 	{
-		Log(" ent->Size = %08x", ent->Size);
 		// Adjust for size
 		ent->Size += 4;
 		
@@ -73,7 +73,7 @@ void MM_Install(tMBoot_Info *MBoot)
 		ent = (tMBoot_MMapEnt *)( (Uint)ent + ent->Size );
 	}
 	
-	// Get used page count
+	// Get used page count (Kernel)
 	kernelPages = (Uint)&gKernelEnd - KERNEL_BASE - 0x100000;
 	kernelPages += 0xFFF;	// Page Align
 	kernelPages >>= 12;
@@ -91,12 +91,10 @@ void MM_Install(tMBoot_Info *MBoot)
 	// Mark Multiboot's pages as taken
 	// - Structure
 	MM_RefPhys( (Uint)MBoot - KERNEL_BASE );
-	Log("MBoot->ModuleCount = %i", MBoot->ModuleCount);
 	// - Module List
 	for(i = (MBoot->ModuleCount*sizeof(tMBoot_Module)+0xFFF)>12; i--; )
 		MM_RefPhys( MBoot->Modules + (i << 12) );
 	// - Modules
-	Log("MBoot->Modules = %p", MBoot->Modules);
 	mods = (void*)(MBoot->Modules + KERNEL_BASE);
 	for(i = 0; i < MBoot->ModuleCount; i++)
 	{
@@ -123,10 +121,10 @@ void MM_Install(tMBoot_Info *MBoot)
 }
 
 /**
- * \fn tPAddr MM_AllocPhys()
+ * \fn tPAddr MM_AllocPhys(void)
  * \brief Allocates a physical page from the general pool
  */
-tPAddr MM_AllocPhys()
+tPAddr MM_AllocPhys(void)
 {
 	// int	a, b, c;
 	 int	indx;
@@ -134,7 +132,7 @@ tPAddr MM_AllocPhys()
 	
 	ENTER("");
 	
-	LOCK( &giPhysAlloc );
+	Mutex_Acquire( &glPhysAlloc );
 	
 	// Find free page
 	// Scan downwards
@@ -146,6 +144,7 @@ tPAddr MM_AllocPhys()
 			indx -= 1024;
 			continue;
 		}
+		
 		if( gaPageBitmap[indx>>5] == -1 ) {
 			indx -= 32;
 			continue;
@@ -166,7 +165,7 @@ tPAddr MM_AllocPhys()
 	LOG("a=%i,b=%i,c=%i", a, b, c);
 	for( ; gaSuperBitmap[a] == -1 && a >= 0; a-- );
 	if(a < 0) {
-		RELEASE( &giPhysAlloc );
+		Mutex_Release( &glPhysAlloc );
 		Warning("MM_AllocPhys - OUT OF MEMORY (Called by %p)", __builtin_return_address(0));
 		LEAVE('i', 0);
 		return 0;
@@ -177,11 +176,23 @@ tPAddr MM_AllocPhys()
 	indx = (a << 10) | (b << 5) | c;
 	#endif
 	
+	if( indx < 0 ) {
+		Mutex_Release( &glPhysAlloc );
+		Warning("MM_AllocPhys - OUT OF MEMORY (Called by %p)", __builtin_return_address(0));
+		LEAVE('i', 0);
+		return 0;
+	}
+	
+	if( indx > 0xFFFFF ) {
+		Panic("The fuck? Too many pages! (indx = 0x%x)", indx);
+	}
+	
 	// Mark page used
 	if(gaPageReferences)
 		gaPageReferences[ indx ] = 1;
 	gaPageBitmap[ indx>>5 ] |= 1 << (indx&31);
 	
+	giPhysAlloc ++;
 	
 	// Get address
 	ret = indx << 12;
@@ -192,10 +203,12 @@ tPAddr MM_AllocPhys()
 		gaSuperBitmap[indx>>10] |= 1 << ((indx>>5)&31);
 
 	// Release Spinlock
-	RELEASE( &giPhysAlloc );
+	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;
 }
 
@@ -211,12 +224,17 @@ tPAddr MM_AllocPhysRange(int Pages, int MaxBits)
 	 int	i, idx, sidx;
 	tPAddr	ret;
 	
+	ENTER("iPages iMaxBits", Pages, MaxBits);
+	
 	// Sanity Checks
-	if(MaxBits < 0)	return 0;
+	if(MaxBits < 0) {
+		LEAVE('i', 0);
+		return 0;
+	}
 	if(MaxBits > PHYS_BITS)	MaxBits = PHYS_BITS;
 	
 	// Lock
-	LOCK( &giPhysAlloc );
+	Mutex_Acquire( &glPhysAlloc );
 	
 	// Set up search state
 	if( giLastPossibleFree > ((tPAddr)1 << (MaxBits-12)) ) {
@@ -230,16 +248,28 @@ tPAddr MM_AllocPhysRange(int Pages, int MaxBits)
 	b = idx % 32;
 	a = idx / 32;
 	
+	#if 0
+	LOG("a=%i, b=%i, idx=%i, sidx=%i", a, b, idx, sidx);
+	
 	// Find free page
-	for( ; gaSuperBitmap[a] == -1 && a --; );
+	for( ; gaSuperBitmap[a] == -1 && a --; )	b = 31;
 	if(a < 0) {
-		RELEASE( &giPhysAlloc );
+		Mutex_Release( &glPhysAlloc );
 		Warning("MM_AllocPhysRange - OUT OF MEMORY (Called by %p)", __builtin_return_address(0));
+		LEAVE('i', 0);
 		return 0;
 	}
-	for( ; gaSuperBitmap[a] & (1 << b); b-- );
+	LOG("a = %i", a);
+	for( ; gaSuperBitmap[a] & (1 << b); b-- )	sidx = 31;
+	LOG("b = %i", b);
 	idx = a * 32 + b;
-	for( ; gaPageBitmap[idx] & (1 << sidx); sidx-- );
+	for( ; gaPageBitmap[idx] & (1 << sidx); sidx-- )
+		LOG("gaPageBitmap[%i] = 0x%08x", idx, gaPageBitmap[idx]);
+	
+	LOG("idx = %i, sidx = %i", idx, sidx);
+	#else
+	
+	#endif
 	
 	// Check if the gap is large enough
 	while( idx >= 0 )
@@ -282,8 +312,10 @@ tPAddr MM_AllocPhysRange(int Pages, int MaxBits)
 	
 	// Check if an address was found
 	if( idx < 0 ) {
-		RELEASE( &giPhysAlloc );
+		Mutex_Release( &glPhysAlloc );
 		Warning("MM_AllocPhysRange - OUT OF MEMORY (Called by %p)", __builtin_return_address(0));
+		LEAVE('i', 0);
+		return 0;
 	}
 	
 	// Mark pages used
@@ -293,7 +325,8 @@ tPAddr MM_AllocPhysRange(int Pages, int MaxBits)
 			gaPageReferences[idx*32+sidx] = 1;
 		gaPageBitmap[ idx ] |= 1 << sidx;
 		sidx ++;
-		if(sidx == 32) {	sidx = 0;	idx ++;	}
+		giPhysAlloc ++;
+		if(sidx == 32) { sidx = 0;	idx ++;	}
 	}
 	
 	// Get address
@@ -303,8 +336,13 @@ tPAddr MM_AllocPhysRange(int Pages, int MaxBits)
 	if(gaPageBitmap[ idx ] == -1)	gaSuperBitmap[idx/32] |= 1 << (idx%32);
 
 	// Release Spinlock
-	RELEASE( &giPhysAlloc );
+	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;
 }
 
@@ -320,7 +358,7 @@ void MM_RefPhys(tPAddr PAddr)
 	if(PAddr >= giPageCount)	return;
 	
 	// Lock Structures
-	LOCK( &giPhysAlloc );
+	Mutex_Acquire( &glPhysAlloc );
 	
 	// Reference the page
 	if(gaPageReferences)
@@ -334,7 +372,7 @@ void MM_RefPhys(tPAddr PAddr)
 		gaSuperBitmap[PAddr/1024] |= 1 << ((PAddr/32)&31);
 	
 	// Release Spinlock
-	RELEASE( &giPhysAlloc );
+	Mutex_Release( &glPhysAlloc );
 }
 
 /**
@@ -356,7 +394,7 @@ void MM_DerefPhys(tPAddr PAddr)
 	}
 	
 	// Lock Structures
-	LOCK( &giPhysAlloc );
+	Mutex_Acquire( &glPhysAlloc );
 	
 	if( giLastPossibleFree < PAddr )
 		giLastPossibleFree = PAddr;
@@ -367,14 +405,18 @@ void MM_DerefPhys(tPAddr PAddr)
 	// Mark as free in bitmaps
 	if( 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)
 			gaSuperBitmap[ PAddr >> 10 ] &= ~(1 << ((PAddr >> 5)&31));
 	}
 	
 	// Release spinlock
-	RELEASE( &giPhysAlloc );
+	Mutex_Release( &glPhysAlloc );
 }
 
 /**