VERY experimental Nintendo Switch 2 emulator
C++
MemoryManager: Fix race conditions.
Fernando Sahmkowff3cf7c1d96c
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cppindex 01fb5b546d..e06ce5d14e 100644--- a/src/video_core/memory_manager.cpp+++ b/src/video_core/memory_manager.cpp@@ -170,6 +170,7 @@ void MemoryManager::BindRasterizer(VideoCore::RasterizerInterface* rasterizer_)GPUVAddr MemoryManager::Map(GPUVAddr gpu_addr, VAddr cpu_addr, std::size_t size, PTEKind kind,bool is_big_pages) {+ std::unique_lock<std::mutex> lock(guard);if (is_big_pages) [[likely]] {return BigPageTableOp<EntryType::Mapped>(gpu_addr, cpu_addr, size, kind);}@@ -177,6 +178,7 @@ GPUVAddr MemoryManager::Map(GPUVAddr gpu_addr, VAddr cpu_addr, std::size_t size,}GPUVAddr MemoryManager::MapSparse(GPUVAddr gpu_addr, std::size_t size, bool is_big_pages) {+ std::unique_lock<std::mutex> lock(guard);if (is_big_pages) [[likely]] {return BigPageTableOp<EntryType::Reserved>(gpu_addr, 0, size, PTEKind::INVALID);}@@ -187,6 +189,7 @@ void MemoryManager::Unmap(GPUVAddr gpu_addr, std::size_t size) {if (size == 0) {return;}+ std::unique_lock<std::mutex> lock(guard);GetSubmappedRangeImpl<false>(gpu_addr, size, page_stash);for (const auto& [map_addr, map_size] : page_stash) {@@ -553,6 +556,7 @@ size_t MemoryManager::MaxContinuousRange(GPUVAddr gpu_addr, size_t size) const {}size_t MemoryManager::GetMemoryLayoutSize(GPUVAddr gpu_addr, size_t max_size) const {+ std::unique_lock<std::mutex> lock(guard);return kind_map.GetContinuousSizeFrom(gpu_addr);}@@ -745,10 +749,10 @@ void MemoryManager::FlushCaching() {return;}accumulator->Callback([this](GPUVAddr addr, size_t size) {- GetSubmappedRangeImpl<false>(addr, size, page_stash);+ GetSubmappedRangeImpl<false>(addr, size, page_stash2);});- rasterizer->InnerInvalidation(page_stash);- page_stash.clear();+ rasterizer->InnerInvalidation(page_stash2);+ page_stash2.clear();accumulator->Clear();}diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.hindex fbbe856c4f..794535122e 100644--- a/src/video_core/memory_manager.h+++ b/src/video_core/memory_manager.h@@ -5,6 +5,7 @@#include <atomic>#include <map>+#include <mutex>#include <optional>#include <vector>@@ -215,6 +216,9 @@ private:std::vector<u64> big_page_continuous;std::vector<std::pair<VAddr, std::size_t>> page_stash{};+ std::vector<std::pair<VAddr, std::size_t>> page_stash2{};++ mutable std::mutex guard;static constexpr size_t continuous_bits = 64;