diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2022-06-23 21:53:16 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-24 02:53:16 +0200 |
| commit | 232b1012b0c981830ac46bd5024dcc0e35075301 (patch) | |
| tree | 6f8fb1136e3eaf5a472e67c969ef69d27975e259 | |
| parent | e747f5cd836b73661414134b182fc50121e56865 (diff) | |
Fix ThreadingLock deadlock on invalid access and TerminateProcess (#3407)1.1.155
| -rw-r--r-- | Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs | 4 | ||||
| -rw-r--r-- | Ryujinx.Memory/Tracking/MemoryTracking.cs | 49 |
2 files changed, 33 insertions, 20 deletions
diff --git a/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs b/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs index d01c3e3b..4c95821c 100644 --- a/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs +++ b/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs @@ -966,6 +966,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Process SignalExitToDebugExited(); SignalExit(); } + + KernelStatic.GetCurrentThread().Exit(); } private void UnpauseAndTerminateAllThreadsExcept(KThread currentThread) @@ -981,7 +983,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process foreach (KThread thread in _threads) { - if ((thread.SchedFlags & ThreadSchedState.LowMask) != ThreadSchedState.TerminationPending) + if (thread != currentThread && (thread.SchedFlags & ThreadSchedState.LowMask) != ThreadSchedState.TerminationPending) { thread.PrepareForTermination(); } diff --git a/Ryujinx.Memory/Tracking/MemoryTracking.cs b/Ryujinx.Memory/Tracking/MemoryTracking.cs index e9a4793e..c5abb576 100644 --- a/Ryujinx.Memory/Tracking/MemoryTracking.cs +++ b/Ryujinx.Memory/Tracking/MemoryTracking.cs @@ -227,6 +227,8 @@ namespace Ryujinx.Memory.Tracking // Look up the virtual region using the region list. // Signal up the chain to relevant handles. + bool shouldThrow = false; + lock (TrackingLock) { ref var overlaps = ref ThreadStaticArray<VirtualRegion>.Get(); @@ -235,34 +237,43 @@ namespace Ryujinx.Memory.Tracking if (count == 0 && !precise) { - if (!_memoryManager.IsMapped(address)) + if (_memoryManager.IsMapped(address)) { - _invalidAccessHandler?.Invoke(address); - - // We can't continue - it's impossible to remove protection from the page. - // Even if the access handler wants us to continue, we wouldn't be able to. - throw new InvalidMemoryRegionException(); + _memoryManager.TrackingReprotect(address & ~(ulong)(_pageSize - 1), (ulong)_pageSize, MemoryPermission.ReadAndWrite); + return false; // We can't handle this - it's probably a real invalid access. } - - _memoryManager.TrackingReprotect(address & ~(ulong)(_pageSize - 1), (ulong)_pageSize, MemoryPermission.ReadAndWrite); - return false; // We can't handle this - it's probably a real invalid access. - } - - for (int i = 0; i < count; i++) - { - VirtualRegion region = overlaps[i]; - - if (precise) + else { - region.SignalPrecise(address, size, write); + shouldThrow = true; } - else + } + else + { + for (int i = 0; i < count; i++) { - region.Signal(address, size, write); + VirtualRegion region = overlaps[i]; + + if (precise) + { + region.SignalPrecise(address, size, write); + } + else + { + region.Signal(address, size, write); + } } } } + if (shouldThrow) + { + _invalidAccessHandler?.Invoke(address); + + // We can't continue - it's impossible to remove protection from the page. + // Even if the access handler wants us to continue, we wouldn't be able to. + throw new InvalidMemoryRegionException(); + } + return true; } |