X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fproc.c;h=82a3f40908fb821f08d893ac86cb6d94e10a4cec;hb=a2495c6ea4f4cab16b5d339ae511428e92e89e73;hp=5ec3676d967509b21d07f4bcc997a244b8d19ac4;hpb=6c86cb7a9c4b01daadf3e8624845ab35b55ee73a;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86/proc.c b/Kernel/arch/x86/proc.c index 5ec3676d..82a3f409 100644 --- a/Kernel/arch/x86/proc.c +++ b/Kernel/arch/x86/proc.c @@ -12,11 +12,12 @@ # include #endif #include +#include // === FLAGS === #define DEBUG_TRACE_SWITCH 0 #define DEBUG_DISABLE_DOUBLEFAULT 1 -#define DEBUG_VERY_SLOW_SWITCH 0 +#define DEBUG_VERY_SLOW_PERIOD 0 // === CONSTANTS === // Base is 1193182 @@ -34,7 +35,6 @@ typedef struct sCPU Uint8 State; // 0: Unavaliable, 1: Idle, 2: Active Uint16 Resvd; tThread *Current; - tThread *IdleThread; } tCPU; // === IMPORTS === @@ -45,12 +45,13 @@ extern void APStartup(void); // 16-bit AP startup code extern Uint GetEIP(void); // start.asm extern Uint GetEIP_Sched(void); // proc.asm extern void NewTaskHeader(tThread *Thread, void *Fcn, int nArgs, ...); // Actually takes cdecl args -extern Uint Proc_CloneInt(Uint *ESP, Uint32 *CR3); +extern Uint Proc_CloneInt(Uint *ESP, Uint32 *CR3, int bNoUserClone); extern Uint32 gaInitPageDir[1024]; // start.asm extern char Kernel_Stack_Top[]; extern int giNumCPUs; extern int giNextTID; extern tThread gThreadZero; +extern tProcess gProcessZero; extern void Isr8(void); // Double Fault extern void Proc_ReturnToUser(tVAddr Handler, Uint Argument, tVAddr KernelStack); extern char scheduler_return[]; // Return address in SchedulerBase @@ -66,6 +67,7 @@ extern void Proc_DisableSSE(void); //void ArchThreads_Init(void); #if USE_MP void MP_StartAP(int CPU); +void MP_SendIPIVector(int CPU, Uint8 Vector); void MP_SendIPI(Uint8 APICID, int Vector, int DeliveryMode); #endif void Proc_IdleThread(void *Ptr); @@ -93,7 +95,9 @@ Uint8 gaAPIC_to_CPU[256] = {0}; int giProc_BootProcessorID = 0; tTSS gaTSSs[MAX_CPUS]; // TSS Array #endif -tCPU gaCPUs[MAX_CPUS]; +tCPU gaCPUs[MAX_CPUS] = { + {.Current = &gThreadZero} + }; tTSS *gTSSs = NULL; // Pointer to TSS array tTSS gTSS0 = {0}; // --- Error Recovery --- @@ -163,6 +167,7 @@ void ArchThreads_Init(void) { int i; tMPTable_Ent *ents; + #if DUMP_MP_TABLE Log("gMPFloatPtr = %p", gMPFloatPtr); Log("*gMPFloatPtr = {"); Log("\t.Sig = 0x%08x", gMPFloatPtr->Sig); @@ -176,8 +181,10 @@ void ArchThreads_Init(void) gMPFloatPtr->Features[4] ); Log("}"); - + #endif + mptable = (void*)( KERNEL_BASE|gMPFloatPtr->MPConfig ); + #if DUMP_MP_TABLE Log("mptable = %p", mptable); Log("*mptable = {"); Log("\t.Sig = 0x%08x", mptable->Sig); @@ -193,6 +200,7 @@ void ArchThreads_Init(void) Log("\t.ExtendedTableLen = 0x%04x", mptable->ExtendedTableLen); Log("\t.ExtendedTableChecksum = 0x%02x", mptable->ExtendedTableChecksum); Log("}"); + #endif gpMP_LocalAPIC = (void*)MM_MapHWPages(mptable->LocalAPICMemMap, 1); @@ -206,13 +214,14 @@ void ArchThreads_Init(void) { case 0: // Processor entSize = 20; + #if DUMP_MP_TABLE Log("%i: Processor", i); Log("\t.APICID = %i", ents->Proc.APICID); Log("\t.APICVer = 0x%02x", ents->Proc.APICVer); Log("\t.CPUFlags = 0x%02x", ents->Proc.CPUFlags); Log("\t.CPUSignature = 0x%08x", ents->Proc.CPUSignature); Log("\t.FeatureFlags = 0x%08x", ents->Proc.FeatureFlags); - + #endif if( !(ents->Proc.CPUFlags & 1) ) { Log("DISABLED"); @@ -238,7 +247,7 @@ void ArchThreads_Init(void) break; - #if DUMP_MP_TABLES + #if DUMP_MP_TABLE >= 2 case 1: // Bus entSize = 8; Log("%i: Bus", i); @@ -315,7 +324,7 @@ void ArchThreads_Init(void) outb(0x40, TIMER_DIVISOR&0xFF); // Low Byte of Divisor outb(0x40, (TIMER_DIVISOR>>8)&0xFF); // High Byte - Log("Timer Frequency %i.%03i Hz", + Log_Debug("Proc", "PIT Frequency %i.%03i Hz", TIMER_BASE/TIMER_DIVISOR, ((Uint64)TIMER_BASE*1000/TIMER_DIVISOR)%1000 ); @@ -329,8 +338,8 @@ void ArchThreads_Init(void) Log("APIC Count %i", giMP_TimerCount); { Uint64 freq = giMP_TimerCount; - freq /= TIMER_DIVISOR; freq *= TIMER_BASE; + freq /= TIMER_DIVISOR; if( (freq /= 1000) < 2*1000) Log("Bus Frequency %i KHz", freq); else if( (freq /= 1000) < 2*1000) @@ -365,7 +374,7 @@ void ArchThreads_Init(void) gaCPUs[0].Current = &gThreadZero; gThreadZero.CurCPU = 0; - gThreadZero.MemState.CR3 = (Uint)gaInitPageDir - KERNEL_BASE; + gProcessZero.MemState.CR3 = (Uint)gaInitPageDir - KERNEL_BASE; // Create Per-Process Data Block if( !MM_Allocate(MM_PPD_CFG) ) @@ -381,9 +390,12 @@ void ArchThreads_Init(void) } #if USE_MP +/** + * \brief Start an AP + */ void MP_StartAP(int CPU) { - Log("Starting AP %i (APIC %i)", CPU, gaCPUs[CPU].APICID); + Log_Log("Proc", "Starting AP %i (APIC %i)", CPU, gaCPUs[CPU].APICID); // Set location of AP startup code and mark for a warm restart *(Uint16*)(KERNEL_BASE|0x467) = (Uint)&APWait - (KERNEL_BASE|0xFFFF0); @@ -407,11 +419,17 @@ void MP_StartAP(int CPU) giNumInitingCPUs ++; } +void MP_SendIPIVector(int CPU, Uint8 Vector) +{ + MP_SendIPI(gaCPUs[CPU].APICID, Vector, 0); +} + /** * \brief Send an Inter-Processor Interrupt * \param APICID Processor's Local APIC ID * \param Vector Argument of some kind - * \param DeliveryMode Type of signal? + * \param DeliveryMode Type of signal + * \note 3A 10.5 "APIC/Handling Local Interrupts" */ void MP_SendIPI(Uint8 APICID, int Vector, int DeliveryMode) { @@ -419,23 +437,24 @@ void MP_SendIPI(Uint8 APICID, int Vector, int DeliveryMode) // Hi val = (Uint)APICID << 24; - Log("*%p = 0x%08x", &gpMP_LocalAPIC->ICR[1], val); +// Log("%p = 0x%08x", &gpMP_LocalAPIC->ICR[1], val); gpMP_LocalAPIC->ICR[1].Val = val; // Low (and send) val = ((DeliveryMode & 7) << 8) | (Vector & 0xFF); - Log("*%p = 0x%08x", &gpMP_LocalAPIC->ICR[0], val); +// Log("%p = 0x%08x", &gpMP_LocalAPIC->ICR[0], val); gpMP_LocalAPIC->ICR[0].Val = val; } #endif void Proc_IdleThread(void *Ptr) { - tCPU *cpu = Ptr; - cpu->IdleThread->ThreadName = strdup("Idle Thread"); - Threads_SetPriority( cpu->IdleThread, -1 ); // Never called randomly - cpu->IdleThread->Quantum = 1; // 1 slice quantum + tCPU *cpu = &gaCPUs[GetCPUNum()]; + cpu->Current->ThreadName = strdup("Idle Thread"); + Threads_SetPriority( cpu->Current, -1 ); // Never called randomly + cpu->Current->Quantum = 1; // 1 slice quantum for(;;) { - HALT(); + __asm__ __volatile__ ("sti"); // Make sure interrupts are enabled + __asm__ __volatile__ ("hlt"); // Make sure interrupts are enabled Proc_Reschedule(); } } @@ -459,7 +478,6 @@ void Proc_Start(void) // Create Idle Task tid = Proc_NewKThread(Proc_IdleThread, &gaCPUs[i]); - gaCPUs[i].IdleThread = Threads_GetThread(tid); // Start the AP if( i != giProc_BootProcessorID ) { @@ -471,20 +489,17 @@ void Proc_Start(void) gaCPUs[0].Current = &gThreadZero; // Start interrupts and wait for APs to come up - Log("Waiting for APs to come up\n"); + Log_Debug("Proc", "Waiting for APs to come up"); __asm__ __volatile__ ("sti"); while( giNumInitingCPUs ) __asm__ __volatile__ ("hlt"); #else // Create Idle Task tid = Proc_NewKThread(Proc_IdleThread, &gaCPUs[0]); - gaCPUs[0].IdleThread = Threads_GetThread(tid); +// gaCPUs[0].IdleThread = Threads_GetThread(tid); // Set current task gaCPUs[0].Current = &gThreadZero; -// while( gaCPUs[0].IdleThread == NULL ) -// Threads_Yield(); - // Start Interrupts (and hence scheduler) __asm__ __volatile__("sti"); #endif @@ -555,16 +570,20 @@ void Proc_ChangeStack(void) __asm__ __volatile__ ("mov %0, %%ebp"::"r"(ebp)); } +void Proc_ClearProcess(tProcess *Process) +{ + MM_ClearSpace(Process->MemState.CR3); +} + void Proc_ClearThread(tThread *Thread) { - Log_Warning("Proc", "TODO: Nuke address space etc"); if(Thread->SavedState.SSE) { free(Thread->SavedState.SSE); Thread->SavedState.SSE = NULL; } } -int Proc_NewKThread(void (*Fcn)(void*), void *Data) +tTID Proc_NewKThread(void (*Fcn)(void*), void *Data) { Uint esp; tThread *newThread, *cur; @@ -573,9 +592,6 @@ int Proc_NewKThread(void (*Fcn)(void*), void *Data) newThread = Threads_CloneTCB(0); if(!newThread) return -1; - // Set CR3 - newThread->MemState.CR3 = cur->MemState.CR3; - // Create new KStack newThread->KernelStack = MM_NewKStack(); // Check for errors @@ -593,7 +609,7 @@ int Proc_NewKThread(void (*Fcn)(void*), void *Data) newThread->SavedState.ESP = esp; newThread->SavedState.EIP = (Uint)&NewTaskHeader; newThread->SavedState.SSE = NULL; - Log("New (KThread) %p, esp = %p\n", newThread->SavedState.EIP, newThread->SavedState.ESP); +// Log("New (KThread) %p, esp = %p", newThread->SavedState.EIP, newThread->SavedState.ESP); // MAGIC_BREAK(); Threads_AddActive(newThread); @@ -605,7 +621,7 @@ int Proc_NewKThread(void (*Fcn)(void*), void *Data) * \fn int Proc_Clone(Uint *Err, Uint Flags) * \brief Clone the current process */ -int Proc_Clone(Uint Flags) +tPID Proc_Clone(Uint Flags) { tThread *newThread; tThread *cur = Proc_GetCurThread(); @@ -624,9 +640,8 @@ int Proc_Clone(Uint Flags) newThread->KernelStack = cur->KernelStack; // Clone state - eip = Proc_CloneInt(&newThread->SavedState.ESP, &newThread->MemState.CR3); + eip = Proc_CloneInt(&newThread->SavedState.ESP, &newThread->Process->MemState.CR3, Flags & CLONE_NOUSER); if( eip == 0 ) { - // ACK the interrupt return 0; } newThread->SavedState.EIP = eip; @@ -634,7 +649,7 @@ int Proc_Clone(Uint Flags) newThread->SavedState.bSSEModified = 0; // Check for errors - if( newThread->MemState.CR3 == 0 ) { + if( newThread->Process->MemState.CR3 == 0 ) { Log_Error("Proc", "Proc_Clone: MM_Clone failed"); Threads_Delete(newThread); return -1; @@ -712,16 +727,16 @@ Uint Proc_MakeUserStack(void) return base + USER_STACK_SZ; } -void Proc_StartUser(Uint Entrypoint, Uint Base, int ArgC, char **ArgV, int DataSize) +void Proc_StartUser(Uint Entrypoint, Uint Base, int ArgC, const char **ArgV, int DataSize) { Uint *stack; int i; - char **envp = NULL; + const char **envp = NULL; Uint16 ss, cs; // Copy data to the user stack and free original buffer stack = (void*)Proc_MakeUserStack(); - stack -= DataSize/sizeof(*stack); + stack -= (DataSize+sizeof(*stack)-1)/sizeof(*stack); memcpy( stack, ArgV, DataSize ); free(ArgV); @@ -729,7 +744,7 @@ void Proc_StartUser(Uint Entrypoint, Uint Base, int ArgC, char **ArgV, int DataS if( DataSize ) { Uint delta = (Uint)stack - (Uint)ArgV; - ArgV = (char**)stack; + ArgV = (const char**)stack; for( i = 0; ArgV[i]; i++ ) ArgV[i] += delta; envp = &ArgV[i+1]; for( i = 0; envp[i]; i++ ) envp[i] += delta; @@ -904,18 +919,22 @@ void Proc_Reschedule(void) nextthread = Threads_GetNextToRun(cpu, curthread); - if(!nextthread) - nextthread = gaCPUs[cpu].IdleThread; if(!nextthread || nextthread == curthread) return ; #if DEBUG_TRACE_SWITCH - LogF("\nSwitching to task %i, CR3 = 0x%x, EIP = %p, ESP = %p\n", - nextthread->TID, - nextthread->MemState.CR3, - nextthread->SavedState.EIP, - nextthread->SavedState.ESP - ); + // HACK: Ignores switches to the idle threads + if( nextthread->TID == 0 || nextthread->TID > giNumCPUs ) + { + LogF("\nSwitching CPU %i to %p (%i %s) - CR3 = 0x%x, EIP = %p, ESP = %p\n", + GetCPUNum(), + nextthread, nextthread->TID, nextthread->ThreadName, + nextthread->Process->MemState.CR3, + nextthread->SavedState.EIP, + nextthread->SavedState.ESP + ); + LogF("OldCR3 = %P\n", curthread->Process->MemState.CR3); + } #endif // Update CPU state @@ -924,18 +943,29 @@ void Proc_Reschedule(void) __asm__ __volatile__("mov %0, %%db0\n\t" : : "r"(nextthread) ); // Save FPU/MMX/XMM/SSE state - if( curthread->SavedState.SSE ) + if( curthread && curthread->SavedState.SSE ) { Proc_SaveSSE( ((Uint)curthread->SavedState.SSE + 0xF) & ~0xF ); curthread->SavedState.bSSEModified = 0; Proc_DisableSSE(); } - SwitchTasks( - nextthread->SavedState.ESP, &curthread->SavedState.ESP, - nextthread->SavedState.EIP, &curthread->SavedState.EIP, - nextthread->MemState.CR3 - ); + if( curthread ) + { + SwitchTasks( + nextthread->SavedState.ESP, &curthread->SavedState.ESP, + nextthread->SavedState.EIP, &curthread->SavedState.EIP, + nextthread->Process->MemState.CR3 + ); + } + else + { + SwitchTasks( + nextthread->SavedState.ESP, 0, + nextthread->SavedState.EIP, 0, + nextthread->Process->MemState.CR3 + ); + } return ; } @@ -946,6 +976,7 @@ void Proc_Reschedule(void) */ void Proc_Scheduler(int CPU) { +#if 0 tThread *thread; // If the spinlock is set, let it complete @@ -978,7 +1009,6 @@ void Proc_Scheduler(int CPU) regs->eflags &= ~0x100; // Clear TF } -#if 0 // TODO: Ack timer? #if USE_MP if( GetCPUNum() )