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

diff --git a/Kernel/arch/armv7/mm_virt.c b/Kernel/arch/armv7/mm_virt.c
index 7d0c85ad..64b5d570 100644
--- a/Kernel/arch/armv7/mm_virt.c
+++ b/Kernel/arch/armv7/mm_virt.c
@@ -14,7 +14,7 @@
 #define AP_KRW_ONLY	1	// Kernel page
 #define AP_KRO_ONLY	5	// Kernel RO page
 #define AP_RW_BOTH	3	// Standard RW
-#define AP_RO_BOTH	6	// COW Page
+#define AP_RO_BOTH	7	// COW Page
 #define AP_RO_USER	2	// User RO Page
 #define PADDR_MASK_LVL1	0xFFFFFC00
 
@@ -52,6 +52,7 @@ tPAddr	MM_Clone(void);
 tVAddr	MM_NewKStack(int bGlobal);
 void	MM_int_DumpTableEnt(tVAddr Start, size_t Len, tMM_PageInfo *Info);
 //void	MM_DumpTables(tVAddr Start, tVAddr End);
+void	MM_PageFault(Uint32 PC, Uint32 Addr, Uint32 DFSR, int bPrefetch);
 
 // === GLOBALS ===
 tPAddr	giMM_ZeroPage;
@@ -118,16 +119,16 @@ int MM_int_AllocateCoarse(tVAddr VAddr, int Domain)
 	desc[3] = desc[0] + 0xC00;
 
 	if( VAddr < 0x80000000 ) {
-//		Log("USRFRACTAL(%p) = %p", VAddr, &USRFRACTAL(VAddr));
-		USRFRACTAL(VAddr) = paddr | 3;
+		USRFRACTAL(VAddr) = paddr | 0x13;
 	}
 	else {
-//		Log("FRACTAL(%p) = %p", VAddr, &FRACTAL(table1, VAddr));
-		FRACTAL(table1, VAddr) = paddr | 3;
+		FRACTAL(table1, VAddr) = paddr | 0x13;
 	}
 
 	// TLBIALL 
-	TLBIALL();	
+	TLBIALL();
+	
+	memset( (void*)&table1[ (VAddr >> 12) & ~(1024-1) ], 0, 0x1000 );
 
 	LEAVE('i', 0);
 	return 0;
@@ -162,13 +163,14 @@ 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;
 			}
 
 			*desc = (pi->PhysAddr & 0xFFFFF000) | 2;
 			if(!pi->bExecutable)	*desc |= 1;	// XN
-			if(!pi->bGlobal)	*desc |= 1 << 11;	// NG
+			if(!pi->bGlobal)	*desc |= 1 << 11;	// nG
 			if( pi->bShared)	*desc |= 1 << 10;	// S
 			*desc |= (pi->AP & 3) << 4;	// AP
 			*desc |= ((pi->AP >> 2) & 1) << 9;	// APX
@@ -179,12 +181,11 @@ int MM_int_SetPageInfo(tVAddr VAddr, tMM_PageInfo *pi)
 		else
 		{
 			// Large page
-			// TODO: 
 			Log_Warning("MMVirt", "TODO: Implement large pages in MM_int_SetPageInfo");
 		}
 		break;
 	case 20:	// Section or unmapped
-		Warning("TODO: Implement sections");
+		Log_Warning("MMVirt", "TODO: Implement sections in MM_int_SetPageInfo");
 		break;
 	case 24:	// Supersection
 		// Error if not aligned
@@ -196,20 +197,21 @@ int MM_int_SetPageInfo(tVAddr VAddr, tMM_PageInfo *pi)
 		{
 			if( pi->PhysAddr == 0 ) {
 				*desc = 0;
-				// TODO: Apply to all entries
-				LEAVE('i', 0);
-				return 0;
 			}
-			// Apply
-			*desc = pi->PhysAddr & 0xFF000000;
-//			*desc |= ((pi->PhysAddr >> 32) & 0xF) << 20;
-//			*desc |= ((pi->PhysAddr >> 36) & 0x7) << 5;
-			*desc |= 2 | (1 << 18);
+			else {
+				// Apply
+				*desc = pi->PhysAddr & 0xFF000000;
+//				*desc |= ((pi->PhysAddr >> 32) & 0xF) << 20;
+//				*desc |= ((pi->PhysAddr >> 36) & 0x7) << 5;
+				*desc |= 2 | (1 << 18);
+			}
 			// TODO: Apply to all entries
+			Log_Warning("MMVirt", "TODO: Apply changes to all entries of supersections");
 			LEAVE('i', 0);
 			return 0;
 		}
 		// TODO: What here?
+		Log_Warning("MMVirt", "TODO: 24-bit not on supersection?");
 		LEAVE('i', 1);
 		return 1;
 	}
@@ -361,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;
@@ -404,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;
@@ -423,7 +425,7 @@ tPAddr MM_Allocate(tVAddr VAddr)
 		pi.AP = AP_RW_BOTH;
 	else
 		pi.AP = AP_KRW_ONLY;
-	pi.bExecutable = 1;
+	pi.bExecutable = 0;
 	if( MM_int_SetPageInfo(VAddr, &pi) ) {
 		MM_DerefPhys(pi.PhysAddr);
 		LEAVE('i', 0);
@@ -497,13 +499,15 @@ void MM_int_CloneTable(Uint32 *DestEnt, int Table)
 	
 	table = MM_AllocPhys();
 	if(!table)	return ;
+
+	cur += 256*Table;
 	
 	tmp_map = (void*)MM_MapTemp(table);
 	
 	for( i = 0; i < 1024; i ++ )
 	{
 //		Log_Debug("MMVirt", "cur[%i] (%p) = %x", Table*256+i, &cur[Table*256+i], cur[Table*256+i]);
-		switch(cur[Table*256+i] & 3)
+		switch(cur[i] & 3)
 		{
 		case 0:	tmp_map[i] = 0;	break;
 		case 1:
@@ -515,12 +519,30 @@ void MM_int_CloneTable(Uint32 *DestEnt, int Table)
 		case 3:
 			// Small page
 			// - If full RW
-			if( (cur[Table*256] & 0x230) == 0x030 )
-				cur[Table*256+i] |= 0x200;	// Set to full RO (Full RO=COW, User RO = RO)
-			tmp_map[i] = cur[Table*256+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;
 		}
 	}
+	MM_FreeTemp( (tVAddr) tmp_map );
 
 	DestEnt[0] = table + 0*0x400 + 1;
 	DestEnt[1] = table + 1*0x400 + 1;
@@ -606,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)
@@ -615,6 +637,7 @@ tPAddr MM_Clone(void)
 			void	*tmp_page;
 			
 			page = MM_AllocPhys();
+//			Log("page = %P", page);
 			table[j] = page | 0x813;
 
 			tmp_page = (void*)MM_MapTemp(page);
@@ -631,10 +654,79 @@ tPAddr MM_Clone(void)
 	return ret;
 }
 
-tPAddr MM_ClearUser(void)
+void MM_ClearUser(void)
 {
-	// TODO: Implement ClearUser
-	return 0;
+	 int	i, j;
+	const int	user_table_count = USER_STACK_TOP / (256*0x1000);
+	Uint32	*cur = (void*)MM_TABLE0USER;
+	Uint32	*tab;
+	
+//	MM_DumpTables(0, 0x80000000);
+
+//	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 )
+		{
+		case 0:	break;	// Already unmapped
+		case 1:	// Sub pages
+			tab = (void*)(MM_TABLE1USER + i*256*sizeof(Uint32));
+			for( j = 0; j < 1024; j ++ )
+			{
+				switch( tab[j] & 3 )
+				{
+				case 0:	break;	// Unmapped
+				case 1:
+					Log_Error("MMVirt", "TODO: Support large pages in MM_ClearUser");
+					break;
+				case 2:
+				case 3:
+					MM_DerefPhys( tab[j] & ~(PAGE_SIZE-1) );
+					break;
+				}
+			}
+			MM_DerefPhys( cur[i] & ~(PAGE_SIZE-1) );
+			cur[i+0] = 0;
+			cur[i+1] = 0;
+			cur[i+2] = 0;
+			i += 3;
+			break;
+		case 2:
+		case 3:
+			Log_Error("MMVirt", "TODO: Implement sections/supersections in MM_ClearUser");
+			break;
+		}
+		cur[i] = 0;
+	}
+	
+	// Final block of 4 tables are KStack
+	i = 0x800 - 4;
+	
+	// Clear out unused stacks
+	{
+		register Uint32 __SP asm("sp");
+		 int	cur_stack_base = ((__SP & ~(MM_KSTACK_SIZE-1)) / PAGE_SIZE) % 1024;
+
+		tab = (void*)(MM_TABLE1USER + i*256*sizeof(Uint32));
+		
+		// First 512 is the Table1 mapping + 2 for Table0 mapping
+		for( j = 512+2; j < 1024; j ++ )
+		{
+			// Skip current stack
+			if( j == cur_stack_base ) {
+				j += (MM_KSTACK_SIZE / PAGE_SIZE) - 1;
+				continue ;
+			}
+			if( !(tab[j] & 3) )	continue;
+			ASSERT( (tab[j] & 3) == 2 );
+			MM_DerefPhys( tab[j] & ~(PAGE_SIZE) );
+			tab[j] = 0;
+		}
+	}
+	
+
+//	MM_DumpTables(0, 0x80000000);
 }
 
 tVAddr MM_MapTemp(tPAddr PAddr)
@@ -647,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);
 		
@@ -659,7 +751,6 @@ tVAddr MM_MapTemp(tPAddr PAddr)
 
 void MM_FreeTemp(tVAddr VAddr)
 {
-	// TODO: Implement FreeTemp
 	if( VAddr < MM_TMPMAP_BASE || VAddr >= MM_TMPMAP_END ) {
 		Log_Warning("MMVirt", "MM_FreeTemp: Passed an addr not from MM_MapTemp (%p)", VAddr);
 		return ;
@@ -802,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;
 }
 
@@ -833,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 )
 	{
@@ -865,3 +956,85 @@ void MM_DumpTables(tVAddr Start, tVAddr End)
 	Debug("Done");
 }
 
+// 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;
+	tMM_PageInfo	pi;
+	
+	rv = MM_int_GetPageInfo(Addr, &pi);
+	
+	// Check for COW
+	if( rv == 0 &&  pi.AP == AP_RO_BOTH )
+	{
+		pi.AP = AP_RW_BOTH;
+		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;
+			void	*dst, *src;
+			
+			newpage = MM_AllocPhys();
+			if(!newpage) {
+				Log_Error("MMVirt", "Unable to allocate new page for COW");
+				for(;;);
+			}
+			dst = (void*)MM_MapTemp(newpage);
+			src = (void*)(Addr & ~(PAGE_SIZE-1));
+			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);
+		return ;
+	}
+	
+
+	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(;;);
+}
+