X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fmm_phys.c;h=fcc8547369eef65f643c2b2795cbc6a7f15326ed;hb=5255c9f07cb2e0e43cf283e256c964eaa7970c8e;hp=55fc68aa58483c082e968c0b65c2d14d5f2aacb6;hpb=f5f082502f5aeaa144a6ff60ad331e23957b0bbb;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/mm_phys.c b/Kernel/arch/x86_64/mm_phys.c
index 55fc68aa..fcc85473 100644
--- a/Kernel/arch/x86_64/mm_phys.c
+++ b/Kernel/arch/x86_64/mm_phys.c
@@ -24,15 +24,15 @@ extern char	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);
+//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 = (void*)MM_PAGE_SUPBMP;	// 1 bit = 64 Pages, 16 MiB Per Word
+tMutex	glPhysicalPages;
+Uint64	*gaSuperBitmap = (void*)MM_PAGE_SUPBMP;	// 1 bit = 64 Pages, 16 MiB per Word
 Uint64	*gaMainBitmap = (void*)MM_PAGE_BITMAP;	// 1 bit = 1 Page, 256 KiB per Word
 Uint64	*gaMultiBitmap = (void*)MM_PAGE_DBLBMP;	// Each bit means that the page is being used multiple times
 Uint32	*gaiPageReferences = (void*)MM_PAGE_COUNTS;	// Reference Counts
@@ -249,8 +249,8 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
 		if(base & 63) {
 			Uint64	val = -1LL << (base & 63);
 			gaSuperBitmap[base / 64] &= ~val;
-			size -= (base & 63);
-			base += 64 - (base & 63);
+//			size -= (base & 63);
+//			base += 64 - (base & 63);
 		}
 	}
 	
@@ -307,28 +307,28 @@ void MM_InitPhys_Multiboot(tMBoot_Info *MBoot)
 
 /**
  * \brief Allocate a contiguous range of physical pages with a maximum
- *        bit size of \a Bits
- * \param Num	Number of pages to allocate
- * \param Bits	Maximum size of the physical address
- * \note If \a Bits is <= 0, any sized address is used (with preference
+ *        bit size of \a MaxBits
+ * \param Pages	Number of pages to allocate
+ * \param MaxBits	Maximum size of the physical address
+ * \note If \a MaxBits is <= 0, any sized address is used (with preference
  *       to higher addresses)
  */
-tPAddr MM_AllocPhysRange(int Num, int Bits)
+tPAddr MM_AllocPhysRange(int Pages, int MaxBits)
 {
 	tPAddr	addr, ret;
 	 int	rangeID;
 	 int	nFree = 0, i;
 	
-	ENTER("iNum iBits", Num, Bits);
+	ENTER("iPages iBits", Pages, MaxBits);
 	
-	if( Bits <= 0 || Bits >= 64 )	// Speedup for the common case
+	if( MaxBits <= 0 || MaxBits >= 64 )	// Speedup for the common case
 		rangeID = MM_PHYS_MAX;
 	else
-		rangeID = MM_int_GetRangeID( (1LL << Bits) - 1 );
+		rangeID = MM_int_GetRangeID( (1LL << MaxBits) - 1 );
 	
 	LOG("rangeID = %i", rangeID);
 	
-	LOCK(&glPhysicalPages);
+	Mutex_Acquire(&glPhysicalPages);
 	
 	// Check if the range actually has any free pages
 	while(giPhysRangeFree[rangeID] == 0 && rangeID)
@@ -338,20 +338,20 @@ tPAddr MM_AllocPhysRange(int Num, int Bits)
 	
 	// What the? Oh, man. No free pages
 	if(giPhysRangeFree[rangeID] == 0) {
-		RELEASE(&glPhysicalPages);
+		Mutex_Release(&glPhysicalPages);
 		// TODO: Page out
 		// ATM. Just Warning
 		Warning(" MM_AllocPhysRange: Out of free pages");
 		Log_Warning("Arch",
 			"Out of memory (unable to fulfil request for %i pages), zero remaining",
-			Num
+			Pages
 			);
 		LEAVE('i', 0);
 		return 0;
 	}
 	
 	// Check if there is enough in the range
-	if(giPhysRangeFree[rangeID] >= Num)
+	if(giPhysRangeFree[rangeID] >= Pages)
 	{
 		LOG("{%i,0x%x -> 0x%x}",
 			giPhysRangeFree[rangeID],
@@ -389,30 +389,30 @@ tPAddr MM_AllocPhysRange(int Num, int Bits)
 			}
 			nFree ++;
 			addr ++;
-			LOG("nFree(%i) == %i (0x%x)", nFree, Num, addr);
-			if(nFree == Num)
+			LOG("nFree(%i) == %i (0x%x)", nFree, Pages, addr);
+			if(nFree == Pages)
 				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;
+		if(nFree != Pages)	nFree = 0;
 	}
 	
 	if( !nFree )
 	{
 		// Oops. ok, let's do an expensive check (scan down the list
 		// until a free range is found)
-		nFree = 1;
-		addr = giPhysRangeLast[ rangeID ];
-		// TODO
-		RELEASE(&glPhysicalPages);
+//		nFree = 1;
+//		addr = giPhysRangeLast[ rangeID ];
+		// TODO: Expensive Check
+		Mutex_Release(&glPhysicalPages);
 		// TODO: Page out
 		// ATM. Just Warning
-		Warning(" MM_AllocPhysRange: Out of memory (unable to fulfil request for %i pages)", Num);
+		Warning(" MM_AllocPhysRange: Out of memory (unable to fulfil request for %i pages)", Pages);
 		Log_Warning("Arch",
 			"Out of memory (unable to fulfil request for %i pages)",
-			Num
+			Pages	
 			);
 		LEAVE('i', 0);
 		return 0;
@@ -420,8 +420,8 @@ tPAddr MM_AllocPhysRange(int Num, int Bits)
 	LOG("nFree = %i, addr = 0x%08x", nFree, addr);
 	
 	// Mark pages as allocated
-	addr -= Num;
-	for( i = 0; i < Num; i++, addr++ )
+	addr -= Pages;
+	for( i = 0; i < Pages; i++, addr++ )
 	{
 		gaMainBitmap[addr >> 6] |= 1LL << (addr & 63);
 		rangeID = MM_int_GetRangeID(addr << 12);
@@ -433,16 +433,16 @@ tPAddr MM_AllocPhysRange(int Num, int Bits)
 	ret = addr;	// Save the return address
 	
 	// Update super bitmap
-	Num += addr & (64-1);
+	Pages += addr & (64-1);
 	addr &= ~(64-1);
-	Num = (Num + (64-1)) & ~(64-1);
-	for( i = 0; i < Num/64; i++ )
+	Pages = (Pages + (64-1)) & ~(64-1);
+	for( i = 0; i < Pages/64; i++ )
 	{
 		if( gaMainBitmap[ addr >> 6 ] + 1 == 0 )
 			gaSuperBitmap[addr>>12] |= 1LL << ((addr >> 6) & 63);
 	}
 	
-	RELEASE(&glPhysicalPages);
+	Mutex_Release(&glPhysicalPages);
 	LEAVE('x', ret << 12);
 	return ret << 12;
 }
@@ -481,6 +481,12 @@ void MM_RefPhys(tPAddr PAddr)
 	{
 		// Reference again
 		gaMultiBitmap[ page >> 6 ] |= 1LL << (page&63);
+		if( !MM_GetPhysAddr( ((tVAddr)&gaiPageReferences[ page ]) & ~0xFFF ) ) {
+			if( !MM_Allocate( ((tVAddr)&gaiPageReferences[ page ]) & ~0xFFF ) ) {
+				Log_Error("Arch", "Out of memory when allocating reference count page");
+				return ;
+			}
+		}
 		gaiPageReferences[ page ] ++;
 	}
 	else