RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 07:08:10 +00:00
Code Issues Activity Actions

Kernel: Load executables on demand when symbolicating

Browse source 
Previously we would map the entire executable of a program in its own
address space (but make it unavailable to userspace code.)

This patch removes that and changes the symbolication code to remap
the executable on demand (and into the kernel's own address space
instead of the process address space.)

This opens up a couple of further simplifications that will follow.
This commit is contained in:
Andreas Kling 2020-03-02 10:40:40 +01:00
parent 055344f346
commit 678c87087d
4 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Kernel/Thread.cpp
View file

@ -754,7 +754,7 @@ struct RecognizedSymbol {
const KSym* ksym;
};
static bool symbolicate(const RecognizedSymbol& symbol, const Process& process, StringBuilder& builder)
static bool symbolicate(const RecognizedSymbol& symbol, const Process& process, StringBuilder& builder, Process::ELFBundle* elf_bundle)
{
if (!symbol.address)
return false;
@ -764,8 +764,8 @@ static bool symbolicate(const RecognizedSymbol& symbol, const Process& process,
if (!is_user_address(VirtualAddress(symbol.address))) {
builder.append("0xdeadc0de\n");
} else {
if (!Scheduler::is_active() && process.elf_loader() && process.elf_loader()->has_symbols())
builder.appendf("%p %s\n", symbol.address, process.elf_loader()->symbolicate(symbol.address).characters());
if (!Scheduler::is_active() && elf_bundle && elf_bundle->elf_loader->has_symbols())
builder.appendf("%p %s\n", symbol.address, elf_bundle->elf_loader->symbolicate(symbol.address).characters());
else
builder.appendf("%p\n", symbol.address);
}
@ -794,6 +794,7 @@ String Thread::backtrace_impl() const
}
auto& process = const_cast<Process&>(this->process());
auto elf_bundle = process.elf_bundle();
ProcessPagingScope paging_scope(process);
uintptr_t stack_ptr = start_frame;
@ -815,7 +816,7 @@ String Thread::backtrace_impl() const
StringBuilder builder;
for (auto& symbol : recognized_symbols) {
if (!symbolicate(symbol, process, builder))
if (!symbolicate(symbol, process, builder, elf_bundle.ptr()))
break;
}
return builder.to_string();