Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-28 15:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

RIP history implementation for broken stacks

Browse Source
This commit is contained in:
Alex 2022-12-14 14:21:48 +02:00
parent 40c26f1232
commit 3828186c56
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
3 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Core/Crash/Screens/StackFrame.cpp
View File

@ -27,11 +27,9 @@ namespace CrashHandler
EHPrint("\n\eFAFAFATracing 40 process frames..."); EHPrint("\n\eFAFAFATracing 40 process frames...");
SymbolResolver::Symbols *sh = data.Process->ELFSymbolTable; SymbolResolver::Symbols *sh = data.Process->ELFSymbolTable;
if (!sh) if (!sh)
{
EHPrint("\n\eFF0000< No symbol table available. >\n"); EHPrint("\n\eFF0000< No symbol table available. >\n");
return; else
} TraceFrames(data.Frame, 40, sh, false);
TraceFrames(data.Frame, 40, sh, false);
} }
EHPrint("\n\eFAFAFATracing interrupt frames..."); EHPrint("\n\eFAFAFATracing interrupt frames...");
for (uint64_t i = 0; i < 8; i++) for (uint64_t i = 0; i < 8; i++)
@ -53,5 +51,33 @@ namespace CrashHandler
EHPrint("\eFF4CA9Outside Kernel"); EHPrint("\eFF4CA9Outside Kernel");
} }
} }
if (data.Process && data.Thread)
{
EHPrint("\n\n\eFAFAFATracing thread RIP history...");
SymbolResolver::Symbols *sh = data.Process->ELFSymbolTable;
if (!sh)
EHPrint("\n\eFF0000< No symbol table available. >\n");
else
{
int SameItr = 0;
uint64_t LastRIP = 0;
for (int i = 0; i < 128; i++)
{
if (data.Thread->RIPHistory[i] == 0)
break;
if (data.Thread->RIPHistory[i] == LastRIP)
{
SameItr++;
if (SameItr > 3)
continue;
}
else
SameItr = 0;
LastRIP = data.Thread->RIPHistory[i];
EHPrint("\n\e2565CC%p\e7925CC-\e25CCC9%s", data.Thread->RIPHistory[i], sh->GetSymbolFromAddress((uint64_t)data.Thread->RIPHistory[i]));
}
EHPrint("\n\e7925CCNote: \e2565CCSame RIPs are not shown more than 3 times.\n");
}
}
} }
} }

17
Tasking/Task.cpp
View File

@ -489,6 +489,23 @@ namespace Tasking
CurrentCPU->CurrentThread->Status = TaskStatus::Running; CurrentCPU->CurrentThread->Status = TaskStatus::Running;
*Frame = CurrentCPU->CurrentThread->Registers; *Frame = CurrentCPU->CurrentThread->Registers;
// FIXME: Untested
for (int i = 0; i < 128; i++)
{
if (CurrentCPU->CurrentThread->RIPHistory[i] == 0)
{
CurrentCPU->CurrentThread->RIPHistory[i] = Frame->rip;
break;
}
if (i == 127)
{
for (int j = 0; j < 127; j++)
CurrentCPU->CurrentThread->RIPHistory[j] = CurrentCPU->CurrentThread->RIPHistory[j + 1];
CurrentCPU->CurrentThread->RIPHistory[127] = Frame->rip;
}
}
GlobalDescriptorTable::SetKernelStack((void *)((uint64_t)CurrentCPU->CurrentThread->Stack->GetStackTop())); GlobalDescriptorTable::SetKernelStack((void *)((uint64_t)CurrentCPU->CurrentThread->Stack->GetStackTop()));
CPU::x64::writecr3({.raw = (uint64_t)CurrentCPU->CurrentProcess->PageTable}); CPU::x64::writecr3({.raw = (uint64_t)CurrentCPU->CurrentProcess->PageTable});
// Not sure if this is needed, but it's better to be safe than sorry. // Not sure if this is needed, but it's better to be safe than sorry.

3
include/task.hpp
View File

@ -94,8 +94,11 @@ namespace Tasking
#if defined(__amd64__) #if defined(__amd64__)
CPU::x64::TrapFrame Registers; CPU::x64::TrapFrame Registers;
uint64_t GSBase, FSBase; uint64_t GSBase, FSBase;
uint64_t RIPHistory[128];
#elif defined(__i386__) #elif defined(__i386__)
uint32_t Registers; // TODO uint32_t Registers; // TODO
uint64_t GSBase, FSBase;
uint32_t EIPHistory[128];
#elif defined(__aarch64__) #elif defined(__aarch64__)
uint64_t Registers; // TODO uint64_t Registers; // TODO
#endif #endif