X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fmm_virt.c;h=72c40c2a84b7be751ab2ddbfc1b5ef98307ed586;hb=717454930aa0e255517c68c837927deac49bd78e;hp=aaec06ea1ae93355acd4de050cfc0bf70329700f;hpb=fed0a8f469f7b187d26c0c8cb109bfd6930efaee;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/mm_virt.c b/Kernel/arch/x86/mm_virt.c
index aaec06ea..72c40c2a 100644
--- a/Kernel/arch/x86/mm_virt.c
+++ b/Kernel/arch/x86/mm_virt.c
@@ -56,7 +56,7 @@
 #define	PF_WRITE	0x2
 #define	PF_USER		0x4
 #define	PF_COW		0x200
-#define	PF_PAGED	0x400
+#define	PF_NOPAGE	0x400
 
 #define INVLPG(addr)	__asm__ __volatile__ ("invlpg (%0)"::"r"(addr))
 
@@ -74,10 +74,11 @@ extern void	Threads_SegFault(tVAddr Addr);
 extern void	Error_Backtrace(Uint eip, Uint ebp);
 
 // === PROTOTYPES ===
-void	MM_PreinitVirtual();
-void	MM_InstallVirtual();
+void	MM_PreinitVirtual(void);
+void	MM_InstallVirtual(void);
 void	MM_PageFault(tVAddr Addr, Uint ErrorCode, tRegs *Regs);
 void	MM_DumpTables(tVAddr Start, tVAddr End);
+tVAddr	MM_ClearUser(void);
 tPAddr	MM_DuplicatePage(tVAddr VAddr);
 
 // === GLOBALS ===
@@ -95,17 +96,17 @@ tPAddr	MM_DuplicatePage(tVAddr VAddr);
 #define gaPAE_TmpDir	((tTabEnt*)PAE_TMP_DIR_ADDR)
 #define gaPAE_TmpPDPT	((tTabEnt*)PAE_TMP_PDPT_ADDR)
  int	gbUsePAE = 0;
- int	gilTempMappings = 0;
- int	gilTempFractal = 0;
+tMutex	glTempMappings;
+tMutex	glTempFractal;
 Uint32	gWorkerStacks[(NUM_WORKER_STACKS+31)/32];
  int	giLastUsedWorker = 0;
 
 // === CODE ===
 /**
- * \fn void MM_PreinitVirtual()
+ * \fn void MM_PreinitVirtual(void)
  * \brief Maps the fractal mappings
  */
-void MM_PreinitVirtual()
+void MM_PreinitVirtual(void)
 {
 	#if USE_PAE
 	gaInitPageDir[ ((PAGE_TABLE_ADDR >> TAB)-3*512+3)*2 ] = ((tTabEnt)&gaInitPageDir - KERNEL_BASE) | 3;
@@ -116,10 +117,10 @@ void MM_PreinitVirtual()
 }
 
 /**
- * \fn void MM_InstallVirtual()
+ * \fn void MM_InstallVirtual(void)
  * \brief Sets up the constant page mappings
  */
-void MM_InstallVirtual()
+void MM_InstallVirtual(void)
 {
 	 int	i;
 	
@@ -158,7 +159,6 @@ void MM_InstallVirtual()
 	
 	// Unset kernel on the User Text pages
 	for( i = ((tVAddr)&_UsertextEnd-(tVAddr)&_UsertextBase+0xFFF)/4096; i--; ) {
-		Log("MM_SetFlags( 0x%08x, 0, MM_PFLAG_KERNEL)", (tVAddr)&_UsertextBase + i*4096);
 		MM_SetFlags( (tVAddr)&_UsertextBase + i*4096, 0, MM_PFLAG_KERNEL );
 	}
 }
@@ -166,7 +166,7 @@ void MM_InstallVirtual()
 /**
  * \brief Cleans up the SMP required mappings
  */
-void MM_FinishVirtualInit()
+void MM_FinishVirtualInit(void)
 {
 	#if USE_PAE
 	gaInitPDPT[ 0 ] = 0;
@@ -218,6 +218,9 @@ void MM_PageFault(tVAddr Addr, Uint ErrorCode, tRegs *Regs)
 			);
 		Warning("User Pagefault: Instruction at %04x:%08x accessed %p", Regs->cs, Regs->eip, Addr);
 		__asm__ __volatile__ ("sti");	// Restart IRQs
+		#if 1
+		Error_Backtrace(Regs->eip, Regs->ebp);
+		#endif
 		Threads_SegFault(Addr);
 		return ;
 	}
@@ -247,6 +250,19 @@ void MM_PageFault(tVAddr Addr, Uint ErrorCode, tRegs *Regs)
 	
 	//MM_DumpTables(0, -1);	
 	
+	// Register Dump
+	Log("EAX %08x ECX %08x EDX %08x EBX %08x", Regs->eax, Regs->ecx, Regs->edx, Regs->ebx);
+	Log("ESP %08x EBP %08x ESI %08x EDI %08x", Regs->esp, Regs->ebp, Regs->esi, Regs->edi);
+	//Log("SS:ESP %04x:%08x", Regs->ss, Regs->esp);
+	Log("CS:EIP %04x:%08x", Regs->cs, Regs->eip);
+	Log("DS %04x ES %04x FS %04x GS %04x", Regs->ds, Regs->es, Regs->fs, Regs->gs);
+	{
+		Uint	dr0, dr1;
+		__ASM__ ("mov %%dr0, %0":"=r"(dr0):);
+		__ASM__ ("mov %%dr1, %0":"=r"(dr1):);
+		Log("DR0 %08x DR1 %08x", dr0, dr1);
+	}
+	
 	Panic("Page Fault at 0x%x (Accessed 0x%x)", Regs->eip, Addr);
 }
 
@@ -294,7 +310,7 @@ void MM_DumpTables(tVAddr Start, tVAddr End)
 					rangeStart, curPos - 1,
 					gaPageTable[rangeStart>>12] & ~0xFFF,
 					(expected & ~0xFFF) - 1,
-					(expected & PF_PAGED ? "p" : "-"),
+					(expected & PF_NOPAGE ? "P" : "-"),
 					(expected & PF_COW ? "C" : "-"),
 					(expected & PF_USER ? "U" : "-"),
 					(expected & PF_WRITE ? "W" : "-")
@@ -315,7 +331,7 @@ void MM_DumpTables(tVAddr Start, tVAddr End)
 			rangeStart, curPos - 1,
 			gaPageTable[rangeStart>>12] & ~0xFFF,
 			(expected & ~0xFFF) - 1,
-			(expected & PF_PAGED ? "p" : "-"),
+			(expected & PF_NOPAGE ? "p" : "-"),
 			(expected & PF_COW ? "C" : "-"),
 			(expected & PF_USER ? "U" : "-"),
 			(expected & PF_WRITE ? "W" : "-")
@@ -479,7 +495,7 @@ int MM_Map(tVAddr VAddr, tPAddr PAddr)
  * \fn tVAddr MM_ClearUser()
  * \brief Clear user's address space
  */
-tVAddr MM_ClearUser()
+tVAddr MM_ClearUser(void)
 {
 	Uint	i, j;
 	
@@ -510,10 +526,10 @@ tVAddr MM_ClearUser()
 }
 
 /**
- * \fn tPAddr MM_Clone()
+ * \fn tPAddr MM_Clone(void)
  * \brief Clone the current address space
  */
-tPAddr MM_Clone()
+tPAddr MM_Clone(void)
 {
 	Uint	i, j;
 	tVAddr	ret;
@@ -521,7 +537,7 @@ tPAddr MM_Clone()
 	tVAddr	kStackBase = Proc_GetCurThread()->KernelStack - KERNEL_STACK_SIZE;
 	void	*tmp;
 	
-	LOCK( &gilTempFractal );
+	Mutex_Acquire( &glTempFractal );
 	
 	// Create Directory Table
 	*gpTmpCR3 = MM_AllocPhys() | 3;
@@ -529,37 +545,40 @@ tPAddr MM_Clone()
 	//LOG("Allocated Directory (%x)", *gpTmpCR3);
 	memsetd( gaTmpDir, 0, 1024 );
 	
-	// Copy Tables
-	for( i = 0; i < 768; i ++)
-	{
-		// Check if table is allocated
-		if( !(gaPageDir[i] & PF_PRESENT) ) {
-			gaTmpDir[i] = 0;
-			page += 1024;
-			continue;
-		}
-		
-		// Allocate new table
-		gaTmpDir[i] = MM_AllocPhys() | (gaPageDir[i] & 7);
-		INVLPG( &gaTmpTable[page] );
-		// Fill
-		for( j = 0; j < 1024; j ++, page++ )
+	if( Threads_GetPID() != 0 )
+	{	
+		// Copy Tables
+		for( i = 0; i < 768; i ++)
 		{
-			if( !(gaPageTable[page] & PF_PRESENT) ) {
-				gaTmpTable[page] = 0;
+			// Check if table is allocated
+			if( !(gaPageDir[i] & PF_PRESENT) ) {
+				gaTmpDir[i] = 0;
+				page += 1024;
 				continue;
 			}
 			
-			// Refrence old page
-			MM_RefPhys( gaPageTable[page] & ~0xFFF );
-			// Add to new table
-			if(gaPageTable[page] & PF_WRITE) {
-				gaTmpTable[page] = (gaPageTable[page] & ~PF_WRITE) | PF_COW;
-				gaPageTable[page] = (gaPageTable[page] & ~PF_WRITE) | PF_COW;
-				INVLPG( page << 12 );
+			// Allocate new table
+			gaTmpDir[i] = MM_AllocPhys() | (gaPageDir[i] & 7);
+			INVLPG( &gaTmpTable[page] );
+			// Fill
+			for( j = 0; j < 1024; j ++, page++ )
+			{
+				if( !(gaPageTable[page] & PF_PRESENT) ) {
+					gaTmpTable[page] = 0;
+					continue;
+				}
+				
+				// Refrence old page
+				MM_RefPhys( gaPageTable[page] & ~0xFFF );
+				// Add to new table
+				if(gaPageTable[page] & PF_WRITE) {
+					gaTmpTable[page] = (gaPageTable[page] & ~PF_WRITE) | PF_COW;
+					gaPageTable[page] = (gaPageTable[page] & ~PF_WRITE) | PF_COW;
+					INVLPG( page << 12 );
+				}
+				else
+					gaTmpTable[page] = gaPageTable[page];
 			}
-			else
-				gaTmpTable[page] = gaPageTable[page];
 		}
 	}
 	
@@ -629,29 +648,44 @@ tPAddr MM_Clone()
 	}
 	
 	ret = *gpTmpCR3 & ~0xFFF;
-	RELEASE( &gilTempFractal );
+	Mutex_Release( &glTempFractal );
 	
 	//LEAVE('x', ret);
 	return ret;
 }
 
 /**
- * \fn tVAddr MM_NewKStack()
+ * \fn tVAddr MM_NewKStack(void)
  * \brief Create a new kernel stack
  */
-tVAddr MM_NewKStack()
+tVAddr MM_NewKStack(void)
 {
-	tVAddr	base = KERNEL_STACKS;
+	tVAddr	base;
 	Uint	i;
-	for(;base<KERNEL_STACKS_END;base+=KERNEL_STACK_SIZE)
+	for(base = KERNEL_STACKS; base < KERNEL_STACKS_END; base += KERNEL_STACK_SIZE)
 	{
+		// Check if space is free
 		if(MM_GetPhysAddr(base) != 0)	continue;
-		for(i=0;i<KERNEL_STACK_SIZE;i+=0x1000) {
-			MM_Allocate(base+i);
+		// Allocate
+		//for(i = KERNEL_STACK_SIZE; i -= 0x1000 ; )
+		for(i = 0; i < KERNEL_STACK_SIZE; i += 0x1000 )
+		{
+			if( MM_Allocate(base+i) == 0 )
+			{
+				// On error, print a warning and return error
+				Warning("MM_NewKStack - Out of memory");
+				// - Clean up
+				//for( i += 0x1000 ; i < KERNEL_STACK_SIZE; i += 0x1000 )
+				//	MM_Deallocate(base+i);
+				return 0;
+			}
 		}
+		// Success
+		Log("MM_NewKStack - Allocated %p", base + KERNEL_STACK_SIZE);
 		return base+KERNEL_STACK_SIZE;
 	}
-	Warning("MM_NewKStack - No address space left\n");
+	// No stacks left
+	Warning("MM_NewKStack - No address space left");
 	return 0;
 }
 
@@ -672,6 +706,7 @@ tVAddr MM_NewWorkerStack()
 	__asm__ __volatile__ ("mov %%esp, %0": "=r"(esp));
 	__asm__ __volatile__ ("mov %%ebp, %0": "=r"(ebp));
 	
+	// TODO: Thread safety
 	// Find a free worker stack address
 	for(base = giLastUsedWorker; base < NUM_WORKER_STACKS; base++)
 	{
@@ -701,7 +736,7 @@ tVAddr MM_NewWorkerStack()
 	//Log(" MM_NewWorkerStack: base = 0x%x", base);
 	
 	// Acquire the lock for the temp fractal mappings
-	LOCK(&gilTempFractal);
+	Mutex_Acquire(&glTempFractal);
 	
 	// Set the temp fractals to TID0's address space
 	*gpTmpCR3 = ((Uint)gaInitPageDir - KERNEL_BASE) | 3;
@@ -719,13 +754,14 @@ tVAddr MM_NewWorkerStack()
 	
 	// Mapping Time!
 	for( addr = 0; addr < WORKER_STACK_SIZE; addr += 0x1000 )
+	//for( addr = WORKER_STACK_SIZE; addr; addr -= 0x1000 )
 	{
 		pages[ addr >> 12 ] = MM_AllocPhys();
 		gaTmpTable[ (base + addr) >> 12 ] = pages[addr>>12] | 3;
 	}
 	*gpTmpCR3 = 0;
 	// Release the temp mapping lock
-	RELEASE(&gilTempFractal);
+	Mutex_Release(&glTempFractal);
 	
 	// Copy the old stack
 	oldstack = (esp + KERNEL_STACK_SIZE-1) & ~(KERNEL_STACK_SIZE-1);
@@ -888,11 +924,11 @@ tVAddr MM_MapTemp(tPAddr PAddr)
 	
 	PAddr &= ~0xFFF;
 	
-	//LOG("gilTempMappings = %i", gilTempMappings);
+	//LOG("glTempMappings = %i", glTempMappings);
 	
 	for(;;)
 	{
-		LOCK( &gilTempMappings );
+		Mutex_Acquire( &glTempMappings );
 		
 		for( i = 0; i < NUM_TEMP_PAGES; i ++ )
 		{
@@ -902,11 +938,11 @@ tVAddr MM_MapTemp(tPAddr PAddr)
 			gaPageTable[ (TEMP_MAP_ADDR >> 12) + i ] = PAddr | 3;
 			INVLPG( TEMP_MAP_ADDR + (i << 12) );
 			//LEAVE('p', TEMP_MAP_ADDR + (i << 12));
-			RELEASE( &gilTempMappings );
+			Mutex_Release( &glTempMappings );
 			return TEMP_MAP_ADDR + (i << 12);
 		}
-		RELEASE( &gilTempMappings );
-		Threads_Yield();
+		Mutex_Release( &glTempMappings );
+		Threads_Yield();	// TODO: Use a sleep queue here instead
 	}
 }
 
@@ -1041,8 +1077,7 @@ void MM_UnmapHWPages(tVAddr VAddr, Uint Number)
 	
 	i = VAddr >> 12;
 	
-	LOCK( &gilTempMappings );	// Temp and HW share a directory, so they share a lock
-	
+	Mutex_Acquire( &glTempMappings );	// Temp and HW share a directory, so they share a lock
 	
 	for( j = 0; j < Number; j++ )
 	{
@@ -1050,7 +1085,7 @@ void MM_UnmapHWPages(tVAddr VAddr, Uint Number)
 		gaPageTable[ i + j ] = 0;
 	}
 	
-	RELEASE( &gilTempMappings );
+	Mutex_Release( &glTempMappings );
 }
 
 // --- EXPORTS ---