mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-23 18:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync on region mutex for thw whole protection

Browse Source 
This is a temporary workarround until a fix is found for the page manager having issues when multiple threads update the same page at the same time.
This commit is contained in:
Lander Gallastegi 2025-06-16 19:06:26 +02:00
parent 40613a643a
commit ba5e0b0759
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/video_core/buffer_cache/region_manager.h
View File

@ -81,14 +81,14 @@ public:
*/ */
template <Type type, bool enable> template <Type type, bool enable>
void ChangeRegionState(u64 dirty_addr, u64 size) noexcept(type == Type::GPU) { void ChangeRegionState(u64 dirty_addr, u64 size) noexcept(type == Type::GPU) {
RENDERER_TRACE;
const size_t offset = dirty_addr - cpu_addr; const size_t offset = dirty_addr - cpu_addr;
const size_t start_page = SanitizeAddress(offset) / BYTES_PER_PAGE; const size_t start_page = SanitizeAddress(offset) / BYTES_PER_PAGE;
const size_t end_page = Common::DivCeil(SanitizeAddress(offset + size), BYTES_PER_PAGE); const size_t end_page = Common::DivCeil(SanitizeAddress(offset + size), BYTES_PER_PAGE);
if (start_page >= NUM_REGION_PAGES || end_page <= start_page) { if (start_page >= NUM_REGION_PAGES || end_page <= start_page) {
return; return;
} }
RENDERER_TRACE; std::scoped_lock lk{lock};
std::unique_lock lk{lock};
static_assert(type != Type::Writeable); static_assert(type != Type::Writeable);
RegionBits& bits = GetRegionBits<type>(); RegionBits& bits = GetRegionBits<type>();
@ -98,7 +98,7 @@ public:
bits.UnsetRange(start_page, end_page); bits.UnsetRange(start_page, end_page);
} }
if constexpr (type == Type::CPU) { if constexpr (type == Type::CPU) {
UpdateProtection<!enable>(std::move(lk)); UpdateProtection<!enable>();
} }
} }
@ -119,7 +119,7 @@ public:
if (start_page >= NUM_REGION_PAGES || end_page <= start_page) { if (start_page >= NUM_REGION_PAGES || end_page <= start_page) {
return; return;
} }
std::unique_lock lk{lock}; std::scoped_lock lk{lock};
static_assert(type != Type::Writeable); static_assert(type != Type::Writeable);
RegionBits& bits = GetRegionBits<type>(); RegionBits& bits = GetRegionBits<type>();
@ -132,7 +132,7 @@ public:
if constexpr (clear) { if constexpr (clear) {
bits.UnsetRange(start_page, end_page); bits.UnsetRange(start_page, end_page);
if constexpr (type == Type::CPU) { if constexpr (type == Type::CPU) {
UpdateProtection<true>(std::move(lk)); UpdateProtection<true>();
} }
} }
} }
@ -169,12 +169,11 @@ private:
* *
* @tparam add_to_tracker True when the tracker should start tracking the new pages * @tparam add_to_tracker True when the tracker should start tracking the new pages
*/ */
template <bool add_to_tracker, typename Lock> template <bool add_to_tracker>
void UpdateProtection(Lock&& lk) { void UpdateProtection() {
RENDERER_TRACE; RENDERER_TRACE;
RegionBits mask = cpu ^ writeable; RegionBits mask = cpu ^ writeable;
writeable = cpu; writeable = cpu;
lk.unlock();
tracker->UpdatePageWatchersMasked<add_to_tracker>(cpu_addr, mask); tracker->UpdatePageWatchersMasked<add_to_tracker>(cpu_addr, mask);
} }