RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 08:28:11 +00:00
Code Issues Activity Actions

Userland: Use /proc/kernel_base to determine the kernel base address

Browse source 
This removes all the hard-coded kernel base addresses from userspace
tools.

One downside for this is that e.g. Profiler no longer uses a different
color for kernel symbols when run as a non-root user.
This commit is contained in:
Gunnar Beutner 2021-07-22 18:41:52 +02:00 • committed by Andreas Kling
parent 6115258a5c
commit 60d6137e73
9 changed files with 63 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Userland/Libraries/LibSymbolication/Symbolication.cpp
View file

@ -21,6 +21,42 @@ struct CachedELF {
static HashMap<String, OwnPtr<CachedELF>> s_cache;
enum class KernelBaseState {
Uninitialized,
Valid,
Invalid,
};
static FlatPtr s_kernel_base;
static KernelBaseState s_kernel_base_state = KernelBaseState::Uninitialized;
Optional<FlatPtr> kernel_base()
{
if (s_kernel_base_state == KernelBaseState::Uninitialized) {
auto file = Core::File::open("/proc/kernel_base", Core::OpenMode::ReadOnly);
if (file.is_error()) {
s_kernel_base_state = KernelBaseState::Invalid;
return {};
}
auto kernel_base_str = String { file.value()->read_all(), NoChomp };
#if ARCH(I386)
using AddressType = u32;
#else
using AddressType = u64;
#endif
auto maybe_kernel_base = kernel_base_str.to_uint<AddressType>();
if (!maybe_kernel_base.has_value()) {
s_kernel_base_state = KernelBaseState::Invalid;
return {};
}
s_kernel_base = maybe_kernel_base.value();
s_kernel_base_state = KernelBaseState::Valid;
}
if (s_kernel_base_state == KernelBaseState::Invalid)
return {};
return s_kernel_base;
}
Optional<Symbol> symbolicate(String const& path, FlatPtr address)
{
if (!s_cache.contains(path)) {
@ -81,16 +117,14 @@ Vector<Symbol> symbolicate_thread(pid_t pid, pid_t tid)
Vector<FlatPtr> stack;
Vector<RegionWithSymbols> regions;
regions.append(RegionWithSymbols {
// FIXME: Use /proc for this
#if ARCH(I386)
.base = 0xc0000000,
#else
.base = 0x2000000000,
#endif
.size = 0x3fffffff,
.path = "/boot/Kernel.debug",
.is_relative = false });
if (auto maybe_kernel_base = kernel_base(); maybe_kernel_base.has_value()) {
regions.append(RegionWithSymbols {
.base = maybe_kernel_base.value(),
.size = 0x3fffffff,
.path = "/boot/Kernel.debug",
.is_relative = false,
});
}
{
auto stack_path = String::formatted("/proc/{}/stacks/{}", pid, tid);