X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Farmv7%2Fmm_virt.c;h=64b5d570504d4c961cd1b7f00c1088c77d6eb9fa;hb=05c5d7098a054591d75113ecc3503979cc5754c9;hp=8689e096f649e91fa40846c0d685082d137d66bb;hpb=1389dd6a77cfe0f01ae941f6f696bd5eda22e959;p=tpg%2Facess2.git

diff --git a/Kernel/arch/armv7/mm_virt.c b/Kernel/arch/armv7/mm_virt.c
index 8689e096..64b5d570 100644
--- a/Kernel/arch/armv7/mm_virt.c
+++ b/Kernel/arch/armv7/mm_virt.c
@@ -126,7 +126,9 @@ int MM_int_AllocateCoarse(tVAddr VAddr, int Domain)
 	}
 
 	// TLBIALL 
-	TLBIALL();	
+	TLBIALL();
+	
+	memset( (void*)&table1[ (VAddr >> 12) & ~(1024-1) ], 0, 0x1000 );
 
 	LEAVE('i', 0);
 	return 0;
@@ -161,6 +163,7 @@ int MM_int_SetPageInfo(tVAddr VAddr, tMM_PageInfo *pi)
 			if( (*desc & 3) == 1 )	LEAVE_RET('i', 1);
 			if( pi->PhysAddr == 0 ) {
 				*desc = 0;
+				TLBIMVA(VAddr & 0xFFFFF000);
 				LEAVE('i', 0);
 				return 0;
 			}
@@ -360,7 +363,7 @@ void MM_SetFlags(tVAddr VAddr, Uint Flags, Uint Mask)
 	if( MM_int_GetPageInfo(VAddr, &pi) )
 		return ;
 	
-	curFlags = MM_GetPhysAddr(VAddr);
+	curFlags = MM_GetFlags(VAddr);
 	if( (curFlags & Mask) == Flags )
 		return ;
 	curFlags &= ~Mask;
@@ -403,7 +406,7 @@ int MM_Map(tVAddr VAddr, tPAddr PAddr)
 		pi.AP = AP_KRW_ONLY;	// Kernel Read/Write
 	pi.bExecutable = 1;
 	if( MM_int_SetPageInfo(VAddr, &pi) ) {
-		MM_DerefPhys(pi.PhysAddr);
+//		MM_DerefPhys(pi.PhysAddr);
 		return 0;
 	}
 	return pi.PhysAddr;
@@ -516,10 +519,26 @@ void MM_int_CloneTable(Uint32 *DestEnt, int Table)
 		case 3:
 			// Small page
 			// - If full RW
-			Debug("%p cur[%i] & 0x230 = 0x%x", Table*256*0x1000, i, cur[i] & 0x230);
-			if( (cur[i] & 0x230) == 0x030 )
-				cur[i] |= 0x200;	// Set to full RO (Full RO=COW, User RO = RO)
-			tmp_map[i] = cur[i];
+//			Debug("%p cur[%i] & 0x230 = 0x%x", Table*256*0x1000, i, cur[i] & 0x230);
+			if( (cur[i] & 0x230) == 0x010 )
+			{
+				void	*dst, *src;
+				tPAddr	newpage;
+				newpage = MM_AllocPhys();
+				src = (void*)( (Table*256+i)*0x1000 );
+				dst = (void*)MM_MapTemp(newpage);
+//				Debug("Taking a copy of kernel page %p (%P)", src, cur[i] & ~0xFFF);
+				memcpy(dst, src, PAGE_SIZE);
+				MM_FreeTemp( (tVAddr)dst );
+				tmp_map[i] = newpage | (cur[i] & 0xFFF);
+			}
+			else
+			{
+				if( (cur[i] & 0x230) == 0x030 )
+					cur[i] |= 0x200;	// Set to full RO (Full RO=COW, User RO = RO)
+				tmp_map[i] = cur[i];
+				MM_RefPhys( tmp_map[i] & ~0xFFF );
+			}
 			break;
 		}
 	}
@@ -609,7 +628,7 @@ tPAddr MM_Clone(void)
 		j = (sp / 0x1000) % 1024;
 		num = MM_KSTACK_SIZE/0x1000;
 
-		Log("num = %i, sp = %p, j = %i", num, sp, j);
+//		Log("num = %i, sp = %p, j = %i", num, sp, j);
 		
 		// Copy stack pages
 		for(; num--; j ++, sp += 0x1000)
@@ -618,7 +637,7 @@ tPAddr MM_Clone(void)
 			void	*tmp_page;
 			
 			page = MM_AllocPhys();
-			Log("page = %P", page);
+//			Log("page = %P", page);
 			table[j] = page | 0x813;
 
 			tmp_page = (void*)MM_MapTemp(page);
@@ -638,12 +657,15 @@ tPAddr MM_Clone(void)
 void MM_ClearUser(void)
 {
 	 int	i, j;
+	const int	user_table_count = USER_STACK_TOP / (256*0x1000);
 	Uint32	*cur = (void*)MM_TABLE0USER;
 	Uint32	*tab;
 	
 //	MM_DumpTables(0, 0x80000000);
 
-	for( i = 0; i < 0x800-4; i ++ )
+//	Log("user_table_count = %i (as opposed to %i)", user_table_count, 0x800-4);
+
+	for( i = 0; i < user_table_count; i ++ )
 	{
 		switch( cur[i] & 3 )
 		{
@@ -678,6 +700,9 @@ void MM_ClearUser(void)
 		cur[i] = 0;
 	}
 	
+	// Final block of 4 tables are KStack
+	i = 0x800 - 4;
+	
 	// Clear out unused stacks
 	{
 		register Uint32 __SP asm("sp");
@@ -701,8 +726,7 @@ void MM_ClearUser(void)
 	}
 	
 
-	MM_DumpTables(0, 0x80000000);
-//	Log_KernelPanic("MMVirt", "TODO: Implement MM_ClearUser");
+//	MM_DumpTables(0, 0x80000000);
 }
 
 tVAddr MM_MapTemp(tPAddr PAddr)
@@ -715,7 +739,7 @@ tVAddr MM_MapTemp(tPAddr PAddr)
 		if( MM_int_GetPageInfo(ret, &pi) == 0 )
 			continue;
 
-		Log("MapTemp %P at %p by %p", PAddr, ret, __builtin_return_address(0));
+//		Log("MapTemp %P at %p by %p", PAddr, ret, __builtin_return_address(0));
 		MM_RefPhys(PAddr);	// Counter the MM_Deallocate in FreeTemp
 		MM_Map(ret, PAddr);
 		
@@ -869,8 +893,8 @@ tVAddr MM_NewUserStack(void)
 		}
 		MM_SetFlags(addr+ofs, 0, MM_PFLAG_KERNEL);
 	}
-	Log("Return %p", addr + ofs);
-	MM_DumpTables(0, 0x80000000);
+//	Log("Return %p", addr + ofs);
+//	MM_DumpTables(0, 0x80000000);
 	return addr + ofs;
 }
 
@@ -900,7 +924,7 @@ void MM_DumpTables(tVAddr Start, tVAddr End)
 	
 	pi_old.Size = 0;
 
-	Debug("Page Table Dump:");
+	Debug("Page Table Dump (%p to %p):", Start, End);
 	range_start = Start;
 	for( addr = Start; i == 0 || (addr && addr < End); i = 1 )
 	{
@@ -932,7 +956,7 @@ void MM_DumpTables(tVAddr Start, tVAddr End)
 	Debug("Done");
 }
 
-// NOTE: Runs in abort context, not much differe, just a smaller stack
+// NOTE: Runs in abort context, not much difference, just a smaller stack
 void MM_PageFault(Uint32 PC, Uint32 Addr, Uint32 DFSR, int bPrefetch)
 {
 	 int	rv;
@@ -943,9 +967,31 @@ void MM_PageFault(Uint32 PC, Uint32 Addr, Uint32 DFSR, int bPrefetch)
 	// Check for COW
 	if( rv == 0 &&  pi.AP == AP_RO_BOTH )
 	{
-		Log_Notice("MMVirt", "COW %p caused by %p", Addr, PC);
 		pi.AP = AP_RW_BOTH;
-		if( MM_GetRefCount(pi.PhysAddr) > 1 )
+		if( giMM_ZeroPage && pi.PhysAddr == giMM_ZeroPage )
+		{
+			tPAddr	newpage;
+			newpage = MM_AllocPhys();
+			if( !newpage ) {
+				Log_Error("MMVirt", "Unable to allocate new page for COW of ZERO");
+				for(;;);
+			}
+			
+			#if TRACE_COW
+			Log_Notice("MMVirt", "COW %p caused by %p, ZERO duped to %P (RefCnt(%i)--)", Addr, PC,
+				newpage, MM_GetRefCount(pi.PhysAddr));
+			#endif
+
+			MM_DerefPhys(pi.PhysAddr);
+			pi.PhysAddr = newpage;
+			pi.AP = AP_RW_BOTH;
+			MM_int_SetPageInfo(Addr, &pi);
+			
+			memset( (void*)(Addr & ~(PAGE_SIZE-1)), 0, PAGE_SIZE );
+
+			return ;
+		}
+		else if( MM_GetRefCount(pi.PhysAddr) > 1 )
 		{
 			// Duplicate the page
 			tPAddr	newpage;
@@ -961,8 +1007,20 @@ void MM_PageFault(Uint32 PC, Uint32 Addr, Uint32 DFSR, int bPrefetch)
 			memcpy( dst, src, PAGE_SIZE );
 			MM_FreeTemp( (tVAddr)dst );
 			
+			#if TRACE_COW
+			Log_Notice("MMVirt", "COW %p caused by %p, %P duped to %P (RefCnt(%i)--)", Addr, PC,
+				pi.PhysAddr, newpage, MM_GetRefCount(pi.PhysAddr));
+			#endif
+
+			MM_DerefPhys(pi.PhysAddr);
 			pi.PhysAddr = newpage;
 		}
+		#if TRACE_COW
+		else {
+			Log_Notice("MMVirt", "COW %p caused by %p, took last reference to %P",
+				Addr, PC, pi.PhysAddr);
+		}
+		#endif
 		// Unset COW
 		pi.AP = AP_RW_BOTH;
 		MM_int_SetPageInfo(Addr, &pi);
@@ -973,6 +1031,10 @@ void MM_PageFault(Uint32 PC, Uint32 Addr, Uint32 DFSR, int bPrefetch)
 	Log_Error("MMVirt", "Code at %p accessed %p (DFSR = 0x%x)%s", PC, Addr, DFSR,
 		(bPrefetch ? " - Prefetch" : "")
 		);
+	if( Addr < 0x80000000 )
+		MM_DumpTables(0, 0x80000000);
+	else
+		MM_DumpTables(0x80000000, -1);
 	for(;;);
 }