mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-12-25 01:05:44 +00:00
54ea2285f0
* Refactoring of KMemoryManager class * Replace some trivial uses of DRAM address with VA * Get rid of GetDramAddressFromVa * Abstracting more operations on derived page table class * Run auto-format on KPageTableBase * Managed to make TryConvertVaToPa private, few uses remains now * Implement guest physical pages ref counting, remove manual freeing * Make DoMmuOperation private and call new abstract methods only from the base class * Pass pages count rather than size on Map/UnmapMemory * Change memory managers to take host pointers * Fix a guest memory leak and simplify KPageTable * Expose new methods for host range query and mapping * Some refactoring of MapPagesFromClientProcess to allow proper page ref counting and mapping without KPageLists * Remove more uses of AddVaRangeToPageList, now only one remains (shared memory page checking) * Add a SharedMemoryStorage class, will be useful for host mapping * Sayonara AddVaRangeToPageList, you served us well * Start to implement host memory mapping (WIP) * Support memory tracking through host exception handling * Fix some access violations from HLE service guest memory access and CPU * Fix memory tracking * Fix mapping list bugs, including a race and a error adding mapping ranges * Simple page table for memory tracking * Simple "volatile" region handle mode * Update UBOs directly (experimental, rough) * Fix the overlap check * Only set non-modified buffers as volatile * Fix some memory tracking issues * Fix possible race in MapBufferFromClientProcess (block list updates were not locked) * Write uniform update to memory immediately, only defer the buffer set. * Fix some memory tracking issues * Pass correct pages count on shared memory unmap * Armeilleure Signal Handler v1 + Unix changes Unix currently behaves like windows, rather than remapping physical * Actually check if the host platform is unix * Fix decommit on linux. * Implement windows 10 placeholder shared memory, fix a buffer issue. * Make PTC version something that will never match with master * Remove testing variable for block count * Add reference count for memory manager, fix dispose Can still deadlock with OpenAL * Add address validation, use page table for mapped check, add docs Might clean up the page table traversing routines. * Implement batched mapping/tracking. * Move documentation, fix tests. * Cleanup uniform buffer update stuff. * Remove unnecessary assignment. * Add unsafe host mapped memory switch On by default. Would be good to turn this off for untrusted code (homebrew, exefs mods) and give the user the option to turn it on manually, though that requires some UI work. * Remove C# exception handlers They have issues due to current .NET limitations, so the meilleure one fully replaces them for now. * Fix MapPhysicalMemory on the software MemoryManager. * Null check for GetHostAddress, docs * Add configuration for setting memory manager mode (not in UI yet) * Add config to UI * Fix type mismatch on Unix signal handler code emit * Fix 6GB DRAM mode. The size can be greater than `uint.MaxValue` when the DRAM is >4GB. * Address some feedback. * More detailed error if backing memory cannot be mapped. * SetLastError on all OS functions for consistency * Force pages dirty with UBO update instead of setting them directly. Seems to be much faster across a few games. Need retesting. * Rebase, configuration rework, fix mem tracking regression * Fix race in FreePages * Set memory managers null after decrementing ref count * Remove readonly keyword, as this is now modified. * Use a local variable for the signal handler rather than a register. * Fix bug with buffer resize, and index/uniform buffer binding. Should fix flickering in games. * Add InvalidAccessHandler to MemoryTracking Doesn't do anything yet * Call invalid access handler on unmapped read/write. Same rules as the regular memory manager. * Make unsafe mapped memory its own MemoryManagerType * Move FlushUboDirty into UpdateState. * Buffer dirty cache, rather than ubo cache Much cleaner, may be reusable for Inline2Memory updates. * This doesn't return anything anymore. * Add sigaction remove methods, correct a few function signatures. * Return empty list of physical regions for size 0. * Also on AddressSpaceManager Co-authored-by: gdkchan <gab.dark.100@gmail.com>
217 lines
No EOL
7.7 KiB
C#
217 lines
No EOL
7.7 KiB
C#
using Ryujinx.Common;
|
|
using Ryujinx.HLE.HOS.Kernel.Common;
|
|
using Ryujinx.HLE.HOS.Kernel.Memory;
|
|
using System.Collections.Generic;
|
|
|
|
namespace Ryujinx.HLE.HOS.Kernel.Ipc
|
|
{
|
|
class KBufferDescriptorTable
|
|
{
|
|
private const int MaxInternalBuffersCount = 8;
|
|
|
|
private List<KBufferDescriptor> _sendBufferDescriptors;
|
|
private List<KBufferDescriptor> _receiveBufferDescriptors;
|
|
private List<KBufferDescriptor> _exchangeBufferDescriptors;
|
|
|
|
public KBufferDescriptorTable()
|
|
{
|
|
_sendBufferDescriptors = new List<KBufferDescriptor>(MaxInternalBuffersCount);
|
|
_receiveBufferDescriptors = new List<KBufferDescriptor>(MaxInternalBuffersCount);
|
|
_exchangeBufferDescriptors = new List<KBufferDescriptor>(MaxInternalBuffersCount);
|
|
}
|
|
|
|
public KernelResult AddSendBuffer(ulong src, ulong dst, ulong size, MemoryState state)
|
|
{
|
|
return Add(_sendBufferDescriptors, src, dst, size, state);
|
|
}
|
|
|
|
public KernelResult AddReceiveBuffer(ulong src, ulong dst, ulong size, MemoryState state)
|
|
{
|
|
return Add(_receiveBufferDescriptors, src, dst, size, state);
|
|
}
|
|
|
|
public KernelResult AddExchangeBuffer(ulong src, ulong dst, ulong size, MemoryState state)
|
|
{
|
|
return Add(_exchangeBufferDescriptors, src, dst, size, state);
|
|
}
|
|
|
|
private KernelResult Add(List<KBufferDescriptor> list, ulong src, ulong dst, ulong size, MemoryState state)
|
|
{
|
|
if (list.Count < MaxInternalBuffersCount)
|
|
{
|
|
list.Add(new KBufferDescriptor(src, dst, size, state));
|
|
|
|
return KernelResult.Success;
|
|
}
|
|
|
|
return KernelResult.OutOfMemory;
|
|
}
|
|
|
|
public KernelResult CopyBuffersToClient(KPageTableBase memoryManager)
|
|
{
|
|
KernelResult result = CopyToClient(memoryManager, _receiveBufferDescriptors);
|
|
|
|
if (result != KernelResult.Success)
|
|
{
|
|
return result;
|
|
}
|
|
|
|
return CopyToClient(memoryManager, _exchangeBufferDescriptors);
|
|
}
|
|
|
|
private KernelResult CopyToClient(KPageTableBase memoryManager, List<KBufferDescriptor> list)
|
|
{
|
|
foreach (KBufferDescriptor desc in list)
|
|
{
|
|
MemoryState stateMask;
|
|
|
|
switch (desc.State)
|
|
{
|
|
case MemoryState.IpcBuffer0: stateMask = MemoryState.IpcSendAllowedType0; break;
|
|
case MemoryState.IpcBuffer1: stateMask = MemoryState.IpcSendAllowedType1; break;
|
|
case MemoryState.IpcBuffer3: stateMask = MemoryState.IpcSendAllowedType3; break;
|
|
|
|
default: return KernelResult.InvalidCombination;
|
|
}
|
|
|
|
MemoryAttribute attributeMask = MemoryAttribute.Borrowed | MemoryAttribute.Uncached;
|
|
|
|
if (desc.State == MemoryState.IpcBuffer0)
|
|
{
|
|
attributeMask |= MemoryAttribute.DeviceMapped;
|
|
}
|
|
|
|
ulong clientAddrTruncated = BitUtils.AlignDown(desc.ClientAddress, KPageTableBase.PageSize);
|
|
ulong clientAddrRounded = BitUtils.AlignUp (desc.ClientAddress, KPageTableBase.PageSize);
|
|
|
|
// Check if address is not aligned, in this case we need to perform 2 copies.
|
|
if (clientAddrTruncated != clientAddrRounded)
|
|
{
|
|
ulong copySize = clientAddrRounded - desc.ClientAddress;
|
|
|
|
if (copySize > desc.Size)
|
|
{
|
|
copySize = desc.Size;
|
|
}
|
|
|
|
KernelResult result = memoryManager.CopyDataFromCurrentProcess(
|
|
desc.ClientAddress,
|
|
copySize,
|
|
stateMask,
|
|
stateMask,
|
|
KMemoryPermission.ReadAndWrite,
|
|
attributeMask,
|
|
MemoryAttribute.None,
|
|
desc.ServerAddress);
|
|
|
|
if (result != KernelResult.Success)
|
|
{
|
|
return result;
|
|
}
|
|
}
|
|
|
|
ulong clientEndAddr = desc.ClientAddress + desc.Size;
|
|
ulong serverEndAddr = desc.ServerAddress + desc.Size;
|
|
|
|
ulong clientEndAddrTruncated = BitUtils.AlignDown(clientEndAddr, KPageTableBase.PageSize);
|
|
ulong clientEndAddrRounded = BitUtils.AlignUp (clientEndAddr, KPageTableBase.PageSize);
|
|
ulong serverEndAddrTruncated = BitUtils.AlignDown(serverEndAddr, KPageTableBase.PageSize);
|
|
|
|
if (clientEndAddrTruncated < clientEndAddrRounded &&
|
|
(clientAddrTruncated == clientAddrRounded || clientAddrTruncated < clientEndAddrTruncated))
|
|
{
|
|
KernelResult result = memoryManager.CopyDataFromCurrentProcess(
|
|
clientEndAddrTruncated,
|
|
clientEndAddr - clientEndAddrTruncated,
|
|
stateMask,
|
|
stateMask,
|
|
KMemoryPermission.ReadAndWrite,
|
|
attributeMask,
|
|
MemoryAttribute.None,
|
|
serverEndAddrTruncated);
|
|
|
|
if (result != KernelResult.Success)
|
|
{
|
|
return result;
|
|
}
|
|
}
|
|
}
|
|
|
|
return KernelResult.Success;
|
|
}
|
|
|
|
public KernelResult UnmapServerBuffers(KPageTableBase memoryManager)
|
|
{
|
|
KernelResult result = UnmapServer(memoryManager, _sendBufferDescriptors);
|
|
|
|
if (result != KernelResult.Success)
|
|
{
|
|
return result;
|
|
}
|
|
|
|
result = UnmapServer(memoryManager, _receiveBufferDescriptors);
|
|
|
|
if (result != KernelResult.Success)
|
|
{
|
|
return result;
|
|
}
|
|
|
|
return UnmapServer(memoryManager, _exchangeBufferDescriptors);
|
|
}
|
|
|
|
private KernelResult UnmapServer(KPageTableBase memoryManager, List<KBufferDescriptor> list)
|
|
{
|
|
foreach (KBufferDescriptor descriptor in list)
|
|
{
|
|
KernelResult result = memoryManager.UnmapNoAttributeIfStateEquals(
|
|
descriptor.ServerAddress,
|
|
descriptor.Size,
|
|
descriptor.State);
|
|
|
|
if (result != KernelResult.Success)
|
|
{
|
|
return result;
|
|
}
|
|
}
|
|
|
|
return KernelResult.Success;
|
|
}
|
|
|
|
public KernelResult RestoreClientBuffers(KPageTableBase memoryManager)
|
|
{
|
|
KernelResult result = RestoreClient(memoryManager, _sendBufferDescriptors);
|
|
|
|
if (result != KernelResult.Success)
|
|
{
|
|
return result;
|
|
}
|
|
|
|
result = RestoreClient(memoryManager, _receiveBufferDescriptors);
|
|
|
|
if (result != KernelResult.Success)
|
|
{
|
|
return result;
|
|
}
|
|
|
|
return RestoreClient(memoryManager, _exchangeBufferDescriptors);
|
|
}
|
|
|
|
private KernelResult RestoreClient(KPageTableBase memoryManager, List<KBufferDescriptor> list)
|
|
{
|
|
foreach (KBufferDescriptor descriptor in list)
|
|
{
|
|
KernelResult result = memoryManager.UnmapIpcRestorePermission(
|
|
descriptor.ClientAddress,
|
|
descriptor.Size,
|
|
descriptor.State);
|
|
|
|
if (result != KernelResult.Success)
|
|
{
|
|
return result;
|
|
}
|
|
}
|
|
|
|
return KernelResult.Success;
|
|
}
|
|
}
|
|
} |