mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reprotection for bridges

Browse source
This commit is contained in:
Gabriel A 2024-03-26 22:50:20 -03:00
commit 899aa0546c
2 changed files with 47 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Ryujinx.Cpu/Jit/AddressSpacePartition.cs
View file

@ -209,6 +209,7 @@ namespace Ryujinx.Cpu.Jit
private ulong _cachedLastPagePa; private ulong _cachedLastPagePa;
private MemoryBlock _firstPageMemoryForUnmap; private MemoryBlock _firstPageMemoryForUnmap;
private ulong _firstPageOffsetForLateMap; private ulong _firstPageOffsetForLateMap;
private MemoryPermission _firstPageMemoryProtection;
public ulong Address { get; } public ulong Address { get; }
public ulong Size { get; } public ulong Size { get; }
@ -294,6 +295,11 @@ namespace Ryujinx.Cpu.Jit
Debug.Assert(va + size <= EndAddress); Debug.Assert(va + size <= EndAddress);
_baseMemory.Reprotect(va - Address, size, protection, false); _baseMemory.Reprotect(va - Address, size, protection, false);
if (va == Address)
{
_firstPageMemoryProtection = protection;
}
} }
public void Reprotect( public void Reprotect(
@ -319,7 +325,7 @@ namespace Ryujinx.Cpu.Jit
return _baseMemory.GetPointer(va - Address, size); return _baseMemory.GetPointer(va - Address, size);
} }
public void InsertBridgeAtEnd(AddressSpacePartition partitionAfter) public void InsertBridgeAtEnd(AddressSpacePartition partitionAfter, bool useProtectionMirrors)
{ {
ulong firstPagePa = partitionAfter?._firstPagePa ?? ulong.MaxValue; ulong firstPagePa = partitionAfter?._firstPagePa ?? ulong.MaxValue;
ulong lastPagePa = _lastPagePa ?? ulong.MaxValue; ulong lastPagePa = _lastPagePa ?? ulong.MaxValue;
@ -331,6 +337,12 @@ namespace Ryujinx.Cpu.Jit
(MemoryBlock firstPageMemory, ulong firstPageOffset) = partitionAfter.GetFirstPageMemoryAndOffset(); (MemoryBlock firstPageMemory, ulong firstPageOffset) = partitionAfter.GetFirstPageMemoryAndOffset();
_baseMemory.MapView(firstPageMemory, firstPageOffset, Size, _hostPageSize); _baseMemory.MapView(firstPageMemory, firstPageOffset, Size, _hostPageSize);
if (!useProtectionMirrors)
{
_baseMemory.Reprotect(Size, _hostPageSize, partitionAfter._firstPageMemoryProtection, throwOnFail: false);
}
_firstPageMemoryForUnmap = firstPageMemory; _firstPageMemoryForUnmap = firstPageMemory;
_firstPageOffsetForLateMap = firstPageOffset; _firstPageOffsetForLateMap = firstPageOffset;
} }
@ -350,6 +362,14 @@ namespace Ryujinx.Cpu.Jit
} }
} }
public void ReprotectBridge(MemoryPermission protection)
{
if (_firstPageMemoryForUnmap != null)
{
_baseMemory.Reprotect(Size, _hostPageSize, protection, throwOnFail: false);
}
}
private (MemoryBlock, ulong) GetFirstPageMemoryAndOffset() private (MemoryBlock, ulong) GetFirstPageMemoryAndOffset()
{ {
_treeLock.EnterReadLock(); _treeLock.EnterReadLock();

31
src/Ryujinx.Cpu/Jit/AddressSpacePartitioned.cs
View file

@ -99,7 +99,7 @@ namespace Ryujinx.Cpu.Jit
{ {
while (va < endVa) while (va < endVa)
{ {
AddressSpacePartition partition = FindPartition(va); AddressSpacePartition partition = FindPartitionWithIndex(va, out int partitionIndex);
if (partition == null) if (partition == null)
{ {
@ -117,6 +117,13 @@ namespace Ryujinx.Cpu.Jit
else else
{ {
partition.ReprotectAligned(clampedVa, clampedEndVa - clampedVa, protection); partition.ReprotectAligned(clampedVa, clampedEndVa - clampedVa, protection);
if (clampedVa == partition.Address &&
partitionIndex > 0 &&
_partitions[partitionIndex - 1].EndAddress == partition.Address)
{
_partitions[partitionIndex - 1].ReprotectBridge(protection);
}
} }
va += clampedEndVa - clampedVa; va += clampedEndVa - clampedVa;
@ -187,21 +194,21 @@ namespace Ryujinx.Cpu.Jit
{ {
if (_partitions[partitionIndex - 1].EndAddress == _partitions[partitionIndex].Address) if (_partitions[partitionIndex - 1].EndAddress == _partitions[partitionIndex].Address)
{ {
_partitions[partitionIndex - 1].InsertBridgeAtEnd(_partitions[partitionIndex]); _partitions[partitionIndex - 1].InsertBridgeAtEnd(_partitions[partitionIndex], _useProtectionMirrors);
} }
else else
{ {
_partitions[partitionIndex - 1].InsertBridgeAtEnd(null); _partitions[partitionIndex - 1].InsertBridgeAtEnd(null, _useProtectionMirrors);
} }
} }
if (partitionIndex + 1 < _partitions.Count && _partitions[partitionIndex].EndAddress == _partitions[partitionIndex + 1].Address) if (partitionIndex + 1 < _partitions.Count && _partitions[partitionIndex].EndAddress == _partitions[partitionIndex + 1].Address)
{ {
_partitions[partitionIndex].InsertBridgeAtEnd(_partitions[partitionIndex + 1]); _partitions[partitionIndex].InsertBridgeAtEnd(_partitions[partitionIndex + 1], _useProtectionMirrors);
} }
else else
{ {
_partitions[partitionIndex].InsertBridgeAtEnd(null); _partitions[partitionIndex].InsertBridgeAtEnd(null, _useProtectionMirrors);
} }
} }
@ -241,6 +248,20 @@ namespace Ryujinx.Cpu.Jit
return null; return null;
} }
private AddressSpacePartition FindPartitionWithIndex(ulong va, out int index)
{
lock (_partitions)
{
index = FindPartitionIndexLocked(va);
if (index >= 0)
{
return _partitions[index];
}
}
return null;
}
private int FindPartitionIndexLocked(ulong va) private int FindPartitionIndexLocked(ulong va)
{ {
int left = 0; int left = 0;