X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=inline;f=Kernel%2Farch%2Farmv7%2Fmm_virt.c;h=0a92f354230d039ed28344530503f5e20b674e48;hb=2905fecbe9bf464d09d5f2a29cdc8655d7cc0b45;hp=3b4e5198e18bd316eb7c22f709d89ca4f7eaba7f;hpb=c2bba6e776701404229ef2bebe10c8dc9046b026;p=tpg%2Facess2.git

diff --git a/Kernel/arch/armv7/mm_virt.c b/Kernel/arch/armv7/mm_virt.c
index 3b4e5198..0a92f354 100644
--- a/Kernel/arch/armv7/mm_virt.c
+++ b/Kernel/arch/armv7/mm_virt.c
@@ -37,7 +37,8 @@ typedef struct
 #define FRACTAL(table1, addr)	((table1)[ (0xFF8/4*1024) + ((addr)>>22)])
 #define USRFRACTAL(addr)	(*((Uint32*)(0x7FDFF000) + ((addr)>>22)))
 #define TLBIALL()	__asm__ __volatile__ ("mcr p15, 0, %0, c8, c7, 0" : : "r" (0))
-#define TLBIMVA(addr)	__asm__ __volatile__ ("mcr p15, 0, %0, c8, c7, 1" : : "r" (addr))
+#define TLBIMVA(addr)	__asm__ __volatile__ ("mcr p15, 0, %0, c8, c7, 1;dsb;isb" : : "r" ((addr)&~0xFFF):"memory")
+#define DCCMVAC(addr)	__asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 1" : : "r" ((addr)&~0xFFF))
 
 // === PROTOTYPES ===
 void	MM_int_GetTables(tVAddr VAddr, Uint32 **Table0, Uint32 **Table1);
@@ -126,7 +127,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 +164,10 @@ 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 );
+				DCCMVAC( (tVAddr) desc );
+				#warning "HACK: TLBIALL"
+				TLBIALL();
 				LEAVE('i', 0);
 				return 0;
 			}
@@ -171,7 +178,10 @@ int MM_int_SetPageInfo(tVAddr VAddr, tMM_PageInfo *pi)
 			if( pi->bShared)	*desc |= 1 << 10;	// S
 			*desc |= (pi->AP & 3) << 4;	// AP
 			*desc |= ((pi->AP >> 2) & 1) << 9;	// APX
-			TLBIMVA(VAddr & 0xFFFFF000);
+			TLBIMVA( VAddr );	
+			#warning "HACK: TLBIALL"
+			TLBIALL();
+			DCCMVAC( (tVAddr) desc );
 			LEAVE('i', 0);
 			return 0;
 		}
@@ -388,6 +398,33 @@ void MM_SetFlags(tVAddr VAddr, Uint Flags, Uint Mask)
 	MM_int_SetPageInfo(VAddr, &pi);
 }
 
+int MM_IsValidBuffer(tVAddr Addr, size_t Size)
+{
+	tMM_PageInfo	pi;
+	 int	bUser = 0;
+	
+	Size += Addr & (PAGE_SIZE-1);
+	Addr &= ~(PAGE_SIZE-1);
+
+	if( MM_int_GetPageInfo(Addr, &pi) )	return 0;
+	Addr += PAGE_SIZE;
+
+	if(pi.AP != AP_KRW_ONLY && pi.AP != AP_KRO_ONLY)
+		bUser = 1;
+
+	while( Size >= PAGE_SIZE )
+	{
+		if( MM_int_GetPageInfo(Addr, &pi) )
+			return 0;
+		if(bUser && (pi.AP == AP_KRW_ONLY || pi.AP == AP_KRO_ONLY))
+			return 0;
+		Addr += PAGE_SIZE;
+		Size -= PAGE_SIZE;
+	}
+	
+	return 1;
+}
+
 int MM_Map(tVAddr VAddr, tPAddr PAddr)
 {
 	tMM_PageInfo	pi = {0};
@@ -403,7 +440,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;
@@ -452,7 +489,6 @@ void MM_Deallocate(tVAddr VAddr)
 	tMM_PageInfo	pi;
 	
 	if( MM_int_GetPageInfo(VAddr, &pi) )	return ;
-
 	if( pi.PhysAddr == 0 )	return;
 	MM_DerefPhys(pi.PhysAddr);
 	
@@ -625,7 +661,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)
@@ -634,20 +670,22 @@ 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);
 			memcpy(tmp_page, (void*)sp, 0x1000);
 			MM_FreeTemp( (tVAddr) tmp_page );
 		}
-	
+
 		MM_FreeTemp( (tVAddr)table );
 	}
 
 	MM_FreeTemp( (tVAddr)new_lvl1_1 );
 	MM_FreeTemp( (tVAddr)new_lvl1_2 );
 
+//	Log("MM_Clone: ret = %P", ret);
+
 	return ret;
 }
 
@@ -660,7 +698,7 @@ void MM_ClearUser(void)
 	
 //	MM_DumpTables(0, 0x80000000);
 
-	Log("user_table_count = %i (as opposed to %i)", user_table_count, 0x800-4);
+//	Log("user_table_count = %i (as opposed to %i)", user_table_count, 0x800-4);
 
 	for( i = 0; i < user_table_count; i ++ )
 	{
@@ -723,8 +761,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)
@@ -737,7 +774,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);
 		
@@ -921,8 +958,10 @@ void MM_DumpTables(tVAddr Start, tVAddr End)
 	 int	i = 0, inRange=0;
 	
 	pi_old.Size = 0;
+	pi_old.AP = 0;
+	pi_old.PhysAddr = 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 )
 	{
@@ -954,7 +993,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;
@@ -966,7 +1005,30 @@ void MM_PageFault(Uint32 PC, Uint32 Addr, Uint32 DFSR, int bPrefetch)
 	if( rv == 0 &&  pi.AP == AP_RO_BOTH )
 	{
 		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;
@@ -982,15 +1044,20 @@ void MM_PageFault(Uint32 PC, Uint32 Addr, Uint32 DFSR, int bPrefetch)
 			memcpy( dst, src, PAGE_SIZE );
 			MM_FreeTemp( (tVAddr)dst );
 			
-			Log_Notice("MMVirt", "COW %p caused by %p, %P duped to %P", Addr, PC,
-				pi.PhysAddr, newpage);
+			#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);
+			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);
@@ -1001,6 +1068,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(;;);
 }