From f77694e4f774c9391aad5344e70a7c8721cfedc6 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Sun, 3 May 2020 19:54:50 -0300 Subject: Implement a new physical memory manager and replace DeviceMemory (#856) * Implement a new physical memory manager and replace DeviceMemory * Proper generic constraints * Fix debug build * Add memory tests * New CPU memory manager and general code cleanup * Remove host memory management from CPU project, use Ryujinx.Memory instead * Fix tests * Document exceptions on MemoryBlock * Fix leak on unix memory allocation * Proper disposal of some objects on tests * Fix JitCache not being set as initialized * GetRef without checks for 8-bits and 16-bits CAS * Add MemoryBlock destructor * Throw in separate method to improve codegen * Address PR feedback * QueryModified improvements * Fix memory write tracking not marking all pages as modified in some cases * Simplify MarkRegionAsModified * Remove XML doc for ghost param * Add back optimization to avoid useless buffer updates * Add Ryujinx.Cpu project, move MemoryManager there and remove MemoryBlockWrapper * Some nits * Do not perform address translation when size is 0 * Address PR feedback and format NativeInterface class * Remove ghost parameter description * Update Ryujinx.Cpu to .NET Core 3.1 * Address PR feedback * Fix build * Return a well defined value for GetPhysicalAddress with invalid VA, and do not return unmapped ranges as modified * Typo --- Ryujinx.Memory/MemoryManagementUnix.cs | 75 ++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 Ryujinx.Memory/MemoryManagementUnix.cs (limited to 'Ryujinx.Memory/MemoryManagementUnix.cs') diff --git a/Ryujinx.Memory/MemoryManagementUnix.cs b/Ryujinx.Memory/MemoryManagementUnix.cs new file mode 100644 index 00000000..81096867 --- /dev/null +++ b/Ryujinx.Memory/MemoryManagementUnix.cs @@ -0,0 +1,75 @@ +using Mono.Unix.Native; +using System; +using System.Collections.Concurrent; + +namespace Ryujinx.Memory +{ + static class MemoryManagementUnix + { + private static readonly ConcurrentDictionary _allocations = new ConcurrentDictionary(); + + public static IntPtr Allocate(ulong size) + { + return AllocateInternal(size, MmapProts.PROT_READ | MmapProts.PROT_WRITE); + } + + public static IntPtr Reserve(ulong size) + { + return AllocateInternal(size, MmapProts.PROT_NONE); + } + + private static IntPtr AllocateInternal(ulong size, MmapProts prot) + { + const MmapFlags flags = MmapFlags.MAP_PRIVATE | MmapFlags.MAP_ANONYMOUS; + + IntPtr ptr = Syscall.mmap(IntPtr.Zero, size, prot, flags, -1, 0); + + if (ptr == new IntPtr(-1L)) + { + throw new OutOfMemoryException(); + } + + if (!_allocations.TryAdd(ptr, size)) + { + // This should be impossible, kernel shouldn't return an already mapped address. + throw new InvalidOperationException(); + } + + return ptr; + } + + public static bool Commit(IntPtr address, ulong size) + { + return Syscall.mprotect(address, size, MmapProts.PROT_READ | MmapProts.PROT_WRITE) == 0; + } + + public static bool Reprotect(IntPtr address, ulong size, MemoryPermission permission) + { + return Syscall.mprotect(address, size, GetProtection(permission)) == 0; + } + + private static MmapProts GetProtection(MemoryPermission permission) + { + return permission switch + { + MemoryPermission.None => MmapProts.PROT_NONE, + MemoryPermission.Read => MmapProts.PROT_READ, + MemoryPermission.ReadAndWrite => MmapProts.PROT_READ | MmapProts.PROT_WRITE, + MemoryPermission.ReadAndExecute => MmapProts.PROT_READ | MmapProts.PROT_EXEC, + MemoryPermission.ReadWriteExecute => MmapProts.PROT_READ | MmapProts.PROT_WRITE | MmapProts.PROT_EXEC, + MemoryPermission.Execute => MmapProts.PROT_EXEC, + _ => throw new MemoryProtectionException(permission) + }; + } + + public static bool Free(IntPtr address) + { + if (_allocations.TryRemove(address, out ulong size)) + { + return Syscall.munmap(address, size) == 0; + } + + return false; + } + } +} \ No newline at end of file -- cgit v1.2.3