X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fproc.c;h=7d54d0c2ea1004121fe48b859f88d5a3bc6e53dd;hb=a20cfd571f504f5c7f2d29516442a12c200441d5;hp=255765a8284f6eae3e7d8f4ef4a3c892b051e79b;hpb=61c8b3334fb9bb3c1fb48d9f1f3508ffbe5341bf;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86/proc.c b/Kernel/arch/x86/proc.c index 255765a8..7d54d0c2 100644 --- a/Kernel/arch/x86/proc.c +++ b/Kernel/arch/x86/proc.c @@ -16,7 +16,7 @@ // === 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 +34,6 @@ typedef struct sCPU Uint8 State; // 0: Unavaliable, 1: Idle, 2: Active Uint16 Resvd; tThread *Current; - tThread *IdleThread; } tCPU; // === IMPORTS === @@ -45,33 +44,35 @@ 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, Uint *CR3); +extern Uint Proc_CloneInt(Uint *ESP, Uint32 *CR3); extern Uint32 gaInitPageDir[1024]; // start.asm extern char Kernel_Stack_Top[]; -extern tShortSpinlock glThreadListLock; extern int giNumCPUs; extern int giNextTID; extern tThread gThreadZero; extern void Isr8(void); // Double Fault extern void Proc_ReturnToUser(tVAddr Handler, Uint Argument, tVAddr KernelStack); -extern void scheduler_return; // Return address in SchedulerBase -extern void IRQCommon; // Common IRQ handler code -extern void IRQCommon_handled; // IRQCommon call return location -extern void GetEIP_Sched_ret; // GetEIP call return location -extern void Threads_AddToDelete(tThread *Thread); +extern char scheduler_return[]; // Return address in SchedulerBase +extern char IRQCommon[]; // Common IRQ handler code +extern char IRQCommon_handled[]; // IRQCommon call return location +extern char GetEIP_Sched_ret[]; // GetEIP call return location extern void SwitchTasks(Uint NewSP, Uint *OldSP, Uint NewIP, Uint *OldIO, Uint CR3); +extern void Proc_InitialiseSSE(void); +extern void Proc_SaveSSE(Uint DestPtr); +extern void Proc_DisableSSE(void); // === PROTOTYPES === //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); //void Proc_Start(void); //tThread *Proc_GetCurThread(void); void Proc_ChangeStack(void); - int Proc_NewKThread(void (*Fcn)(void*), void *Data); +// int Proc_NewKThread(void (*Fcn)(void*), void *Data); // int Proc_Clone(Uint *Err, Uint Flags); Uint Proc_MakeUserStack(void); //void Proc_StartUser(Uint Entrypoint, Uint *Bases, int ArgC, char **ArgV, char **EnvP, int DataSize); @@ -92,7 +93,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 --- @@ -162,6 +165,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); @@ -175,8 +179,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); @@ -192,6 +198,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); @@ -205,13 +212,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"); @@ -237,7 +245,7 @@ void ArchThreads_Init(void) break; - #if DUMP_MP_TABLES + #if DUMP_MP_TABLE >= 2 case 1: // Bus entSize = 8; Log("%i: Bus", i); @@ -314,7 +322,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 ); @@ -328,8 +336,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) @@ -371,15 +379,21 @@ void ArchThreads_Init(void) { Panic("OOM - No space for initial Per-Process Config"); } + + // Initialise SSE support + Proc_InitialiseSSE(); // Change Stacks Proc_ChangeStack(); } #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); @@ -403,11 +417,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) { @@ -415,23 +435,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(); } } @@ -455,7 +476,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 ) { @@ -467,20 +487,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 @@ -551,6 +568,15 @@ void Proc_ChangeStack(void) __asm__ __volatile__ ("mov %0, %%ebp"::"r"(ebp)); } +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) { Uint esp; @@ -579,7 +605,8 @@ int Proc_NewKThread(void (*Fcn)(void*), void *Data) newThread->SavedState.ESP = esp; newThread->SavedState.EIP = (Uint)&NewTaskHeader; - Log("New (KThread) %p, esp = %p\n", newThread->SavedState.EIP, newThread->SavedState.ESP); + newThread->SavedState.SSE = NULL; +// Log("New (KThread) %p, esp = %p", newThread->SavedState.EIP, newThread->SavedState.ESP); // MAGIC_BREAK(); Threads_AddActive(newThread); @@ -616,11 +643,13 @@ int Proc_Clone(Uint Flags) return 0; } newThread->SavedState.EIP = eip; + newThread->SavedState.SSE = NULL; + newThread->SavedState.bSSEModified = 0; // Check for errors if( newThread->MemState.CR3 == 0 ) { Log_Error("Proc", "Proc_Clone: MM_Clone failed"); - Threads_AddToDelete(newThread); + Threads_Delete(newThread); return -1; } @@ -656,8 +685,9 @@ int Proc_SpawnWorker(void (*Fcn)(void*), void *Data) // Save core machine state new->SavedState.ESP = new->KernelStack - sizeof(stack_contents); - new->SavedState.EBP = 0; new->SavedState.EIP = (Uint)NewTaskHeader; + new->SavedState.SSE = NULL; + new->SavedState.bSSEModified = 0; // Mark as active new->Status = THREAD_STAT_PREINIT; @@ -726,7 +756,6 @@ void Proc_StartUser(Uint Entrypoint, Uint Base, int ArgC, char **ArgV, int DataS *--stack = (Uint)ArgV; *--stack = (Uint)ArgC; *--stack = Base; - *--stack = 0; // Return Address Proc_StartProcess(ss, (Uint)stack, 0x202, cs, Entrypoint); } @@ -850,7 +879,6 @@ void Proc_DumpThreadCPUState(tThread *Thread) return ; } - #if 1 tVAddr diffFromScheduler = Thread->SavedState.EIP - (tVAddr)SwitchTasks; tVAddr diffFromClone = Thread->SavedState.EIP - (tVAddr)Proc_CloneInt; tVAddr diffFromSpawn = Thread->SavedState.EIP - (tVAddr)NewTaskHeader; @@ -868,24 +896,6 @@ void Proc_DumpThreadCPUState(tThread *Thread) } if( diffFromScheduler > 0 && diffFromScheduler < 128 ) // When I last checked, GetEIP was at .+0x30 - #else - Uint32 data[3]; - MM_ReadFromAddrSpace(Thread->MemState.CR3, Thread->SavedState.EBP, data, 12); - if( data[1] == (Uint32)&IRQCommon + 25 ) - { - tRegs *regs = (void *) data[2]; - Log(" oldebp = 0x%08x, ret = 0x%08x, regs = 0x%x", - data[0], data[1], data[2] - ); - // [EBP] = old EBP - // [EBP+0x04] = Return Addr - // [EBP+0x08] = Arg 1 (CPU Number) - // [EBP+0x0C] = Arg 2 (Thread) - // [EBP+0x10] = GS (start of tRegs) - Log(" IRQ%i from %02x:%08x", regs->int_num regs->cs, regs->eip); - } - if( stack[1] == (Uint32)&scheduler_return ) - #endif { // Scheduled out Log(" At %04x:%08x", Thread->SavedState.UserCS, Thread->SavedState.UserEIP); @@ -900,25 +910,28 @@ void Proc_Reschedule(void) tThread *nextthread, *curthread; int cpu = GetCPUNum(); - // TODO: Wait for it? + // TODO: Wait for the lock? if(IS_LOCKED(&glThreadListLock)) return; curthread = Proc_GetCurThread(); 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->MemState.CR3, + nextthread->SavedState.EIP, + nextthread->SavedState.ESP + ); + } #endif // Update CPU state @@ -926,11 +939,31 @@ void Proc_Reschedule(void) gTSSs[cpu].ESP0 = nextthread->KernelStack-4; __asm__ __volatile__("mov %0, %%db0\n\t" : : "r"(nextthread) ); - SwitchTasks( - nextthread->SavedState.ESP, &curthread->SavedState.ESP, - nextthread->SavedState.EIP, &curthread->SavedState.EIP, - nextthread->MemState.CR3 - ); + // Save FPU/MMX/XMM/SSE state + if( curthread && curthread->SavedState.SSE ) + { + Proc_SaveSSE( ((Uint)curthread->SavedState.SSE + 0xF) & ~0xF ); + curthread->SavedState.bSSEModified = 0; + Proc_DisableSSE(); + } + + if( curthread ) + { + SwitchTasks( + nextthread->SavedState.ESP, &curthread->SavedState.ESP, + nextthread->SavedState.EIP, &curthread->SavedState.EIP, + nextthread->MemState.CR3 + ); + } + else + { + SwitchTasks( + nextthread->SavedState.ESP, 0, + nextthread->SavedState.EIP, 0, + nextthread->MemState.CR3 + ); + } + return ; }