From d0abae890778b2e339002efa94ff19d6ca3bbfd8 Mon Sep 17 00:00:00 2001 From: Liav A Date: Fri, 1 Apr 2022 19:52:22 +0300 Subject: [PATCH] Kernel: Stop debug spam when using mmap on /dev/mem device This is not really useful and quite annoying so let's disable it by default. --- Kernel/Debug.h.in | 4 ++++ Kernel/Devices/MemoryDevice.cpp | 4 +--- Meta/CMake/all_the_debug_macros.cmake | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Kernel/Debug.h.in b/Kernel/Debug.h.in index 06209f9119..7953ef6f9c 100644 --- a/Kernel/Debug.h.in +++ b/Kernel/Debug.h.in @@ -207,6 +207,10 @@ #cmakedefine01 MOUSE_DEBUG #endif +#ifndef MEMORY_DEVICE_DEBUG +#cmakedefine01 MEMORY_DEVICE_DEBUG +#endif + #ifndef MULTIPROCESSOR_DEBUG #cmakedefine01 MULTIPROCESSOR_DEBUG #endif diff --git a/Kernel/Devices/MemoryDevice.cpp b/Kernel/Devices/MemoryDevice.cpp index e22ea8565f..08af5bd8c3 100644 --- a/Kernel/Devices/MemoryDevice.cpp +++ b/Kernel/Devices/MemoryDevice.cpp @@ -57,15 +57,13 @@ ErrorOr MemoryDevice::mmap(Process& process, OpenFileDescriptio // is to be set to the page base of that start address. VERIFY(viewed_address == viewed_address.page_base()); - dbgln("MemoryDevice: Trying to mmap physical memory at {} for range of {} bytes", viewed_address, range.size()); if (!MM.is_allowed_to_read_physical_memory_for_userspace(viewed_address, range.size())) { - dbgln("MemoryDevice: Trying to mmap physical memory at {} for range of {} bytes failed due to violation of access", viewed_address, range.size()); + dbgln_if(MEMORY_DEVICE_DEBUG, "MemoryDevice: Trying to mmap physical memory at {} for range of {} bytes failed due to violation of access", viewed_address, range.size()); return EINVAL; } auto vmobject = TRY(Memory::AnonymousVMObject::try_create_for_physical_range(viewed_address, range.size())); - dbgln("MemoryDevice: Mapped physical memory at {} for range of {} bytes", viewed_address, range.size()); return process.address_space().allocate_region_with_vmobject( range, move(vmobject), diff --git a/Meta/CMake/all_the_debug_macros.cmake b/Meta/CMake/all_the_debug_macros.cmake index c8fc6fe7cc..6f3bcf3350 100644 --- a/Meta/CMake/all_the_debug_macros.cmake +++ b/Meta/CMake/all_the_debug_macros.cmake @@ -117,6 +117,7 @@ set(MATROSKA_DEBUG ON) set(MATROSKA_TRACE_DEBUG ON) set(MASTERPTY_DEBUG ON) set(MBR_DEBUG ON) +set(MEMORY_DEVICE_DEBUG ON) set(MEMORY_DEBUG ON) set(MENU_DEBUG ON) set(MENUS_DEBUG ON)