瀏覽代碼

Kernel: Add (expensive) but valuable userspace symbols to stacks.

This is expensive because we have to page in the entire executable for every
process up front for this to work. This is due to the page fault code not
being strong enough to run while another process is active.

Note that we already had userspace symbols in *crash* stacks. This patch
adds them generally, so they show up in /proc, Process Manager, etc.

There's room for improvement here, but the debugging benefits way overshadow
the performance penalty right now. :^)
Andreas Kling 6 年之前
父節點
當前提交
a79d8d8ae5
共有 3 個文件被更改,包括 13 次插入1 次删除
  1. 1 0
      Kernel/Makefile
  2. 5 0
      Kernel/Process.cpp
  3. 7 1
      Kernel/Thread.cpp

+ 1 - 0
Kernel/Makefile

@@ -105,6 +105,7 @@ CXXFLAGS += -nostdlib -nostdinc -nostdinc++
 CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/8.3.0/
 CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/8.3.0/i686-pc-serenity/
 DEFINES += -DKERNEL
+DEFINES += -DEXPENSIVE_USERSPACE_STACKS
 LDFLAGS += -Ttext 0x10000 -Wl,-T linker.ld -nostdlib
 
 all: $(KERNEL) kernel.map

+ 5 - 0
Kernel/Process.cpp

@@ -350,6 +350,11 @@ int Process::do_exec(String path, Vector<String> arguments, Vector<String> envir
         bool success = region->page_in();
         ASSERT(success);
     }
+
+#ifdef EXPENSIVE_USERSPACE_STACKS
+    region->page_in();
+#endif
+
     OwnPtr<ELFLoader> loader;
     {
         // Okay, here comes the sleight of hand, pay close attention..

+ 7 - 1
Kernel/Thread.cpp

@@ -1,3 +1,4 @@
+#include <AK/ELF/ELFLoader.h>
 #include <AK/StringBuilder.h>
 #include <Kernel/FileSystem/FileDescription.h>
 #include <Kernel/Process.h>
@@ -570,7 +571,12 @@ String Thread::backtrace(ProcessInspectionHandle&) const
         if (!symbol.address)
             break;
         if (!symbol.ksym) {
-            builder.appendf("%p\n", symbol.address);
+#ifdef EXPENSIVE_USERSPACE_STACKS
+            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());
+            else
+#endif
+                builder.appendf("%p\n", symbol.address);
             continue;
         }
         unsigned offset = symbol.address - symbol.ksym->address;