Support memory aliasing (#2954)
* Back to the origins: Make memory manager take guest PA rather than host address once again * Direct mapping with alias support on Windows * Fixes and remove more of the emulated shared memory * Linux support * Make shared and transfer memory not depend on SharedMemoryStorage * More efficient view mapping on Windows (no more restricted to 4KB pages at a time) * Handle potential access violations caused by partial unmap * Implement host mapping using shared memory on Linux * Add new GetPhysicalAddressChecked method, used to ensure the virtual address is mapped before address translation Also align GetRef behaviour with software memory manager * We don't need a mirrorable memory block for software memory manager mode * Disable memory aliasing tests while we don't have shared memory support on Mac * Shared memory & SIGBUS handler for macOS * Fix typo + nits + re-enable memory tests * Set MAP_JIT_DARWIN on x86 Mac too * Add back the address space mirror * Only set MAP_JIT_DARWIN if we are mapping as executable * Disable aliasing tests again (still fails on Mac) * Fix UnmapView4KB (by not casting size to int) * Use ref counting on memory blocks to delay closing the shared memory handle until all blocks using it are disposed * Address PR feedback * Make RO hold a reference to the guest process memory manager to avoid early disposal Co-authored-by: nastys <nastys@users.noreply.github.com>
This commit is contained in:
gdkchan
GitHub
parent
4a892fbdc9
commit
95017b8c66
41 changed files with 2373 additions and 2155 deletions
|
|
@ -1,7 +1,5 @@
|
|||
using Ryujinx.Memory.WindowsShared;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Runtime.Versioning;
|
||||
|
||||
namespace Ryujinx.Memory
|
||||
|
|
@ -9,74 +7,42 @@ namespace Ryujinx.Memory
|
|||
[SupportedOSPlatform("windows")]
|
||||
static class MemoryManagementWindows
|
||||
{
|
||||
private static readonly IntPtr InvalidHandleValue = new IntPtr(-1);
|
||||
private static bool UseWin10Placeholders;
|
||||
private const int PageSize = 0x1000;
|
||||
|
||||
private static object _emulatedHandleLock = new object();
|
||||
private static EmulatedSharedMemoryWindows[] _emulatedShared = new EmulatedSharedMemoryWindows[64];
|
||||
private static List<EmulatedSharedMemoryWindows> _emulatedSharedList = new List<EmulatedSharedMemoryWindows>();
|
||||
|
||||
[DllImport("kernel32.dll", SetLastError = true)]
|
||||
private static extern IntPtr VirtualAlloc(
|
||||
IntPtr lpAddress,
|
||||
IntPtr dwSize,
|
||||
AllocationType flAllocationType,
|
||||
MemoryProtection flProtect);
|
||||
|
||||
[DllImport("kernel32.dll", SetLastError = true)]
|
||||
private static extern bool VirtualProtect(
|
||||
IntPtr lpAddress,
|
||||
IntPtr dwSize,
|
||||
MemoryProtection flNewProtect,
|
||||
out MemoryProtection lpflOldProtect);
|
||||
|
||||
[DllImport("kernel32.dll", SetLastError = true)]
|
||||
private static extern bool VirtualFree(IntPtr lpAddress, IntPtr dwSize, AllocationType dwFreeType);
|
||||
|
||||
[DllImport("kernel32.dll", SetLastError = true)]
|
||||
private static extern IntPtr CreateFileMapping(
|
||||
IntPtr hFile,
|
||||
IntPtr lpFileMappingAttributes,
|
||||
FileMapProtection flProtect,
|
||||
uint dwMaximumSizeHigh,
|
||||
uint dwMaximumSizeLow,
|
||||
[MarshalAs(UnmanagedType.LPWStr)] string lpName);
|
||||
|
||||
[DllImport("kernel32.dll", SetLastError = true)]
|
||||
private static extern bool CloseHandle(IntPtr hObject);
|
||||
|
||||
[DllImport("kernel32.dll", SetLastError = true)]
|
||||
private static extern IntPtr MapViewOfFile(
|
||||
IntPtr hFileMappingObject,
|
||||
uint dwDesiredAccess,
|
||||
uint dwFileOffsetHigh,
|
||||
uint dwFileOffsetLow,
|
||||
IntPtr dwNumberOfBytesToMap);
|
||||
|
||||
[DllImport("kernel32.dll", SetLastError = true)]
|
||||
private static extern bool UnmapViewOfFile(IntPtr lpBaseAddress);
|
||||
|
||||
[DllImport("kernel32.dll", SetLastError = true)]
|
||||
private static extern uint GetLastError();
|
||||
|
||||
static MemoryManagementWindows()
|
||||
{
|
||||
UseWin10Placeholders = OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17134);
|
||||
}
|
||||
private static readonly PlaceholderManager _placeholders = new PlaceholderManager();
|
||||
|
||||
public static IntPtr Allocate(IntPtr size)
|
||||
{
|
||||
return AllocateInternal(size, AllocationType.Reserve | AllocationType.Commit);
|
||||
}
|
||||
|
||||
public static IntPtr Reserve(IntPtr size)
|
||||
public static IntPtr Reserve(IntPtr size, bool viewCompatible)
|
||||
{
|
||||
if (viewCompatible)
|
||||
{
|
||||
IntPtr baseAddress = AllocateInternal2(size, AllocationType.Reserve | AllocationType.ReservePlaceholder);
|
||||
_placeholders.ReserveRange((ulong)baseAddress, (ulong)size);
|
||||
return baseAddress;
|
||||
}
|
||||
|
||||
return AllocateInternal(size, AllocationType.Reserve);
|
||||
}
|
||||
|
||||
private static IntPtr AllocateInternal(IntPtr size, AllocationType flags = 0)
|
||||
{
|
||||
IntPtr ptr = VirtualAlloc(IntPtr.Zero, size, flags, MemoryProtection.ReadWrite);
|
||||
IntPtr ptr = WindowsApi.VirtualAlloc(IntPtr.Zero, size, flags, MemoryProtection.ReadWrite);
|
||||
|
||||
if (ptr == IntPtr.Zero)
|
||||
{
|
||||
throw new OutOfMemoryException();
|
||||
}
|
||||
|
||||
return ptr;
|
||||
}
|
||||
|
||||
private static IntPtr AllocateInternal2(IntPtr size, AllocationType flags = 0)
|
||||
{
|
||||
IntPtr ptr = WindowsApi.VirtualAlloc2(WindowsApi.CurrentProcessHandle, IntPtr.Zero, size, flags, MemoryProtection.NoAccess, IntPtr.Zero, 0);
|
||||
|
||||
if (ptr == IntPtr.Zero)
|
||||
{
|
||||
|
|
@ -88,164 +54,131 @@ namespace Ryujinx.Memory
|
|||
|
||||
public static bool Commit(IntPtr location, IntPtr size)
|
||||
{
|
||||
if (UseWin10Placeholders)
|
||||
{
|
||||
lock (_emulatedSharedList)
|
||||
{
|
||||
foreach (var shared in _emulatedSharedList)
|
||||
{
|
||||
if (shared.CommitMap(location, size))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return VirtualAlloc(location, size, AllocationType.Commit, MemoryProtection.ReadWrite) != IntPtr.Zero;
|
||||
return WindowsApi.VirtualAlloc(location, size, AllocationType.Commit, MemoryProtection.ReadWrite) != IntPtr.Zero;
|
||||
}
|
||||
|
||||
public static bool Decommit(IntPtr location, IntPtr size)
|
||||
{
|
||||
if (UseWin10Placeholders)
|
||||
{
|
||||
lock (_emulatedSharedList)
|
||||
{
|
||||
foreach (var shared in _emulatedSharedList)
|
||||
{
|
||||
if (shared.DecommitMap(location, size))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return VirtualFree(location, size, AllocationType.Decommit);
|
||||
return WindowsApi.VirtualFree(location, size, AllocationType.Decommit);
|
||||
}
|
||||
|
||||
public static bool Reprotect(IntPtr address, IntPtr size, MemoryPermission permission)
|
||||
public static void MapView(IntPtr sharedMemory, ulong srcOffset, IntPtr location, IntPtr size)
|
||||
{
|
||||
if (UseWin10Placeholders)
|
||||
_placeholders.MapView(sharedMemory, srcOffset, location, size);
|
||||
}
|
||||
|
||||
public static void MapView4KB(IntPtr sharedMemory, ulong srcOffset, IntPtr location, IntPtr size)
|
||||
{
|
||||
ulong uaddress = (ulong)location;
|
||||
ulong usize = (ulong)size;
|
||||
IntPtr endLocation = (IntPtr)(uaddress + usize);
|
||||
|
||||
while (location != endLocation)
|
||||
{
|
||||
ulong uaddress = (ulong)address;
|
||||
ulong usize = (ulong)size;
|
||||
while (usize > 0)
|
||||
WindowsApi.VirtualFree(location, (IntPtr)PageSize, AllocationType.Release | AllocationType.PreservePlaceholder);
|
||||
|
||||
var ptr = WindowsApi.MapViewOfFile3(
|
||||
sharedMemory,
|
||||
WindowsApi.CurrentProcessHandle,
|
||||
location,
|
||||
srcOffset,
|
||||
(IntPtr)PageSize,
|
||||
0x4000,
|
||||
MemoryProtection.ReadWrite,
|
||||
IntPtr.Zero,
|
||||
0);
|
||||
|
||||
if (ptr == IntPtr.Zero)
|
||||
{
|
||||
ulong nextGranular = (uaddress & ~EmulatedSharedMemoryWindows.MappingMask) + EmulatedSharedMemoryWindows.MappingGranularity;
|
||||
ulong mapSize = Math.Min(usize, nextGranular - uaddress);
|
||||
|
||||
if (!VirtualProtect((IntPtr)uaddress, (IntPtr)mapSize, GetProtection(permission), out _))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
uaddress = nextGranular;
|
||||
usize -= mapSize;
|
||||
throw new WindowsApiException("MapViewOfFile3");
|
||||
}
|
||||
|
||||
return true;
|
||||
location += PageSize;
|
||||
srcOffset += PageSize;
|
||||
}
|
||||
}
|
||||
|
||||
public static void UnmapView(IntPtr sharedMemory, IntPtr location, IntPtr size)
|
||||
{
|
||||
_placeholders.UnmapView(sharedMemory, location, size);
|
||||
}
|
||||
|
||||
public static void UnmapView4KB(IntPtr location, IntPtr size)
|
||||
{
|
||||
ulong uaddress = (ulong)location;
|
||||
ulong usize = (ulong)size;
|
||||
IntPtr endLocation = (IntPtr)(uaddress + usize);
|
||||
|
||||
while (location != endLocation)
|
||||
{
|
||||
bool result = WindowsApi.UnmapViewOfFile2(WindowsApi.CurrentProcessHandle, location, 2);
|
||||
if (!result)
|
||||
{
|
||||
throw new WindowsApiException("UnmapViewOfFile2");
|
||||
}
|
||||
|
||||
location += PageSize;
|
||||
}
|
||||
}
|
||||
|
||||
public static bool Reprotect(IntPtr address, IntPtr size, MemoryPermission permission, bool forView)
|
||||
{
|
||||
if (forView)
|
||||
{
|
||||
return _placeholders.ReprotectView(address, size, permission);
|
||||
}
|
||||
else
|
||||
{
|
||||
return VirtualProtect(address, size, GetProtection(permission), out _);
|
||||
return WindowsApi.VirtualProtect(address, size, WindowsApi.GetProtection(permission), out _);
|
||||
}
|
||||
}
|
||||
|
||||
private static MemoryProtection GetProtection(MemoryPermission permission)
|
||||
public static bool Reprotect4KB(IntPtr address, IntPtr size, MemoryPermission permission, bool forView)
|
||||
{
|
||||
return permission switch
|
||||
ulong uaddress = (ulong)address;
|
||||
ulong usize = (ulong)size;
|
||||
while (usize > 0)
|
||||
{
|
||||
MemoryPermission.None => MemoryProtection.NoAccess,
|
||||
MemoryPermission.Read => MemoryProtection.ReadOnly,
|
||||
MemoryPermission.ReadAndWrite => MemoryProtection.ReadWrite,
|
||||
MemoryPermission.ReadAndExecute => MemoryProtection.ExecuteRead,
|
||||
MemoryPermission.ReadWriteExecute => MemoryProtection.ExecuteReadWrite,
|
||||
MemoryPermission.Execute => MemoryProtection.Execute,
|
||||
_ => throw new MemoryProtectionException(permission)
|
||||
};
|
||||
if (!WindowsApi.VirtualProtect((IntPtr)uaddress, (IntPtr)PageSize, WindowsApi.GetProtection(permission), out _))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
uaddress += PageSize;
|
||||
usize -= PageSize;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public static bool Free(IntPtr address)
|
||||
{
|
||||
return VirtualFree(address, IntPtr.Zero, AllocationType.Release);
|
||||
}
|
||||
|
||||
private static int GetEmulatedHandle()
|
||||
{
|
||||
// Assumes we have the handle lock.
|
||||
|
||||
for (int i = 0; i < _emulatedShared.Length; i++)
|
||||
{
|
||||
if (_emulatedShared[i] == null)
|
||||
{
|
||||
return i + 1;
|
||||
}
|
||||
}
|
||||
|
||||
throw new InvalidProgramException("Too many shared memory handles were created.");
|
||||
}
|
||||
|
||||
public static bool EmulatedHandleValid(ref int handle)
|
||||
{
|
||||
handle--;
|
||||
return handle >= 0 && handle < _emulatedShared.Length && _emulatedShared[handle] != null;
|
||||
return WindowsApi.VirtualFree(address, IntPtr.Zero, AllocationType.Release);
|
||||
}
|
||||
|
||||
public static IntPtr CreateSharedMemory(IntPtr size, bool reserve)
|
||||
{
|
||||
if (UseWin10Placeholders && reserve)
|
||||
var prot = reserve ? FileMapProtection.SectionReserve : FileMapProtection.SectionCommit;
|
||||
|
||||
IntPtr handle = WindowsApi.CreateFileMapping(
|
||||
WindowsApi.InvalidHandleValue,
|
||||
IntPtr.Zero,
|
||||
FileMapProtection.PageReadWrite | prot,
|
||||
(uint)(size.ToInt64() >> 32),
|
||||
(uint)size.ToInt64(),
|
||||
null);
|
||||
|
||||
if (handle == IntPtr.Zero)
|
||||
{
|
||||
lock (_emulatedHandleLock)
|
||||
{
|
||||
int handle = GetEmulatedHandle();
|
||||
_emulatedShared[handle - 1] = new EmulatedSharedMemoryWindows((ulong)size);
|
||||
_emulatedSharedList.Add(_emulatedShared[handle - 1]);
|
||||
|
||||
return (IntPtr)handle;
|
||||
}
|
||||
throw new OutOfMemoryException();
|
||||
}
|
||||
else
|
||||
{
|
||||
var prot = reserve ? FileMapProtection.SectionReserve : FileMapProtection.SectionCommit;
|
||||
|
||||
IntPtr handle = CreateFileMapping(
|
||||
InvalidHandleValue,
|
||||
IntPtr.Zero,
|
||||
FileMapProtection.PageReadWrite | prot,
|
||||
(uint)(size.ToInt64() >> 32),
|
||||
(uint)size.ToInt64(),
|
||||
null);
|
||||
|
||||
if (handle == IntPtr.Zero)
|
||||
{
|
||||
throw new OutOfMemoryException();
|
||||
}
|
||||
|
||||
return handle;
|
||||
}
|
||||
return handle;
|
||||
}
|
||||
|
||||
public static void DestroySharedMemory(IntPtr handle)
|
||||
{
|
||||
if (UseWin10Placeholders)
|
||||
{
|
||||
lock (_emulatedHandleLock)
|
||||
{
|
||||
int iHandle = (int)(ulong)handle;
|
||||
|
||||
if (EmulatedHandleValid(ref iHandle))
|
||||
{
|
||||
_emulatedSharedList.Remove(_emulatedShared[iHandle]);
|
||||
_emulatedShared[iHandle].Dispose();
|
||||
_emulatedShared[iHandle] = null;
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!CloseHandle(handle))
|
||||
if (!WindowsApi.CloseHandle(handle))
|
||||
{
|
||||
throw new ArgumentException("Invalid handle.", nameof(handle));
|
||||
}
|
||||
|
|
@ -253,20 +186,7 @@ namespace Ryujinx.Memory
|
|||
|
||||
public static IntPtr MapSharedMemory(IntPtr handle)
|
||||
{
|
||||
if (UseWin10Placeholders)
|
||||
{
|
||||
lock (_emulatedHandleLock)
|
||||
{
|
||||
int iHandle = (int)(ulong)handle;
|
||||
|
||||
if (EmulatedHandleValid(ref iHandle))
|
||||
{
|
||||
return _emulatedShared[iHandle].Map();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
IntPtr ptr = MapViewOfFile(handle, 4 | 2, 0, 0, IntPtr.Zero);
|
||||
IntPtr ptr = WindowsApi.MapViewOfFile(handle, 4 | 2, 0, 0, IntPtr.Zero);
|
||||
|
||||
if (ptr == IntPtr.Zero)
|
||||
{
|
||||
|
|
@ -278,24 +198,15 @@ namespace Ryujinx.Memory
|
|||
|
||||
public static void UnmapSharedMemory(IntPtr address)
|
||||
{
|
||||
if (UseWin10Placeholders)
|
||||
{
|
||||
lock (_emulatedHandleLock)
|
||||
{
|
||||
foreach (EmulatedSharedMemoryWindows shared in _emulatedSharedList)
|
||||
{
|
||||
if (shared.Unmap((ulong)address))
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!UnmapViewOfFile(address))
|
||||
if (!WindowsApi.UnmapViewOfFile(address))
|
||||
{
|
||||
throw new ArgumentException("Invalid address.", nameof(address));
|
||||
}
|
||||
}
|
||||
|
||||
public static bool RetryFromAccessViolation()
|
||||
{
|
||||
return _placeholders.RetryFromAccessViolation();
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue