diff --git a/src/BizHawk.BizInvoke/CallingConventionAdapter.cs b/src/BizHawk.BizInvoke/CallingConventionAdapter.cs index 7eaebacb0a..038d481c1b 100644 --- a/src/BizHawk.BizInvoke/CallingConventionAdapter.cs +++ b/src/BizHawk.BizInvoke/CallingConventionAdapter.cs @@ -277,8 +277,7 @@ namespace BizHawk.BizInvoke public MsHostSysVGuest() { int size = 4 * 1024 * 1024; - _memory = MemoryBlock.Create(0x36a00000000, (ulong)size); - _memory.Activate(); + _memory = new MemoryBlock((ulong)size); _refs = new WeakReference[size / BlockSize]; } diff --git a/src/BizHawk.BizInvoke/IMemoryBlockPal.cs b/src/BizHawk.BizInvoke/IMemoryBlockPal.cs index d4b59d012e..1ba22faa81 100644 --- a/src/BizHawk.BizInvoke/IMemoryBlockPal.cs +++ b/src/BizHawk.BizInvoke/IMemoryBlockPal.cs @@ -7,30 +7,10 @@ namespace BizHawk.BizInvoke /// public interface IMemoryBlockPal : IDisposable { + public ulong Start { get; } /// - /// Map in the memory area at the predetermined address. uncommitted space should be unreadable. - /// For all other space, there is no requirement on initial protection value; - /// correct protections will be applied via Protect() immediately after this call. - /// There is no assumption for the values of WriteStatus either, which will be supplied immediately - /// after this call - /// - void Activate(); - /// - /// Unmap the memory area from memory. All data needs to be preserved for next load. - /// - void Deactivate(); - /// - /// Change protection on [start, start + size), guaranteed to be page aligned and in the committed area. - /// Will only be called when active. Will not be called with RW_Invisible, which is a front end artifact. + /// Change protection on [start, start + size), guaranteed to be page aligned and in the allocated area /// void Protect(ulong start, ulong size, MemoryBlock.Protection prot); - /// - /// mark [Block.Start, Block.Start + length) as committed. Always greater than a previous length; - /// no uncommitting is allowed. - /// Will only be called when active. - /// there is no requirement on initial protection value of any committed memory (newly or otherwise) - /// after this call; protections will be applied via Protect() immediately after this call. - /// - void Commit(ulong length); } } diff --git a/src/BizHawk.BizInvoke/MemoryBlock.cs b/src/BizHawk.BizInvoke/MemoryBlock.cs index 543d70fab0..04cea4fc8b 100644 --- a/src/BizHawk.BizInvoke/MemoryBlock.cs +++ b/src/BizHawk.BizInvoke/MemoryBlock.cs @@ -10,35 +10,23 @@ namespace BizHawk.BizInvoke { /// allocate bytes starting at a particular address /// is not aligned or is 0 - public MemoryBlock(ulong start, ulong size) + public MemoryBlock(ulong size) { - if (!WaterboxUtils.Aligned(start)) - throw new ArgumentOutOfRangeException(nameof(start), start, "start address must be aligned"); + if (!WaterboxUtils.Aligned(size)) + throw new ArgumentOutOfRangeException(nameof(size), size, "size must be aligned"); if (size == 0) throw new ArgumentOutOfRangeException(nameof(size), size, "cannot create 0-length block"); - if (start == 0) - throw new NotImplementedException("Start == 0 doesn't work right now, not really"); - Start = start; Size = WaterboxUtils.AlignUp(size); - EndExclusive = Start + Size; - _pageData = (Protection[])(object)new byte[GetPage(EndExclusive - 1) + 1]; _pal = OSTailoredCode.IsUnixHost - ? (IMemoryBlockPal)new MemoryBlockLinuxPal(Start, Size) - : new MemoryBlockWindowsPal(Start, Size); + ? (IMemoryBlockPal)new MemoryBlockLinuxPal(Size) + : new MemoryBlockWindowsPal(Size); + Start = _pal.Start; + EndExclusive = Start + Size; } private IMemoryBlockPal _pal; - /// - /// Size that has been committed to actual underlying RAM. Never shrinks. Private because - /// it should be transparent to the caller. ALWAYS ALIGNED. - /// - private ulong CommittedSize; - - /// stores last set memory protection value for each page - private Protection[] _pageData; - /// /// end address of the memory block (not part of the block; class invariant: equal to + ) /// @@ -50,26 +38,6 @@ namespace BizHawk.BizInvoke /// starting address of the memory block public readonly ulong Start; - /// true if this is currently swapped in - public bool Active { get; private set; } - - /// get a page index within the block - private int GetPage(ulong addr) - { - if (addr < Start || addr >= EndExclusive) - throw new ArgumentOutOfRangeException(nameof(addr), addr, "invalid address"); - return (int) ((addr - Start) >> WaterboxUtils.PageShift); - } - - /// get a start address for a page index within the block - private ulong GetStartAddr(int page) => ((ulong) page << WaterboxUtils.PageShift) + Start; - - private void EnsureActive() - { - if (!Active) - throw new InvalidOperationException("MemoryBlock is not currently active"); - } - /// /// Get a stream that can be used to read or write from part of the block. Does not check for or change ! /// @@ -86,33 +54,10 @@ namespace BizHawk.BizInvoke return new MemoryViewStream(!writer, writer, (long)start, (long)length); } - /// activate the memory block, swapping it in at the pre-specified address - /// is or failed to map file view - public void Activate() - { - if (Active) - throw new InvalidOperationException("Already active"); - _pal.Activate(); - ProtectAll(); - Active = true; - } - - /// deactivate the memory block, removing it from RAM but leaving it immediately available to swap back in - /// - /// is or failed to unmap file view - /// - public void Deactivate() - { - EnsureActive(); - _pal.Deactivate(); - Active = false; - } - /// set r/w/x protection on a portion of memory. rounded to encompassing pages /// failed to protect memory public void Protect(ulong start, ulong length, Protection prot) { - EnsureActive(); if (length == 0) return; @@ -122,44 +67,7 @@ namespace BizHawk.BizInvoke var computedEnd = WaterboxUtils.AlignUp(start + length); var computedLength = computedEnd - computedStart; - // potentially commit more memory - var minNewCommittedSize = computedEnd - Start; - if (minNewCommittedSize > CommittedSize) - { - CommittedSize = minNewCommittedSize; - // Since Commit() was called, we have to do a full ProtectAll -- remember that when refactoring - _pal.Commit(CommittedSize); - } - - int pstart = GetPage(start); - int pend = GetPage(start + length - 1); - for (int i = pstart; i <= pend; i++) - { - _pageData[i] = prot; - } - - // TODO: restore the previous behavior where we would only reprotect a partial range - ProtectAll(); - } - - /// restore all recorded protections - private void ProtectAll() - { - if (CommittedSize == 0) - return; - int ps = 0; - int pageLimit = (int)(CommittedSize >> WaterboxUtils.PageShift); - for (int i = 0; i < pageLimit; i++) - { - if (i == pageLimit - 1 || _pageData[i] != _pageData[i + 1]) - { - ulong zstart = GetStartAddr(ps); - ulong zend = GetStartAddr(i + 1); - var prot = _pageData[i]; - _pal.Protect(zstart, zend - zstart, prot); - ps = i + 1; - } - } + _pal.Protect(computedStart, computedLength, prot); } public void Dispose() @@ -171,12 +79,6 @@ namespace BizHawk.BizInvoke } } - /// allocate bytes starting at a particular address - public static MemoryBlock Create(ulong start, ulong size) => new MemoryBlock(start, size); - - /// allocate bytes at any address - public static MemoryBlock Create(ulong size) => Create(0, size); - /// Memory protection constant public enum Protection : byte { diff --git a/src/BizHawk.BizInvoke/MemoryBlockLinuxPal.cs b/src/BizHawk.BizInvoke/MemoryBlockLinuxPal.cs index ef3b8ac4a1..e13f650df3 100644 --- a/src/BizHawk.BizInvoke/MemoryBlockLinuxPal.cs +++ b/src/BizHawk.BizInvoke/MemoryBlockLinuxPal.cs @@ -7,52 +7,32 @@ namespace BizHawk.BizInvoke { internal sealed unsafe class MemoryBlockLinuxPal : IMemoryBlockPal { - /* - Differences compared with MemoryBlockWindowsPal: - 1) Commit is handled by only mapping up to the commit size, and then expanding commit is handled by unmap + truncate + remap. - So all unmanaged structures (including LinGuard) are always looking at the committed size, not total size. - 2) Because of sigaltstack, RW_Stack is not needed and is made to behave the same as regular write guarding. - */ - - /// handle returned by - private int _fd = -1; - private ulong _start; - private ulong _size; - private ulong _committedSize; - private bool _active; + public ulong Start { get; } + private readonly ulong _size; + private bool _disposed; /// - /// Reserve bytes to later be swapped in, but do not map them + /// Map some bytes /// - /// eventual mapped address /// /// - /// failed to get file descriptor + /// failed to mmap /// - public MemoryBlockLinuxPal(ulong start, ulong size) + public MemoryBlockLinuxPal(ulong size) { - _start = start; + var ptr = (ulong)mmap(IntPtr.Zero, Z.UU(size), MemoryProtection.None, 0x22 /* MAP_PRIVATE | MAP_ANON */, -1, IntPtr.Zero); + if (ptr == ulong.MaxValue) + throw new InvalidOperationException($"{nameof(mmap)}() failed with error {Marshal.GetLastWin32Error()}"); _size = size; - _fd = memfd_create("MemoryBlockUnix", 1 /*MFD_CLOEXEC*/); - if (_fd == -1) - throw new InvalidOperationException($"{nameof(memfd_create)}() failed with error {Marshal.GetLastWin32Error()}"); + Start = ptr; } public void Dispose() { - if (_fd == -1) + if (_disposed) return; - if (_active) - { - try - { - Deactivate(); - } - catch - {} - } - close(_fd); - _fd = -1; + munmap(Z.US(Start), Z.UU(_size)); + _disposed = true; GC.SuppressFinalize(this); } @@ -61,50 +41,6 @@ namespace BizHawk.BizInvoke Dispose(); } - public void Activate() - { - if (_committedSize > 0) - { - var ptr = mmap(Z.US(_start), Z.UU(_committedSize), - MemoryProtection.Read | MemoryProtection.Write | MemoryProtection.Execute, - 17, // MAP_SHARED | MAP_FIXED - _fd, IntPtr.Zero); - if (ptr != Z.US(_start)) - { - throw new InvalidOperationException($"{nameof(mmap)}() failed with error {Marshal.GetLastWin32Error()}"); - } - } - _active = true; - } - - public void Deactivate() - { - if (_committedSize > 0) - { - var errorCode = munmap(Z.US(_start), Z.UU(_committedSize)); - if (errorCode != 0) - throw new InvalidOperationException($"{nameof(munmap)}() failed with error {Marshal.GetLastWin32Error()}"); - } - _active = false; - } - - public void Commit(ulong newCommittedSize) - { - var errorCode = ftruncate(_fd, Z.US(newCommittedSize)); - if (errorCode != 0) - throw new InvalidOperationException($"{nameof(ftruncate)}() failed with error {Marshal.GetLastWin32Error()}"); - // map in the previously unmapped portions contiguously - var ptr = mmap(Z.US(_start + _committedSize), Z.UU(newCommittedSize - _committedSize), - MemoryProtection.Read | MemoryProtection.Write | MemoryProtection.Execute, - 17, // MAP_SHARED | MAP_FIXED - _fd, Z.US(_committedSize)); - if (ptr != Z.US(_start + _committedSize)) - { - throw new InvalidOperationException($"{nameof(mmap)}() failed with error {Marshal.GetLastWin32Error()}"); - } - _committedSize = newCommittedSize; - } - private static MemoryProtection ToMemoryProtection(Protection prot) { switch (prot) diff --git a/src/BizHawk.BizInvoke/MemoryBlockWindowsPal.cs b/src/BizHawk.BizInvoke/MemoryBlockWindowsPal.cs index 82834c70bd..bf19f65872 100644 --- a/src/BizHawk.BizInvoke/MemoryBlockWindowsPal.cs +++ b/src/BizHawk.BizInvoke/MemoryBlockWindowsPal.cs @@ -6,58 +6,18 @@ namespace BizHawk.BizInvoke { internal sealed unsafe class MemoryBlockWindowsPal : IMemoryBlockPal { - /// - /// handle returned by CreateFileMapping - /// - private IntPtr _handle; - private ulong _start; - private ulong _size; - private bool _active; + public ulong Start { get; } + private readonly ulong _size; + private bool _disposed; - /// - /// Reserve bytes to later be swapped in, but do not map them - /// - /// eventual mapped address - /// - public MemoryBlockWindowsPal(ulong start, ulong size) + public MemoryBlockWindowsPal(ulong size) { - _start = start; + var ptr = (ulong)Kernel32.VirtualAlloc( + UIntPtr.Zero, Z.UU(size), Kernel32.AllocationType.MEM_RESERVE | Kernel32.AllocationType.MEM_COMMIT, Kernel32.MemoryProtection.NOACCESS); + if (ptr == 0) + throw new InvalidOperationException($"{nameof(Kernel32.VirtualAlloc)}() returned NULL"); + Start = ptr; _size = size; - _handle = Kernel32.CreateFileMapping( - Kernel32.INVALID_HANDLE_VALUE, - IntPtr.Zero, - Kernel32.FileMapProtection.PageExecuteReadWrite | Kernel32.FileMapProtection.SectionReserve, - (uint)(_size >> 32), - (uint)_size, - null - ); - if (_handle == IntPtr.Zero) - { - throw new InvalidOperationException($"{nameof(Kernel32.CreateFileMapping)}() returned NULL"); - } - } - - public void Activate() - { - if (Kernel32.MapViewOfFileEx( - _handle, - Kernel32.FileMapAccessType.Read | Kernel32.FileMapAccessType.Write | Kernel32.FileMapAccessType.Execute, - 0, - 0, - Z.UU(_size), - Z.US(_start) - ) != Z.US(_start)) - { - throw new InvalidOperationException($"{nameof(Kernel32.MapViewOfFileEx)}() returned NULL"); - } - _active = true; - } - - public void Deactivate() - { - if (!Kernel32.UnmapViewOfFile(Z.US(_start))) - throw new InvalidOperationException($"{nameof(Kernel32.UnmapViewOfFile)}() returned NULL"); - _active = false; } public void Protect(ulong start, ulong size, Protection prot) @@ -66,12 +26,6 @@ namespace BizHawk.BizInvoke throw new InvalidOperationException($"{nameof(Kernel32.VirtualProtect)}() returned FALSE!"); } - public void Commit(ulong length) - { - if (Kernel32.VirtualAlloc(Z.UU(_start), Z.UU(length), Kernel32.AllocationType.MEM_COMMIT, Kernel32.MemoryProtection.READWRITE) != Z.UU(_start)) - throw new InvalidOperationException($"{nameof(Kernel32.VirtualAlloc)}() returned NULL!"); - } - private static Kernel32.MemoryProtection GetKernelMemoryProtectionValue(Protection prot) { Kernel32.MemoryProtection p; @@ -88,21 +42,11 @@ namespace BizHawk.BizInvoke public void Dispose() { - if (_handle != IntPtr.Zero) - { - if (_active) - { - try - { - Deactivate(); - } - catch - {} - } - Kernel32.CloseHandle(_handle); - _handle = IntPtr.Zero; - GC.SuppressFinalize(this); - } + if (_disposed) + return; + Kernel32.VirtualFree(Z.UU(Start), UIntPtr.Zero, Kernel32.FreeType.Release); + _disposed = true; + GC.SuppressFinalize(this); } ~MemoryBlockWindowsPal() @@ -222,6 +166,16 @@ namespace BizHawk.BizInvoke [DllImport("kernel32.dll")] public static extern UIntPtr VirtualQuery(UIntPtr lpAddress, MEMORY_BASIC_INFORMATION* lpBuffer, UIntPtr dwLength); + + [Flags] + public enum FreeType + { + Decommit = 0x4000, + Release = 0x8000, + } + + [DllImport("kernel32.dll")] + public static extern bool VirtualFree(UIntPtr lpAddress, UIntPtr dwSize, FreeType dwFreeType); } } }