enderice2/Fennix
enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-05-31 08:47:57 +00:00
Code Issues Actions Releases Wiki Activity

TODO: Fix multicore tasking deadlock

Browse Source
This commit is contained in:
Alex 2022-11-07 06:14:16 +02:00
parent 3c4d67fa48
commit 31fa93ab96
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Tasking/Task.cpp
View File

@ -1,6 +1,7 @@
#include <task.hpp> #include <task.hpp>
#include <lock.hpp> #include <lock.hpp>
#include <printf.h>
#include <smp.hpp> #include <smp.hpp>
#include "../kernel.h" #include "../kernel.h"
@ -305,9 +306,7 @@ namespace Tasking
__attribute__((no_stack_protector)) void Task::Schedule(CPU::x64::TrapFrame *Frame) __attribute__((no_stack_protector)) void Task::Schedule(CPU::x64::TrapFrame *Frame)
{ {
CriticalSection cs; // Just to be sure SmartCriticalSection(SchedulerLock);
if (cs.IsInterruptsEnabled())
warn("Interrupts are enabled in the scheduler!");
CPUData *CurrentCPU = GetCurrentCPU(); CPUData *CurrentCPU = GetCurrentCPU();
schedbg("Scheduler called on CPU %d.", CurrentCPU->ID); schedbg("Scheduler called on CPU %d.", CurrentCPU->ID);
schedbg("%d: %ld%%", CurrentCPU->ID, GetUsage(CurrentCPU->ID)); schedbg("%d: %ld%%", CurrentCPU->ID, GetUsage(CurrentCPU->ID));
@ -440,11 +439,7 @@ namespace Tasking
} }
} }
__attribute__((no_stack_protector)) void Task::OnInterruptReceived(CPU::x64::TrapFrame *Frame) __attribute__((no_stack_protector)) void Task::OnInterruptReceived(CPU::x64::TrapFrame *Frame) { this->Schedule(Frame); }
{
SmartCriticalSection(SchedulerLock);
this->Schedule(Frame);
}
#elif defined(__i386__) #elif defined(__i386__)
__attribute__((no_stack_protector)) bool Task::FindNewProcess(void *CPUDataPointer) __attribute__((no_stack_protector)) bool Task::FindNewProcess(void *CPUDataPointer)
{ {
@ -476,10 +471,7 @@ namespace Tasking
fixme("unimplemented"); fixme("unimplemented");
} }
__attribute__((no_stack_protector)) void Task::OnInterruptReceived(void *Frame) __attribute__((no_stack_protector)) void Task::OnInterruptReceived(void *Frame) { this->Schedule(Frame); }
{
fixme("unimplemented");
}
#elif defined(__aarch64__) #elif defined(__aarch64__)
__attribute__((no_stack_protector)) bool Task::FindNewProcess(void *CPUDataPointer) __attribute__((no_stack_protector)) bool Task::FindNewProcess(void *CPUDataPointer)
{ {
@ -511,10 +503,7 @@ namespace Tasking
fixme("unimplemented"); fixme("unimplemented");
} }
__attribute__((no_stack_protector)) void Task::OnInterruptReceived(void *Frame) __attribute__((no_stack_protector)) void Task::OnInterruptReceived(void *Frame) { this->Schedule(Frame); }
{
fixme("unimplemented");
}
#endif #endif
void ThreadDoExit() void ThreadDoExit()
@ -772,7 +761,6 @@ namespace Tasking
Task::Task(const IP EntryPoint) : Interrupts::Handler(CPU::x64::IRQ16) Task::Task(const IP EntryPoint) : Interrupts::Handler(CPU::x64::IRQ16)
{ {
SmartCriticalSection(TaskingLock); SmartCriticalSection(TaskingLock);
#if defined(__amd64__) #if defined(__amd64__)
for (int i = 0; i < SMP::CPUCores; i++) for (int i = 0; i < SMP::CPUCores; i++)
((APIC::APIC *)Interrupts::apic[i])->RedirectIRQ(i, CPU::x64::IRQ16 - CPU::x64::IRQ0, 1); ((APIC::APIC *)Interrupts::apic[i])->RedirectIRQ(i, CPU::x64::IRQ16 - CPU::x64::IRQ0, 1);
@ -808,22 +796,29 @@ namespace Tasking
error("Interrupts are not enabled."); error("Interrupts are not enabled.");
CPU::Interrupts(CPU::Enable); CPU::Interrupts(CPU::Enable);
} }
for (int i = 0; i < SMP::CPUCores; i++)
{
/* do stuff i guess */
((APIC::Timer *)Interrupts::apicTimer[i])->OneShot(CPU::x64::IRQ16, 200);
}
// ((APIC::Timer *)Interrupts::apicTimer[0])->OneShot(CPU::x64::IRQ16, 100);
#endif #endif
TaskingLock.Unlock(); TaskingLock.Unlock();
this->IPCManager = new InterProcessCommunication::IPC; this->IPCManager = new InterProcessCommunication::IPC;
IdleProcess = CreateProcess(nullptr, (char *)"Idle", TaskTrustLevel::Idle); IdleProcess = CreateProcess(nullptr, (char *)"Idle", TaskTrustLevel::Idle);
IdleThread = CreateThread(IdleProcess, reinterpret_cast<uint64_t>(IdleProcessLoop)); for (int i = 0; i < SMP::CPUCores; i++)
IdleThread->Rename("Idle Thread"); {
IdleThread->SetPriority(1); IdleThread = CreateThread(IdleProcess, reinterpret_cast<uint64_t>(IdleProcessLoop));
TaskingLock.Lock(__FUNCTION__); char IdleName[16];
sprintf_(IdleName, "Idle Thread %d", i);
IdleThread->Rename(IdleName);
IdleThread->SetPriority(1);
}
debug("Tasking Started"); debug("Tasking Started");
((APIC::Timer *)Interrupts::apicTimer[0])->OneShot(CPU::x64::IRQ16, 100);
for (int i = 1; i < SMP::CPUCores; i++)
{
// TODO: Start other cores will end up in a deadlock. HOW?
// APIC::InterruptCommandRegisterLow icr;
// icr.Vector = CPU::x64::IRQ16;
// icr.Level = APIC::APICLevel::Assert;
// ((APIC::APIC *)Interrupts::apic[0])->IPI(i, icr);
}
} }
Task::~Task() Task::~Task()