diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 999b380595..fd6ba42312 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -66,8 +66,6 @@ add_library( fs/path_util.cpp fs/path_util.h hash.h - heap_tracker.cpp - heap_tracker.h hex_util.cpp hex_util.h host_memory.cpp diff --git a/src/common/heap_tracker.cpp b/src/common/heap_tracker.cpp deleted file mode 100644 index a99d386d8a..0000000000 --- a/src/common/heap_tracker.cpp +++ /dev/null @@ -1,282 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project -// SPDX-License-Identifier: GPL-3.0-or-later - -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include -#include "common/heap_tracker.h" -#include "common/logging/log.h" -#include "common/assert.h" - -namespace Common { - -namespace { - -s64 GetMaxPermissibleResidentMapCount() { - // Default value. - s64 value = 65530; - - // Try to read how many mappings we can make. - std::ifstream s("/proc/sys/vm/max_map_count"); - s >> value; - - // Print, for debug. - LOG_INFO(HW_Memory, "Current maximum map count: {}", value); - - // Allow 20000 maps for other code and to account for split inaccuracy. - return std::max(value - 20000, 0); -} - -} // namespace - -HeapTracker::HeapTracker(Common::HostMemory& buffer) - : m_buffer(buffer), m_max_resident_map_count(GetMaxPermissibleResidentMapCount()) {} -HeapTracker::~HeapTracker() = default; - -void HeapTracker::Map(size_t virtual_offset, size_t host_offset, size_t length, - MemoryPermission perm, bool is_separate_heap) { - // When mapping other memory, map pages immediately. - if (!is_separate_heap) { - m_buffer.Map(virtual_offset, host_offset, length, perm, false); - return; - } - - { - // We are mapping part of a separate heap. - std::scoped_lock lk{m_lock}; - - auto* const map = new SeparateHeapMap{ - .vaddr = virtual_offset, - .paddr = host_offset, - .size = length, - .tick = m_tick++, - .perm = perm, - .is_resident = false, - }; - - // Insert into mappings. - m_map_count++; - m_mappings.insert(*map); - } - - // Finally, map. - this->DeferredMapSeparateHeap(virtual_offset); -} - -void HeapTracker::Unmap(size_t virtual_offset, size_t size, bool is_separate_heap) { - // If this is a separate heap... - if (is_separate_heap) { - std::scoped_lock lk{m_lock}; - - const SeparateHeapMap key{ - .vaddr = virtual_offset, - }; - - // Split at the boundaries of the region we are removing. - this->SplitHeapMapLocked(virtual_offset); - this->SplitHeapMapLocked(virtual_offset + size); - - // Erase all mappings in range. - auto it = m_mappings.find(key); - while (it != m_mappings.end() && it->vaddr < virtual_offset + size) { - // Get underlying item. - auto* const item = std::addressof(*it); - - // If resident, erase from resident map. - if (item->is_resident) { - ASSERT(--m_resident_map_count >= 0); - m_resident_mappings.erase(m_resident_mappings.iterator_to(*item)); - } - - // Erase from map. - ASSERT(--m_map_count >= 0); - it = m_mappings.erase(it); - - // Free the item. - delete item; - } - } - - // Unmap pages. - m_buffer.Unmap(virtual_offset, size, false); -} - -void HeapTracker::Protect(size_t virtual_offset, size_t size, MemoryPermission perm) { - // Ensure no rebuild occurs while reprotecting. - std::shared_lock lk{m_rebuild_lock}; - - // Split at the boundaries of the region we are reprotecting. - this->SplitHeapMap(virtual_offset, size); - - // Declare tracking variables. - const VAddr end = virtual_offset + size; - VAddr cur = virtual_offset; - - while (cur < end) { - VAddr next = cur; - bool should_protect = false; - - { - std::scoped_lock lk2{m_lock}; - - const SeparateHeapMap key{ - .vaddr = next, - }; - - // Try to get the next mapping corresponding to this address. - const auto it = m_mappings.nfind(key); - - if (it == m_mappings.end()) { - // There are no separate heap mappings remaining. - next = end; - should_protect = true; - } else if (it->vaddr == cur) { - // We are in range. - // Update permission bits. - it->perm = perm; - - // Determine next address and whether we should protect. - next = cur + it->size; - should_protect = it->is_resident; - } else /* if (it->vaddr > cur) */ { - // We weren't in range, but there is a block coming up that will be. - next = it->vaddr; - should_protect = true; - } - } - - // Clamp to end. - next = (std::min)(next, end); - // Reprotect, if we need to. - if (should_protect) { - m_buffer.Protect(cur, next - cur, perm); - } - - // Advance. - cur = next; - } -} - -bool HeapTracker::DeferredMapSeparateHeap(u8* fault_address) { - if (m_buffer.IsInVirtualRange(fault_address)) { - return this->DeferredMapSeparateHeap(fault_address - m_buffer.VirtualBasePointer()); - } - - return false; -} - -bool HeapTracker::DeferredMapSeparateHeap(size_t virtual_offset) { - bool rebuild_required = false; - - { - std::scoped_lock lk{m_lock}; - - // Check to ensure this was a non-resident separate heap mapping. - const auto it = this->GetNearestHeapMapLocked(virtual_offset); - if (it == m_mappings.end() || it->is_resident) { - return false; - } - - // Update tick before possible rebuild. - it->tick = m_tick++; - - // Check if we need to rebuild. - if (m_resident_map_count > m_max_resident_map_count) { - rebuild_required = true; - } - - // Map the area. - m_buffer.Map(it->vaddr, it->paddr, it->size, it->perm, false); - - // This map is now resident. - it->is_resident = true; - m_resident_map_count++; - m_resident_mappings.insert(*it); - } - - if (rebuild_required) { - // A rebuild was required, so perform it now. - this->RebuildSeparateHeapAddressSpace(); - } - - return true; -} - -void HeapTracker::RebuildSeparateHeapAddressSpace() { - std::scoped_lock lk{m_rebuild_lock, m_lock}; - - ASSERT(!m_resident_mappings.empty()); - - // Dump half of the mappings. - // - // Despite being worse in theory, this has proven to be better in practice than more - // regularly dumping a smaller amount, because it significantly reduces average case - // lock contention. - std::size_t const desired_count = (std::min)(m_resident_map_count, m_max_resident_map_count) / 2; - std::size_t const evict_count = m_resident_map_count - desired_count; - auto it = m_resident_mappings.begin(); - - for (size_t i = 0; i < evict_count && it != m_resident_mappings.end(); i++) { - // Unmark and unmap. - it->is_resident = false; - m_buffer.Unmap(it->vaddr, it->size, false); - - // Advance. - ASSERT(--m_resident_map_count >= 0); - it = m_resident_mappings.erase(it); - } -} - -void HeapTracker::SplitHeapMap(VAddr offset, size_t size) { - std::scoped_lock lk{m_lock}; - - this->SplitHeapMapLocked(offset); - this->SplitHeapMapLocked(offset + size); -} - -void HeapTracker::SplitHeapMapLocked(VAddr offset) { - const auto it = this->GetNearestHeapMapLocked(offset); - if (it == m_mappings.end() || it->vaddr == offset) { - // Not contained or no split required. - return; - } - - // Cache the original values. - auto* const left = std::addressof(*it); - const size_t orig_size = left->size; - - // Adjust the left map. - const size_t left_size = offset - left->vaddr; - left->size = left_size; - - // Create the new right map. - auto* const right = new SeparateHeapMap{ - .vaddr = left->vaddr + left_size, - .paddr = left->paddr + left_size, - .size = orig_size - left_size, - .tick = left->tick, - .perm = left->perm, - .is_resident = left->is_resident, - }; - - // Insert the new right map. - m_map_count++; - m_mappings.insert(*right); - - // If resident, also insert into resident map. - if (right->is_resident) { - m_resident_map_count++; - m_resident_mappings.insert(*right); - } -} - -HeapTracker::AddrTree::iterator HeapTracker::GetNearestHeapMapLocked(VAddr offset) { - const SeparateHeapMap key{ - .vaddr = offset, - }; - - return m_mappings.find(key); -} - -} // namespace Common diff --git a/src/common/heap_tracker.h b/src/common/heap_tracker.h deleted file mode 100644 index ee5b0bf43a..0000000000 --- a/src/common/heap_tracker.h +++ /dev/null @@ -1,98 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include -#include -#include -#include - -#include "common/host_memory.h" -#include "common/intrusive_red_black_tree.h" - -namespace Common { - -struct SeparateHeapMap { - Common::IntrusiveRedBlackTreeNode addr_node{}; - Common::IntrusiveRedBlackTreeNode tick_node{}; - VAddr vaddr{}; - PAddr paddr{}; - size_t size{}; - size_t tick{}; - MemoryPermission perm{}; - bool is_resident{}; -}; - -struct SeparateHeapMapAddrComparator { - static constexpr int Compare(const SeparateHeapMap& lhs, const SeparateHeapMap& rhs) { - if (lhs.vaddr < rhs.vaddr) { - return -1; - } else if (lhs.vaddr <= (rhs.vaddr + rhs.size - 1)) { - return 0; - } else { - return 1; - } - } -}; - -struct SeparateHeapMapTickComparator { - static constexpr int Compare(const SeparateHeapMap& lhs, const SeparateHeapMap& rhs) { - if (lhs.tick < rhs.tick) { - return -1; - } else if (lhs.tick > rhs.tick) { - return 1; - } else { - return SeparateHeapMapAddrComparator::Compare(lhs, rhs); - } - } -}; - -class HeapTracker { -public: - explicit HeapTracker(Common::HostMemory& buffer); - ~HeapTracker(); - - void Map(size_t virtual_offset, size_t host_offset, size_t length, MemoryPermission perm, - bool is_separate_heap); - void Unmap(size_t virtual_offset, size_t size, bool is_separate_heap); - void Protect(size_t virtual_offset, size_t length, MemoryPermission perm); - u8* VirtualBasePointer() { - return m_buffer.VirtualBasePointer(); - } - - bool DeferredMapSeparateHeap(u8* fault_address); - bool DeferredMapSeparateHeap(size_t virtual_offset); - -private: - using AddrTreeTraits = - Common::IntrusiveRedBlackTreeMemberTraitsDeferredAssert<&SeparateHeapMap::addr_node>; - using AddrTree = AddrTreeTraits::TreeType; - - using TickTreeTraits = - Common::IntrusiveRedBlackTreeMemberTraitsDeferredAssert<&SeparateHeapMap::tick_node>; - using TickTree = TickTreeTraits::TreeType; - - AddrTree m_mappings{}; - TickTree m_resident_mappings{}; - -private: - void SplitHeapMap(VAddr offset, size_t size); - void SplitHeapMapLocked(VAddr offset); - - AddrTree::iterator GetNearestHeapMapLocked(VAddr offset); - - void RebuildSeparateHeapAddressSpace(); - -private: - Common::HostMemory& m_buffer; - const s64 m_max_resident_map_count; - - std::shared_mutex m_rebuild_lock{}; - std::mutex m_lock{}; - s64 m_map_count{}; - s64 m_resident_map_count{}; - size_t m_tick{}; -}; - -} // namespace Common diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 2583aae867..6ce6836146 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -15,7 +15,6 @@ #include "common/assert.h" #include "common/atomic_ops.h" #include "common/common_types.h" -#include "common/heap_tracker.h" #include "common/logging/log.h" #include "common/page_table.h" #include "common/scope_exit.h" @@ -59,13 +58,7 @@ struct Memory::Impl { } else { current_page_table->fastmem_arena = nullptr; } - -#ifdef __linux__ - heap_tracker.emplace(system.DeviceMemory().buffer); - buffer = std::addressof(*heap_tracker); -#else buffer = std::addressof(system.DeviceMemory().buffer); -#endif } void MapMemoryRegion(Common::PageTable& page_table, Common::ProcessAddress base, u64 size, @@ -1023,13 +1016,7 @@ struct Memory::Impl { std::array, Core::Hardware::NUM_CPU_CORES> scratch_buffers{}; std::span gpu_dirty_managers; std::mutex sys_core_guard; - - std::optional heap_tracker; -#ifdef __linux__ - Common::HeapTracker* buffer{}; -#else Common::HostMemory* buffer{}; -#endif }; Memory::Memory(Core::System& system_) : system{system_} { @@ -1230,22 +1217,11 @@ bool Memory::InvalidateNCE(Common::ProcessAddress vaddr, size_t size) { if (rasterizer) { impl->InvalidateGPUMemory(ptr, size); } - -#ifdef __linux__ - if (!rasterizer && mapped) { - impl->buffer->DeferredMapSeparateHeap(GetInteger(vaddr)); - } -#endif - return mapped && ptr != nullptr; } bool Memory::InvalidateSeparateHeap(void* fault_address) { -#ifdef __linux__ - return impl->buffer->DeferredMapSeparateHeap(static_cast(fault_address)); -#else return false; -#endif } } // namespace Core::Memory