Make Vulkan memory allocator actually thread safe (#5575)

* Make Vulkan memory allocator actually thread safe

* Make free thread safe too

* PR feedback

src/Ryujinx.Graphics.Vulkan/MemoryAllocator.cs

@@ -1,6 +1,7 @@
 using Silk.NET.Vulkan;
 using System;
 using System.Collections.Generic;
+using System.Threading;
 
 namespace Ryujinx.Graphics.Vulkan
 {
@@ -13,6 +14,7 @@ namespace Ryujinx.Graphics.Vulkan
         private readonly Device _device;
         private readonly List<MemoryAllocatorBlockList> _blockLists;
         private readonly int _blockAlignment;
+        private readonly ReaderWriterLockSlim _lock;
 
         public MemoryAllocator(Vk api, VulkanPhysicalDevice physicalDevice, Device device)
         {
@@ -21,6 +23,7 @@ namespace Ryujinx.Graphics.Vulkan
             _device = device;
             _blockLists = new List<MemoryAllocatorBlockList>();
             _blockAlignment = (int)Math.Min(int.MaxValue, MaxDeviceMemoryUsageEstimate / _physicalDevice.PhysicalDeviceProperties.Limits.MaxMemoryAllocationCount);
+            _lock = new(LockRecursionPolicy.NoRecursion);
         }
 
         public MemoryAllocation AllocateDeviceMemory(
@@ -39,23 +42,39 @@ namespace Ryujinx.Graphics.Vulkan
         }
 
         private MemoryAllocation Allocate(int memoryTypeIndex, ulong size, ulong alignment, bool map, bool isBuffer)
+        {
+            _lock.EnterReadLock();
+
+            try
             {
                 for (int i = 0; i < _blockLists.Count; i++)
                 {
                     var bl = _blockLists[i];
                     if (bl.MemoryTypeIndex == memoryTypeIndex && bl.ForBuffer == isBuffer)
-                {
-                    lock (bl)
                     {
                         return bl.Allocate(size, alignment, map);
                     }
                 }
             }
+            finally
+            {
+                _lock.ExitReadLock();
+            }
 
+            _lock.EnterWriteLock();
+
+            try
+            {
                 var newBl = new MemoryAllocatorBlockList(_api, _device, memoryTypeIndex, _blockAlignment, isBuffer);
                 _blockLists.Add(newBl);
+
                 return newBl.Allocate(size, alignment, map);
             }
+            finally
+            {
+                _lock.ExitWriteLock();
+            }
+        }
 
         internal int FindSuitableMemoryTypeIndex(
             uint memoryTypeBits,

src/Ryujinx.Graphics.Vulkan/MemoryAllocatorBlockList.cs

@@ -3,6 +3,7 @@ using Silk.NET.Vulkan;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Threading;
 
 namespace Ryujinx.Graphics.Vulkan
 {
@@ -166,6 +167,8 @@ namespace Ryujinx.Graphics.Vulkan
 
         private readonly int _blockAlignment;
 
+        private readonly ReaderWriterLockSlim _lock;
+
         public MemoryAllocatorBlockList(Vk api, Device device, int memoryTypeIndex, int blockAlignment, bool forBuffer)
         {
             _blocks = new List<Block>();
@@ -174,6 +177,7 @@ namespace Ryujinx.Graphics.Vulkan
             MemoryTypeIndex = memoryTypeIndex;
             ForBuffer = forBuffer;
             _blockAlignment = blockAlignment;
+            _lock = new(LockRecursionPolicy.NoRecursion);
         }
 
         public unsafe MemoryAllocation Allocate(ulong size, ulong alignment, bool map)
@@ -184,6 +188,10 @@ namespace Ryujinx.Graphics.Vulkan
                 throw new ArgumentOutOfRangeException(nameof(alignment), $"Invalid alignment 0x{alignment:X}.");
             }
 
+            _lock.EnterReadLock();
+
+            try
+            {
                 for (int i = 0; i < _blocks.Count; i++)
                 {
                     var block = _blocks[i];
@@ -197,6 +205,11 @@ namespace Ryujinx.Graphics.Vulkan
                         }
                     }
                 }
+            }
+            finally
+            {
+                _lock.ExitReadLock();
+            }
 
             ulong blockAlignedSize = BitUtils.AlignUp(size, (ulong)_blockAlignment);
 
@@ -243,6 +256,10 @@ namespace Ryujinx.Graphics.Vulkan
             block.Free(offset, size);
 
             if (block.IsTotallyFree())
+            {
+                _lock.EnterWriteLock();
+
+                try
                 {
                     for (int i = 0; i < _blocks.Count; i++)
                     {
@@ -252,12 +269,21 @@ namespace Ryujinx.Graphics.Vulkan
                             break;
                         }
                     }
+                }
+                finally
+                {
+                    _lock.ExitWriteLock();
+                }
 
                 block.Destroy(_api, _device);
             }
         }
 
         private void InsertBlock(Block block)
+        {
+            _lock.EnterWriteLock();
+
+            try
             {
                 int index = _blocks.BinarySearch(block);
                 if (index < 0)
@@ -267,6 +293,11 @@ namespace Ryujinx.Graphics.Vulkan
 
                 _blocks.Insert(index, block);
             }
+            finally
+            {
+                _lock.ExitWriteLock();
+            }
+        }
 
         public void Dispose()
         {