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

Kernel: Remove some unnecessary leaking of kernel pointers into dmesg

Browse source 
There's a lot more of this and we need to stop printing kernel pointers
anywhere but the debug console.
This commit is contained in:
Andreas Kling 2019-12-31 01:22:00 +01:00
parent 66d5ebafa6
commit 54d182f553
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Devices/BXVGADevice.cpp
View file

@ -96,7 +96,7 @@ KResultOr<Region*> BXVGADevice::mmap(Process& process, FileDescription&, Virtual
0, 0,
"BXVGA Framebuffer", "BXVGA Framebuffer",
prot); prot);
kprintf("BXVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with vaddr V%p\n", dbgprintf("BXVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with vaddr V%p\n",
process.name().characters(), process.pid(), process.name().characters(), process.pid(),
region, region->size(), m_framebuffer_address.as_ptr(), region->vaddr().get()); region, region->size(), m_framebuffer_address.as_ptr(), region->vaddr().get());
ASSERT(region); ASSERT(region);

2
Kernel/Devices/MBVGADevice.cpp
View file

@ -35,7 +35,7 @@ KResultOr<Region*> MBVGADevice::mmap(Process& process, FileDescription&, Virtual
0, 0,
"MBVGA Framebuffer", "MBVGA Framebuffer",
prot); prot);
kprintf("MBVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with vaddr V%p\n", dbgprintf("MBVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with vaddr V%p\n",
process.name().characters(), process.pid(), process.name().characters(), process.pid(),
region, region->size(), m_framebuffer_address.as_ptr(), region->vaddr().get()); region, region->size(), m_framebuffer_address.as_ptr(), region->vaddr().get());
ASSERT(region); ASSERT(region);

13
Kernel/FileSystem/VirtualFileSystem.cpp
View file

@ -2,6 +2,7 @@
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <Kernel/Devices/CharacterDevice.h> #include <Kernel/Devices/CharacterDevice.h>
#include <Kernel/FileSystem/Custody.h> #include <Kernel/FileSystem/Custody.h>
#include <Kernel/FileSystem/DiskBackedFileSystem.h>
#include <Kernel/FileSystem/FileDescription.h> #include <Kernel/FileSystem/FileDescription.h>
#include <Kernel/FileSystem/FileSystem.h> #include <Kernel/FileSystem/FileSystem.h>
#include <Kernel/FileSystem/VirtualFileSystem.h> #include <Kernel/FileSystem/VirtualFileSystem.h>
@ -99,10 +100,14 @@ bool VFS::mount_root(NonnullRefPtr<FS>&& file_system)
} }
m_root_inode = move(root_inode); m_root_inode = move(root_inode);
char device_name[32];
kprintf("VFS: mounted root on %s{%p}\n", if (m_root_inode->fs().is_disk_backed()) {
m_root_inode->fs().class_name(), auto& device = static_cast<DiskBackedFS&>(m_root_inode->fs()).device();
&m_root_inode->fs()); sprintf(device_name, "%d,%d", device.major(), device.minor());
} else {
sprintf(device_name, "not-a-disk");
}
kprintf("VFS: mounted root on %s (%s)\n", m_root_inode->fs().class_name(), device_name);
m_mounts.append(move(mount)); m_mounts.append(move(mount));
return true; return true;

2
Kernel/Thread.cpp
View file

@ -89,7 +89,6 @@ Thread::Thread(Process& process)
m_kernel_stack_base = m_kernel_stack_region->vaddr().get(); m_kernel_stack_base = m_kernel_stack_region->vaddr().get();
m_kernel_stack_top = m_kernel_stack_region->vaddr().offset(default_kernel_stack_size).get() & 0xfffffff8u; m_kernel_stack_top = m_kernel_stack_region->vaddr().offset(default_kernel_stack_size).get() & 0xfffffff8u;
m_tss.esp = m_kernel_stack_top; m_tss.esp = m_kernel_stack_top;
kprintf("Allocated ring0 stack @ %p - %p\n", m_kernel_stack_base, m_kernel_stack_top);
} else { } else {
// Ring3 processes need a separate stack for Ring0. // Ring3 processes need a separate stack for Ring0.
m_kernel_stack_region = MM.allocate_kernel_region(default_kernel_stack_size, String::format("Kernel Stack (Thread %d)", m_tid), Region::Access::Read | Region::Access::Write, false, true); m_kernel_stack_region = MM.allocate_kernel_region(default_kernel_stack_size, String::format("Kernel Stack (Thread %d)", m_tid), Region::Access::Read | Region::Access::Write, false, true);
@ -98,7 +97,6 @@ Thread::Thread(Process& process)
m_kernel_stack_top = m_kernel_stack_region->vaddr().offset(default_kernel_stack_size).get() & 0xfffffff8u; m_kernel_stack_top = m_kernel_stack_region->vaddr().offset(default_kernel_stack_size).get() & 0xfffffff8u;
m_tss.ss0 = 0x10; m_tss.ss0 = 0x10;
m_tss.esp0 = m_kernel_stack_top; m_tss.esp0 = m_kernel_stack_top;
kprintf("Allocated ring0 stack @ %p - %p\n", m_kernel_stack_base, m_kernel_stack_top);
} }
// HACK: Ring2 SS in the TSS is the current PID. // HACK: Ring2 SS in the TSS is the current PID.