aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/Kernel/Ipc
diff options
context:
space:
mode:
authorgdkchan <gab.dark.100@gmail.com>2019-01-18 20:26:39 -0200
committerGitHub <noreply@github.com>2019-01-18 20:26:39 -0200
commit22bacc618815170c0d186a82e1ea4558e36b7063 (patch)
tree79b97959481fea1ac301da6d4e9dea9b991ece6f /Ryujinx.HLE/HOS/Kernel/Ipc
parent3731d0ce8412c3c48286c242842bcb4940b4ca6d (diff)
Improve kernel IPC implementation (#550)
* Implement some IPC related kernel SVCs properly * Fix BLZ decompression when the segment also has a uncompressed chunck * Set default cpu core on process start from ProgramLoader, remove debug message * Load process capabilities properly on KIPs * Fix a copy/paste error in UnmapPhysicalMemory64 * Implement smarter switching between old and new IPC system to support the old HLE services implementation without the manual switch * Implement RegisterService on sm and AcceptSession (partial) * Misc fixes and improvements on new IPC methods * Move IPC related SVCs into a separate file, and logging on RegisterService (sm) * Some small fixes related to receive list buffers and error cases * Load NSOs using the correct pool partition * Fix corner case on GetMaskFromMinMax where range is 64, doesn't happen in pratice however * Fix send static buffer copy * Session release, implement closing requests on client disconnect * Implement ConnectToPort SVC * KLightSession init
Diffstat (limited to 'Ryujinx.HLE/HOS/Kernel/Ipc')
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/ChannelState.cs10
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KBufferDescriptor.cs20
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KBufferDescriptorTable.cs216
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KClientPort.cs110
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs60
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KLightClientSession.cs14
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KLightServerSession.cs14
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KLightSession.cs20
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KPort.cs65
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KServerPort.cs75
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KServerSession.cs1262
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KSession.cs50
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KSessionRequest.cs31
13 files changed, 1924 insertions, 23 deletions
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/ChannelState.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/ChannelState.cs
new file mode 100644
index 00000000..4827384e
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/ChannelState.cs
@@ -0,0 +1,10 @@
+namespace Ryujinx.HLE.HOS.Kernel.Ipc
+{
+ enum ChannelState
+ {
+ NotInitialized,
+ Open,
+ ClientDisconnected,
+ ServerDisconnected
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KBufferDescriptor.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KBufferDescriptor.cs
new file mode 100644
index 00000000..e28244d4
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KBufferDescriptor.cs
@@ -0,0 +1,20 @@
+using Ryujinx.HLE.HOS.Kernel.Memory;
+
+namespace Ryujinx.HLE.HOS.Kernel.Ipc
+{
+ class KBufferDescriptor
+ {
+ public ulong ClientAddress { get; }
+ public ulong ServerAddress { get; }
+ public ulong Size { get; }
+ public MemoryState State { get; }
+
+ public KBufferDescriptor(ulong src, ulong dst, ulong size, MemoryState state)
+ {
+ ClientAddress = src;
+ ServerAddress = dst;
+ Size = size;
+ State = state;
+ }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KBufferDescriptorTable.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KBufferDescriptorTable.cs
new file mode 100644
index 00000000..ac805bee
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KBufferDescriptorTable.cs
@@ -0,0 +1,216 @@
+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(KMemoryManager memoryManager)
+ {
+ KernelResult result = CopyToClient(memoryManager, _receiveBufferDescriptors);
+
+ if (result != KernelResult.Success)
+ {
+ return result;
+ }
+
+ return CopyToClient(memoryManager, _exchangeBufferDescriptors);
+ }
+
+ private KernelResult CopyToClient(KMemoryManager 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, KMemoryManager.PageSize);
+ ulong clientAddrRounded = BitUtils.AlignUp (desc.ClientAddress, KMemoryManager.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,
+ MemoryPermission.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, KMemoryManager.PageSize);
+ ulong clientEndAddrRounded = BitUtils.AlignUp (clientEndAddr, KMemoryManager.PageSize);
+ ulong serverEndAddrTruncated = BitUtils.AlignDown(clientEndAddr, KMemoryManager.PageSize);
+
+ if (clientEndAddrTruncated < clientAddrRounded)
+ {
+ KernelResult result = memoryManager.CopyDataToCurrentProcess(
+ clientEndAddrTruncated,
+ clientEndAddr - clientEndAddrTruncated,
+ serverEndAddrTruncated,
+ stateMask,
+ stateMask,
+ MemoryPermission.ReadAndWrite,
+ attributeMask,
+ MemoryAttribute.None);
+
+ if (result != KernelResult.Success)
+ {
+ return result;
+ }
+ }
+ }
+
+ return KernelResult.Success;
+ }
+
+ public KernelResult UnmapServerBuffers(KMemoryManager 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(KMemoryManager 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(KMemoryManager 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(KMemoryManager 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;
+ }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KClientPort.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KClientPort.cs
index ddfe2096..eaa4322d 100644
--- a/Ryujinx.HLE/HOS/Kernel/Ipc/KClientPort.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KClientPort.cs
@@ -1,4 +1,6 @@
using Ryujinx.HLE.HOS.Kernel.Common;
+using Ryujinx.HLE.HOS.Kernel.Process;
+using Ryujinx.HLE.HOS.Services;
namespace Ryujinx.HLE.HOS.Kernel.Ipc
{
@@ -10,12 +12,116 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
private KPort _parent;
- public KClientPort(Horizon system) : base(system) { }
+ public bool IsLight => _parent.IsLight;
- public void Initialize(KPort parent, int maxSessions)
+ private object _countIncLock;
+
+ //TODO: Remove that, we need it for now to allow HLE
+ //SM implementation to work with the new IPC system.
+ public IpcService Service { get; set; }
+
+ public KClientPort(Horizon system, KPort parent, int maxSessions) : base(system)
{
_maxSessions = maxSessions;
_parent = parent;
+
+ _countIncLock = new object();
+ }
+
+ public KernelResult Connect(out KClientSession clientSession)
+ {
+ clientSession = null;
+
+ KProcess currentProcess = System.Scheduler.GetCurrentProcess();
+
+ if (currentProcess.ResourceLimit != null &&
+ !currentProcess.ResourceLimit.Reserve(LimitableResource.Session, 1))
+ {
+ return KernelResult.ResLimitExceeded;
+ }
+
+ lock (_countIncLock)
+ {
+ if (_sessionsCount < _maxSessions)
+ {
+ _sessionsCount++;
+ }
+ else
+ {
+ currentProcess.ResourceLimit?.Release(LimitableResource.Session, 1);
+
+ return KernelResult.SessionCountExceeded;
+ }
+
+ if (_currentCapacity < _sessionsCount)
+ {
+ _currentCapacity = _sessionsCount;
+ }
+ }
+
+ KSession session = new KSession(System);
+
+ if (Service != null)
+ {
+ session.ClientSession.Service = Service;
+ }
+
+ KernelResult result = _parent.EnqueueIncomingSession(session.ServerSession);
+
+ if (result != KernelResult.Success)
+ {
+ session.ClientSession.DecrementReferenceCount();
+ session.ServerSession.DecrementReferenceCount();
+
+ return result;
+ }
+
+ clientSession = session.ClientSession;
+
+ return result;
+ }
+
+ public KernelResult ConnectLight(out KLightClientSession clientSession)
+ {
+ clientSession = null;
+
+ KProcess currentProcess = System.Scheduler.GetCurrentProcess();
+
+ if (currentProcess.ResourceLimit != null &&
+ !currentProcess.ResourceLimit.Reserve(LimitableResource.Session, 1))
+ {
+ return KernelResult.ResLimitExceeded;
+ }
+
+ lock (_countIncLock)
+ {
+ if (_sessionsCount < _maxSessions)
+ {
+ _sessionsCount++;
+ }
+ else
+ {
+ currentProcess.ResourceLimit?.Release(LimitableResource.Session, 1);
+
+ return KernelResult.SessionCountExceeded;
+ }
+ }
+
+ KLightSession session = new KLightSession(System);
+
+ KernelResult result = _parent.EnqueueIncomingLightSession(session.ServerSession);
+
+ if (result != KernelResult.Success)
+ {
+ session.ClientSession.DecrementReferenceCount();
+ session.ServerSession.DecrementReferenceCount();
+
+ return result;
+ }
+
+ clientSession = session.ClientSession;
+
+ return result;
}
public new static KernelResult RemoveName(Horizon system, string name)
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs
new file mode 100644
index 00000000..f139d3d4
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs
@@ -0,0 +1,60 @@
+using Ryujinx.HLE.HOS.Kernel.Common;
+using Ryujinx.HLE.HOS.Kernel.Process;
+using Ryujinx.HLE.HOS.Kernel.Threading;
+using Ryujinx.HLE.HOS.Services;
+
+namespace Ryujinx.HLE.HOS.Kernel.Ipc
+{
+ class KClientSession : KSynchronizationObject
+ {
+ public KProcess CreatorProcess { get; }
+
+ private KSession _parent;
+
+ public ChannelState State { get; set; }
+
+ //TODO: Remove that, we need it for now to allow HLE
+ //services implementation to work with the new IPC system.
+ public IpcService Service { get; set; }
+
+ public KClientSession(Horizon system, KSession parent) : base(system)
+ {
+ _parent = parent;
+
+ State = ChannelState.Open;
+
+ CreatorProcess = system.Scheduler.GetCurrentProcess();
+
+ CreatorProcess.IncrementReferenceCount();
+ }
+
+ public KernelResult SendSyncRequest(ulong customCmdBuffAddr = 0, ulong customCmdBuffSize = 0)
+ {
+ KThread currentThread = System.Scheduler.GetCurrentThread();
+
+ KSessionRequest request = new KSessionRequest(currentThread, customCmdBuffAddr, customCmdBuffSize);
+
+ System.CriticalSection.Enter();
+
+ currentThread.SignaledObj = null;
+ currentThread.ObjSyncResult = KernelResult.Success;
+
+ KernelResult result = _parent.ServerSession.EnqueueRequest(request);
+
+ System.CriticalSection.Leave();
+
+ if (result == KernelResult.Success)
+ {
+ result = currentThread.ObjSyncResult;
+ }
+
+ return result;
+ }
+
+ protected override void Destroy()
+ {
+ _parent.DisconnectClient();
+ _parent.DecrementReferenceCount();
+ }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KLightClientSession.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KLightClientSession.cs
new file mode 100644
index 00000000..62c352bf
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KLightClientSession.cs
@@ -0,0 +1,14 @@
+using Ryujinx.HLE.HOS.Kernel.Common;
+
+namespace Ryujinx.HLE.HOS.Kernel.Ipc
+{
+ class KLightClientSession : KAutoObject
+ {
+ private KLightSession _parent;
+
+ public KLightClientSession(Horizon system, KLightSession parent) : base(system)
+ {
+ _parent = parent;
+ }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KLightServerSession.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KLightServerSession.cs
new file mode 100644
index 00000000..1ea2205d
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KLightServerSession.cs
@@ -0,0 +1,14 @@
+using Ryujinx.HLE.HOS.Kernel.Common;
+
+namespace Ryujinx.HLE.HOS.Kernel.Ipc
+{
+ class KLightServerSession : KAutoObject
+ {
+ private KLightSession _parent;
+
+ public KLightServerSession(Horizon system, KLightSession parent) : base(system)
+ {
+ _parent = parent;
+ }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KLightSession.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KLightSession.cs
new file mode 100644
index 00000000..a12a1986
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KLightSession.cs
@@ -0,0 +1,20 @@
+using Ryujinx.HLE.HOS.Kernel.Common;
+
+namespace Ryujinx.HLE.HOS.Kernel.Ipc
+{
+ class KLightSession : KAutoObject
+ {
+ public KLightServerSession ServerSession { get; }
+ public KLightClientSession ClientSession { get; }
+
+ private bool _hasBeenInitialized;
+
+ public KLightSession(Horizon system) : base(system)
+ {
+ ServerSession = new KLightServerSession(system, this);
+ ClientSession = new KLightClientSession(system, this);
+
+ _hasBeenInitialized = true;
+ }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KPort.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KPort.cs
index 16e9a111..9d93cf7b 100644
--- a/Ryujinx.HLE/HOS/Kernel/Ipc/KPort.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KPort.cs
@@ -4,25 +4,68 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
{
class KPort : KAutoObject
{
- public KServerPort ServerPort { get; private set; }
- public KClientPort ClientPort { get; private set; }
+ public KServerPort ServerPort { get; }
+ public KClientPort ClientPort { get; }
private long _nameAddress;
- private bool _isLight;
- public KPort(Horizon system) : base(system)
+ private ChannelState _state;
+
+ public bool IsLight { get; private set; }
+
+ public KPort(Horizon system, int maxSessions, bool isLight, long nameAddress) : base(system)
{
- ServerPort = new KServerPort(system);
- ClientPort = new KClientPort(system);
+ ServerPort = new KServerPort(system, this);
+ ClientPort = new KClientPort(system, this, maxSessions);
+
+ IsLight = isLight;
+ _nameAddress = nameAddress;
+
+ _state = ChannelState.Open;
}
- public void Initialize(int maxSessions, bool isLight, long nameAddress)
+ public KernelResult EnqueueIncomingSession(KServerSession session)
{
- ServerPort.Initialize(this);
- ClientPort.Initialize(this, maxSessions);
+ KernelResult result;
- _isLight = isLight;
- _nameAddress = nameAddress;
+ System.CriticalSection.Enter();
+
+ if (_state == ChannelState.Open)
+ {
+ ServerPort.EnqueueIncomingSession(session);
+
+ result = KernelResult.Success;
+ }
+ else
+ {
+ result = KernelResult.PortClosed;
+ }
+
+ System.CriticalSection.Leave();
+
+ return result;
+ }
+
+ public KernelResult EnqueueIncomingLightSession(KLightServerSession session)
+ {
+ KernelResult result;
+
+ System.CriticalSection.Enter();
+
+ if (_state == ChannelState.Open)
+ {
+ ServerPort.EnqueueIncomingLightSession(session);
+
+ result = KernelResult.Success;
+ }
+ else
+ {
+ result = KernelResult.PortClosed;
+ }
+
+ System.CriticalSection.Leave();
+
+ return result;
}
}
} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KServerPort.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KServerPort.cs
index d4d3bcd2..919df357 100644
--- a/Ryujinx.HLE/HOS/Kernel/Ipc/KServerPort.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KServerPort.cs
@@ -1,16 +1,87 @@
using Ryujinx.HLE.HOS.Kernel.Common;
+using System.Collections.Generic;
namespace Ryujinx.HLE.HOS.Kernel.Ipc
{
class KServerPort : KSynchronizationObject
{
+ private LinkedList<KServerSession> _incomingConnections;
+ private LinkedList<KLightServerSession> _lightIncomingConnections;
+
private KPort _parent;
- public KServerPort(Horizon system) : base(system) { }
+ public bool IsLight => _parent.IsLight;
- public void Initialize(KPort parent)
+ public KServerPort(Horizon system, KPort parent) : base(system)
{
_parent = parent;
+
+ _incomingConnections = new LinkedList<KServerSession>();
+ _lightIncomingConnections = new LinkedList<KLightServerSession>();
+ }
+
+ public void EnqueueIncomingSession(KServerSession session)
+ {
+ AcceptIncomingConnection(_incomingConnections, session);
+ }
+
+ public void EnqueueIncomingLightSession(KLightServerSession session)
+ {
+ AcceptIncomingConnection(_lightIncomingConnections, session);
+ }
+
+ private void AcceptIncomingConnection<T>(LinkedList<T> list, T session)
+ {
+ System.CriticalSection.Enter();
+
+ list.AddLast(session);
+
+ if (list.Count == 1)
+ {
+ Signal();
+ }
+
+ System.CriticalSection.Leave();
+ }
+
+ public KServerSession AcceptIncomingConnection()
+ {
+ return AcceptIncomingConnection(_incomingConnections);
+ }
+
+ public KLightServerSession AcceptIncomingLightConnection()
+ {
+ return AcceptIncomingConnection(_lightIncomingConnections);
+ }
+
+ private T AcceptIncomingConnection<T>(LinkedList<T> list)
+ {
+ T session = default(T);
+
+ System.CriticalSection.Enter();
+
+ if (list.Count != 0)
+ {
+ session = list.First.Value;
+
+ list.RemoveFirst();
+ }
+
+ System.CriticalSection.Leave();
+
+ return session;
+ }
+
+ public override bool IsSignaled()
+ {
+ if (_parent.IsLight)
+ {
+ return _lightIncomingConnections.Count != 0;
+ }
+ else
+ {
+ return _incomingConnections.Count != 0;
+ }
}
}
} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KServerSession.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KServerSession.cs
new file mode 100644
index 00000000..5a45ff4a
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KServerSession.cs
@@ -0,0 +1,1262 @@
+using Ryujinx.Common;
+using Ryujinx.HLE.HOS.Kernel.Common;
+using Ryujinx.HLE.HOS.Kernel.Memory;
+using Ryujinx.HLE.HOS.Kernel.Process;
+using Ryujinx.HLE.HOS.Kernel.Threading;
+using System.Collections.Generic;
+
+namespace Ryujinx.HLE.HOS.Kernel.Ipc
+{
+ class KServerSession : KSynchronizationObject
+ {
+ private static readonly MemoryState[] IpcMemoryStates = new MemoryState[]
+ {
+ MemoryState.IpcBuffer3,
+ MemoryState.IpcBuffer0,
+ MemoryState.IpcBuffer1,
+ (MemoryState)0xfffce5d4 //This is invalid, shouldn't be accessed.
+ };
+
+ private struct Message
+ {
+ public ulong Address { get; }
+ public ulong DramAddress { get; }
+ public ulong Size { get; }
+ public bool IsCustom { get; }
+
+ public Message(KThread thread, ulong customCmdBuffAddress, ulong customCmdBuffSize)
+ {
+ IsCustom = customCmdBuffAddress != 0;
+
+ if (IsCustom)
+ {
+ Address = customCmdBuffAddress;
+ Size = customCmdBuffSize;
+
+ KProcess process = thread.Owner;
+
+ DramAddress = process.MemoryManager.GetDramAddressFromVa(Address);
+ }
+ else
+ {
+ Address = thread.TlsAddress;
+ DramAddress = thread.TlsDramAddress;
+ Size = 0x100;
+ }
+ }
+
+ public Message(KSessionRequest request) : this(
+ request.ClientThread,
+ request.CustomCmdBuffAddr,
+ request.CustomCmdBuffSize) { }
+ }
+
+ private struct MessageHeader
+ {
+ public uint Word0 { get; }
+ public uint Word1 { get; }
+ public uint Word2 { get; }
+
+ public uint PointerBuffersCount { get; }
+ public uint SendBuffersCount { get; }
+ public uint ReceiveBuffersCount { get; }
+ public uint ExchangeBuffersCount { get; }
+
+ public uint RawDataSizeInWords { get; }
+
+ public uint ReceiveListType { get; }
+
+ public uint MessageSizeInWords { get; }
+ public uint ReceiveListOffsetInWords { get; }
+ public uint ReceiveListOffset { get; }
+
+ public bool HasHandles { get; }
+
+ public bool HasPid { get; }
+
+ public uint CopyHandlesCount { get; }
+ public uint MoveHandlesCount { get; }
+
+ public MessageHeader(uint word0, uint word1, uint word2)
+ {
+ Word0 = word0;
+ Word1 = word1;
+ Word2 = word2;
+
+ HasHandles = word1 >> 31 != 0;
+
+ uint handleDescSizeInWords = 0;
+
+ if (HasHandles)
+ {
+ uint pidSize = (word2 & 1) * 8;
+
+ HasPid = pidSize != 0;
+
+ CopyHandlesCount = (word2 >> 1) & 0xf;
+ MoveHandlesCount = (word2 >> 5) & 0xf;
+
+ handleDescSizeInWords = (pidSize + CopyHandlesCount * 4 + MoveHandlesCount * 4) / 4;
+ }
+ else
+ {
+ HasPid = false;
+
+ CopyHandlesCount = 0;
+ MoveHandlesCount = 0;
+ }
+
+ PointerBuffersCount = (word0 >> 16) & 0xf;
+ SendBuffersCount = (word0 >> 20) & 0xf;
+ ReceiveBuffersCount = (word0 >> 24) & 0xf;
+ ExchangeBuffersCount = word0 >> 28;
+
+ uint pointerDescSizeInWords = PointerBuffersCount * 2;
+ uint sendDescSizeInWords = SendBuffersCount * 3;
+ uint receiveDescSizeInWords = ReceiveBuffersCount * 3;
+ uint exchangeDescSizeInWords = ExchangeBuffersCount * 3;
+
+ RawDataSizeInWords = word1 & 0x3ff;
+
+ ReceiveListType = (word1 >> 10) & 0xf;
+
+ ReceiveListOffsetInWords = (word1 >> 20) & 0x7ff;
+
+ uint paddingSizeInWords = HasHandles ? 3u : 2u;
+
+ MessageSizeInWords = pointerDescSizeInWords +
+ sendDescSizeInWords +
+ receiveDescSizeInWords +
+ exchangeDescSizeInWords +
+ RawDataSizeInWords +
+ paddingSizeInWords +
+ handleDescSizeInWords;
+
+ if (ReceiveListOffsetInWords == 0)
+ {
+ ReceiveListOffsetInWords = MessageSizeInWords;
+ }
+
+ ReceiveListOffset = ReceiveListOffsetInWords * 4;
+ }
+ }
+
+ private struct PointerBufferDesc
+ {
+ public uint ReceiveIndex { get; }
+
+ public uint BufferSize { get; }
+ public ulong BufferAddress { get; set; }
+
+ public PointerBufferDesc(ulong dword)
+ {
+ ReceiveIndex = (uint)dword & 0xf;
+ BufferSize = (uint)dword >> 16;
+
+ BufferAddress = (dword >> 2) & 0x70;
+ BufferAddress |= (dword >> 12) & 0xf;
+
+ BufferAddress = (BufferAddress << 32) | (dword >> 32);
+ }
+
+ public ulong Pack()
+ {
+ ulong dword = (ReceiveIndex & 0xf) | ((BufferSize & 0xffff) << 16);
+
+ dword |= BufferAddress << 32;
+ dword |= (BufferAddress >> 20) & 0xf000;
+ dword |= (BufferAddress >> 30) & 0xffc0;
+
+ return dword;
+ }
+ }
+
+ private KSession _parent;
+
+ private LinkedList<KSessionRequest> _requests;
+
+ private KSessionRequest _activeRequest;
+
+ public KServerSession(Horizon system, KSession parent) : base(system)
+ {
+ _parent = parent;
+
+ _requests = new LinkedList<KSessionRequest>();
+ }
+
+ public KernelResult EnqueueRequest(KSessionRequest request)
+ {
+ if (_parent.ClientSession.State != ChannelState.Open)
+ {
+ return KernelResult.PortRemoteClosed;
+ }
+
+ if (request.AsyncEvent == null)
+ {
+ if (request.ClientThread.ShallBeTerminated ||
+ request.ClientThread.SchedFlags == ThreadSchedState.TerminationPending)
+ {
+ return KernelResult.ThreadTerminating;
+ }
+
+ request.ClientThread.Reschedule(ThreadSchedState.Paused);
+ }
+
+ _requests.AddLast(request);
+
+ if (_requests.Count == 1)
+ {
+ Signal();
+ }
+
+ return KernelResult.Success;
+ }
+
+ public KernelResult Receive(ulong customCmdBuffAddr = 0, ulong customCmdBuffSize = 0)
+ {
+ KThread serverThread = System.Scheduler.GetCurrentThread();
+ KProcess serverProcess = serverThread.Owner;
+
+ System.CriticalSection.Enter();
+
+ if (_parent.ClientSession.State != ChannelState.Open)
+ {
+ System.CriticalSection.Leave();
+
+ return KernelResult.PortRemoteClosed;
+ }
+
+ if (_activeRequest != null || !DequeueRequest(out KSessionRequest request))
+ {
+ System.CriticalSection.Leave();
+
+ return KernelResult.NotFound;
+ }
+
+ if (request.ClientThread == null)
+ {
+ System.CriticalSection.Leave();
+
+ return KernelResult.PortRemoteClosed;
+ }
+
+ KThread clientThread = request.ClientThread;
+ KProcess clientProcess = clientThread.Owner;
+
+ System.CriticalSection.Leave();
+
+ _activeRequest = request;
+
+ request.ServerProcess = serverProcess;
+
+ Message clientMsg = new Message(request);
+ Message serverMsg = new Message(serverThread, customCmdBuffAddr, customCmdBuffSize);
+
+ MessageHeader clientHeader = GetClientMessageHeader(clientMsg);
+ MessageHeader serverHeader = GetServerMessageHeader(serverMsg);
+
+ KernelResult serverResult = KernelResult.NotFound;
+ KernelResult clientResult = KernelResult.Success;
+
+ void CleanUpForError()
+ {
+ if (request.BufferDescriptorTable.UnmapServerBuffers(serverProcess.MemoryManager) == KernelResult.Success)
+ {
+ request.BufferDescriptorTable.RestoreClientBuffers(clientProcess.MemoryManager);
+ }
+
+ CloseAllHandles(serverMsg, clientHeader, serverProcess);
+
+ System.CriticalSection.Enter();
+
+ _activeRequest = null;
+
+ if (_requests.Count != 0)
+ {
+ Signal();
+ }
+
+ System.CriticalSection.Leave();
+
+ WakeClientThread(request, clientResult);
+ }
+
+ if (clientHeader.ReceiveListType < 2 &&
+ clientHeader.ReceiveListOffset > clientMsg.Size)
+ {
+ CleanUpForError();
+
+ return KernelResult.InvalidCombination;
+ }
+ else if (clientHeader.ReceiveListType == 2 &&
+ clientHeader.ReceiveListOffset + 8 > clientMsg.Size)
+ {
+ CleanUpForError();
+
+ return KernelResult.InvalidCombination;
+ }
+ else if (clientHeader.ReceiveListType > 2 &&
+ clientHeader.ReceiveListType * 8 - 0x10 + clientHeader.ReceiveListOffset > clientMsg.Size)
+ {
+ CleanUpForError();
+
+ return KernelResult.InvalidCombination;
+ }
+
+ if (clientHeader.ReceiveListOffsetInWords < clientHeader.MessageSizeInWords)
+ {
+ CleanUpForError();
+
+ return KernelResult.InvalidCombination;
+ }
+
+ if (clientHeader.MessageSizeInWords * 4 > clientMsg.Size)
+ {
+ CleanUpForError();
+
+ return KernelResult.CmdBufferTooSmall;
+ }
+
+ ulong[] receiveList = GetReceiveList(
+ serverMsg,
+ serverHeader.ReceiveListType,
+ serverHeader.ReceiveListOffset);
+
+ serverProcess.CpuMemory.WriteUInt32((long)serverMsg.Address + 0, clientHeader.Word0);
+ serverProcess.CpuMemory.WriteUInt32((long)serverMsg.Address + 4, clientHeader.Word1);
+
+ uint offset;
+
+ //Copy handles.
+ if (clientHeader.HasHandles)
+ {
+ if (clientHeader.MoveHandlesCount != 0)
+ {
+ CleanUpForError();
+
+ return KernelResult.InvalidCombination;
+ }
+
+ serverProcess.CpuMemory.WriteUInt32((long)serverMsg.Address + 8, clientHeader.Word2);
+
+ offset = 3;
+
+ if (clientHeader.HasPid)
+ {
+ serverProcess.CpuMemory.WriteInt64((long)serverMsg.Address + offset * 4, clientProcess.Pid);
+
+ offset += 2;
+ }
+
+ for (int index = 0; index < clientHeader.CopyHandlesCount; index++)
+ {
+ int newHandle = 0;
+
+ int handle = System.Device.Memory.ReadInt32((long)clientMsg.DramAddress + offset * 4);
+
+ if (clientResult == KernelResult.Success && handle != 0)
+ {
+ clientResult = GetCopyObjectHandle(clientThread, serverProcess, handle, out newHandle);
+ }
+
+ serverProcess.CpuMemory.WriteInt32((long)serverMsg.Address + offset * 4, newHandle);
+
+ offset++;
+ }
+
+ for (int index = 0; index < clientHeader.MoveHandlesCount; index++)
+ {
+ int newHandle = 0;
+
+ int handle = System.Device.Memory.ReadInt32((long)clientMsg.DramAddress + offset * 4);
+
+ if (handle != 0)
+ {
+ if (clientResult == KernelResult.Success)
+ {
+ clientResult = GetMoveObjectHandle(clientProcess, serverProcess, handle, out newHandle);
+ }
+ else
+ {
+ clientProcess.HandleTable.CloseHandle(handle);
+ }
+ }
+
+ serverProcess.CpuMemory.WriteInt32((long)serverMsg.Address + offset * 4, newHandle);
+
+ offset++;
+ }
+
+ if (clientResult != KernelResult.Success)
+ {
+ CleanUpForError();
+
+ return serverResult;
+ }
+ }
+ else
+ {
+ offset = 2;
+ }
+
+ //Copy pointer/receive list buffers.
+ uint recvListDstOffset = 0;
+
+ for (int index = 0; index < clientHeader.PointerBuffersCount; index++)
+ {
+ ulong pointerDesc = System.Device.Memory.ReadUInt64((long)clientMsg.DramAddress + offset * 4);
+
+ PointerBufferDesc descriptor = new PointerBufferDesc(pointerDesc);
+
+ if (descriptor.BufferSize != 0)
+ {
+ clientResult = GetReceiveListAddress(
+ descriptor,
+ serverMsg,
+ serverHeader.ReceiveListType,
+ clientHeader.MessageSizeInWords,
+ receiveList,
+ ref recvListDstOffset,
+ out ulong recvListBufferAddress);
+
+ if (clientResult != KernelResult.Success)
+ {
+ CleanUpForError();
+
+ return serverResult;
+ }
+
+ clientResult = clientProcess.MemoryManager.CopyDataToCurrentProcess(
+ recvListBufferAddress,
+ descriptor.BufferSize,
+ descriptor.BufferAddress,
+ MemoryState.IsPoolAllocated,
+ MemoryState.IsPoolAllocated,
+ MemoryPermission.Read,
+ MemoryAttribute.Uncached,
+ MemoryAttribute.None);
+
+ if (clientResult != KernelResult.Success)
+ {
+ CleanUpForError();
+
+ return serverResult;
+ }
+
+ descriptor.BufferAddress = recvListBufferAddress;
+ }
+ else
+ {
+ descriptor.BufferAddress = 0;
+ }
+
+ serverProcess.CpuMemory.WriteUInt64((long)serverMsg.Address + offset * 4, descriptor.Pack());
+
+ offset += 2;
+ }
+
+ //Copy send, receive and exchange buffers.
+ uint totalBuffersCount =
+ clientHeader.SendBuffersCount +
+ clientHeader.ReceiveBuffersCount +
+ clientHeader.ExchangeBuffersCount;
+
+ for (int index = 0; index < totalBuffersCount; index++)
+ {
+ long clientDescAddress = (long)clientMsg.DramAddress + offset * 4;
+
+ uint descWord0 = System.Device.Memory.ReadUInt32(clientDescAddress + 0);
+ uint descWord1 = System.Device.Memory.ReadUInt32(clientDescAddress + 4);
+ uint descWord2 = System.Device.Memory.ReadUInt32(clientDescAddress + 8);
+
+ bool isSendDesc = index < clientHeader.SendBuffersCount;
+ bool isExchangeDesc = index >= clientHeader.SendBuffersCount + clientHeader.ReceiveBuffersCount;
+
+ bool notReceiveDesc = isSendDesc || isExchangeDesc;
+ bool isReceiveDesc = !notReceiveDesc;
+
+ MemoryPermission permission = index >= clientHeader.SendBuffersCount
+ ? MemoryPermission.ReadAndWrite
+ : MemoryPermission.Read;
+
+ uint sizeHigh4 = (descWord2 >> 24) & 0xf;
+
+ ulong bufferSize = descWord0 | (ulong)sizeHigh4 << 32;
+
+ ulong dstAddress = 0;
+
+ if (bufferSize != 0)
+ {
+ ulong bufferAddress;
+
+ bufferAddress = descWord2 >> 28;
+ bufferAddress |= ((descWord2 >> 2) & 7) << 4;
+
+ bufferAddress = (bufferAddress << 32) | descWord1;
+
+ MemoryState state = IpcMemoryStates[(descWord2 + 1) & 3];
+
+ clientResult = serverProcess.MemoryManager.MapBufferFromClientProcess(
+ bufferSize,
+ bufferAddress,
+ clientProcess.MemoryManager,
+ permission,
+ state,
+ notReceiveDesc,
+ out dstAddress);
+
+ if (clientResult != KernelResult.Success)
+ {
+ CleanUpForError();
+
+ return serverResult;
+ }
+
+ if (isSendDesc)
+ {
+ clientResult = request.BufferDescriptorTable.AddSendBuffer(bufferAddress, dstAddress, bufferSize, state);
+ }
+ else if (isReceiveDesc)
+ {
+ clientResult = request.BufferDescriptorTable.AddReceiveBuffer(bufferAddress, dstAddress, bufferSize, state);
+ }
+ else /* if (isExchangeDesc) */
+ {
+ clientResult = request.BufferDescriptorTable.AddExchangeBuffer(bufferAddress, dstAddress, bufferSize, state);
+ }
+
+ if (clientResult != KernelResult.Success)
+ {
+ CleanUpForError();
+
+ return serverResult;
+ }
+ }
+
+ descWord1 = (uint)dstAddress;
+
+ descWord2 &= 3;
+
+ descWord2 |= sizeHigh4 << 24;
+
+ descWord2 |= (uint)(dstAddress >> 34) & 0x3ffffffc;
+ descWord2 |= (uint)(dstAddress >> 4) & 0xf0000000;
+
+ long serverDescAddress = (long)serverMsg.Address + offset * 4;
+
+ serverProcess.CpuMemory.WriteUInt32(serverDescAddress + 0, descWord0);
+ serverProcess.CpuMemory.WriteUInt32(serverDescAddress + 4, descWord1);
+ serverProcess.CpuMemory.WriteUInt32(serverDescAddress + 8, descWord2);
+
+ offset += 3;
+ }
+
+ //Copy raw data.
+ if (clientHeader.RawDataSizeInWords != 0)
+ {
+ ulong copySrc = clientMsg.Address + offset * 4;
+ ulong copyDst = serverMsg.Address + offset * 4;
+
+ ulong copySize = clientHeader.RawDataSizeInWords * 4;
+
+ if (serverMsg.IsCustom || clientMsg.IsCustom)
+ {
+ MemoryPermission permission = clientMsg.IsCustom
+ ? MemoryPermission.None
+ : MemoryPermission.Read;
+
+ clientResult = clientProcess.MemoryManager.CopyDataToCurrentProcess(
+ copyDst,
+ copySize,
+ copySrc,
+ MemoryState.IsPoolAllocated,
+ MemoryState.IsPoolAllocated,
+ permission,
+ MemoryAttribute.Uncached,
+ MemoryAttribute.None);
+ }
+ else
+ {
+ copySrc = clientProcess.MemoryManager.GetDramAddressFromVa(copySrc);
+ copyDst = serverProcess.MemoryManager.GetDramAddressFromVa(copyDst);
+
+ System.Device.Memory.Copy(copyDst, copySrc, copySize);
+ }
+
+ if (clientResult != KernelResult.Success)
+ {
+ CleanUpForError();
+
+ return serverResult;
+ }
+ }
+
+ return KernelResult.Success;
+ }
+
+ public KernelResult Reply(ulong customCmdBuffAddr = 0, ulong customCmdBuffSize = 0)
+ {
+ KThread serverThread = System.Scheduler.GetCurrentThread();
+ KProcess serverProcess = serverThread.Owner;
+
+ System.CriticalSection.Enter();
+
+ if (_activeRequest == null)
+ {
+ System.CriticalSection.Leave();
+
+ return KernelResult.InvalidState;
+ }
+
+ KSessionRequest request = _activeRequest;
+
+ _activeRequest = null;
+
+ if (_requests.Count != 0)
+ {
+ Signal();
+ }
+
+ System.CriticalSection.Leave();
+
+ KThread clientThread = request.ClientThread;
+ KProcess clientProcess = clientThread.Owner;
+
+ Message clientMsg = new Message(request);
+ Message serverMsg = new Message(serverThread, customCmdBuffAddr, customCmdBuffSize);
+
+ MessageHeader clientHeader = GetClientMessageHeader(clientMsg);
+ MessageHeader serverHeader = GetServerMessageHeader(serverMsg);
+
+ KernelResult clientResult = KernelResult.Success;
+ KernelResult serverResult = KernelResult.Success;
+
+ void CleanUpForError()
+ {
+ CloseAllHandles(clientMsg, serverHeader, clientProcess);
+
+ CancelRequest(request, clientResult);
+ }
+
+ if (clientHeader.ReceiveListType < 2 &&
+ clientHeader.ReceiveListOffset > clientMsg.Size)
+ {
+ CleanUpForError();
+
+ return KernelResult.InvalidCombination;
+ }
+ else if (clientHeader.ReceiveListType == 2 &&
+ clientHeader.ReceiveListOffset + 8 > clientMsg.Size)
+ {
+ CleanUpForError();
+
+ return KernelResult.InvalidCombination;
+ }
+ else if (clientHeader.ReceiveListType > 2 &&
+ clientHeader.ReceiveListType * 8 - 0x10 + clientHeader.ReceiveListOffset > clientMsg.Size)
+ {
+ CleanUpForError();
+
+ return KernelResult.InvalidCombination;
+ }
+
+ if (clientHeader.ReceiveListOffsetInWords < clientHeader.MessageSizeInWords)
+ {
+ CleanUpForError();
+
+ return KernelResult.InvalidCombination;
+ }
+
+ if (serverHeader.MessageSizeInWords * 4 > clientMsg.Size)
+ {
+ CleanUpForError();
+
+ return KernelResult.CmdBufferTooSmall;
+ }
+
+ if (serverHeader.SendBuffersCount != 0 ||
+ serverHeader.ReceiveBuffersCount != 0 ||
+ serverHeader.ExchangeBuffersCount != 0)
+ {
+ CleanUpForError();
+
+ return KernelResult.InvalidCombination;
+ }
+
+ //Read receive list.
+ ulong[] receiveList = GetReceiveList(
+ clientMsg,
+ clientHeader.ReceiveListType,
+ clientHeader.ReceiveListOffset);
+
+ //Copy receive and exchange buffers.
+ clientResult = request.BufferDescriptorTable.CopyBuffersToClient(clientProcess.MemoryManager);
+
+ if (clientResult != KernelResult.Success)
+ {
+ CleanUpForError();
+
+ return serverResult;
+ }
+
+ //Copy header.
+ System.Device.Memory.WriteUInt32((long)clientMsg.DramAddress + 0, serverHeader.Word0);
+ System.Device.Memory.WriteUInt32((long)clientMsg.DramAddress + 4, serverHeader.Word1);
+
+ //Copy handles.
+ uint offset;
+
+ if (serverHeader.HasHandles)
+ {
+ offset = 3;
+
+ System.Device.Memory.WriteUInt32((long)clientMsg.DramAddress + 8, serverHeader.Word2);
+
+ if (serverHeader.HasPid)
+ {
+ System.Device.Memory.WriteInt64((long)clientMsg.DramAddress + offset * 4, serverProcess.Pid);
+
+ offset += 2;
+ }
+
+ for (int index = 0; index < serverHeader.CopyHandlesCount; index++)
+ {
+ int newHandle = 0;
+
+ int handle = serverProcess.CpuMemory.ReadInt32((long)serverMsg.Address + offset * 4);
+
+ if (handle != 0)
+ {
+ GetCopyObjectHandle(serverThread, clientProcess, handle, out newHandle);
+ }
+
+ System.Device.Memory.WriteInt32((long)clientMsg.DramAddress + offset * 4, newHandle);
+
+ offset++;
+ }
+
+ for (int index = 0; index < serverHeader.MoveHandlesCount; index++)
+ {
+ int newHandle = 0;
+
+ int handle = serverProcess.CpuMemory.ReadInt32((long)serverMsg.Address + offset * 4);
+
+ if (handle != 0)
+ {
+ if (clientResult == KernelResult.Success)
+ {
+ clientResult = GetMoveObjectHandle(serverProcess, clientProcess, handle, out newHandle);
+ }
+ else
+ {
+ serverProcess.HandleTable.CloseHandle(handle);
+ }
+ }
+
+ System.Device.Memory.WriteInt32((long)clientMsg.DramAddress + offset * 4, newHandle);
+
+ offset++;
+ }
+ }
+ else
+ {
+ offset = 2;
+ }
+
+ //Copy pointer/receive list buffers.
+ uint recvListDstOffset = 0;
+
+ for (int index = 0; index < serverHeader.PointerBuffersCount; index++)
+ {
+ ulong pointerDesc = serverProcess.CpuMemory.ReadUInt64((long)serverMsg.Address + offset * 4);
+
+ PointerBufferDesc descriptor = new PointerBufferDesc(pointerDesc);
+
+ if (descriptor.BufferSize != 0)
+ {
+ clientResult = GetReceiveListAddress(
+ descriptor,
+ clientMsg,
+ clientHeader.ReceiveListType,
+ serverHeader.MessageSizeInWords,
+ receiveList,
+ ref recvListDstOffset,
+ out ulong recvListBufferAddress);
+
+ if (clientResult != KernelResult.Success)
+ {
+ CleanUpForError();
+
+ return serverResult;
+ }
+
+ clientResult = clientProcess.MemoryManager.CopyDataFromCurrentProcess(
+ recvListBufferAddress,
+ descriptor.BufferSize,
+ MemoryState.IsPoolAllocated,
+ MemoryState.IsPoolAllocated,
+ MemoryPermission.Read,
+ MemoryAttribute.Uncached,
+ MemoryAttribute.None,
+ descriptor.BufferAddress);
+
+ if (clientResult != KernelResult.Success)
+ {
+ CleanUpForError();
+
+ return serverResult;
+ }
+ }
+
+ offset += 2;
+ }
+
+ //Set send, receive and exchange buffer descriptors to zero.
+ uint totalBuffersCount =
+ serverHeader.SendBuffersCount +
+ serverHeader.ReceiveBuffersCount +
+ serverHeader.ExchangeBuffersCount;
+
+ for (int index = 0; index < totalBuffersCount; index++)
+ {
+ long dstDescAddress = (long)clientMsg.DramAddress + offset * 4;
+
+ System.Device.Memory.WriteUInt32(dstDescAddress + 0, 0);
+ System.Device.Memory.WriteUInt32(dstDescAddress + 4, 0);
+ System.Device.Memory.WriteUInt32(dstDescAddress + 8, 0);
+
+ offset += 3;
+ }
+
+ //Copy raw data.
+ if (serverHeader.RawDataSizeInWords != 0)
+ {
+ ulong copyDst = clientMsg.Address + offset * 4;
+ ulong copySrc = serverMsg.Address + offset * 4;
+
+ ulong copySize = serverHeader.RawDataSizeInWords * 4;
+
+ if (serverMsg.IsCustom || clientMsg.IsCustom)
+ {
+ MemoryPermission permission = clientMsg.IsCustom
+ ? MemoryPermission.None
+ : MemoryPermission.Read;
+
+ clientResult = clientProcess.MemoryManager.CopyDataFromCurrentProcess(
+ copyDst,
+ copySize,
+ MemoryState.IsPoolAllocated,
+ MemoryState.IsPoolAllocated,
+ permission,
+ MemoryAttribute.Uncached,
+ MemoryAttribute.None,
+ copySrc);
+ }
+ else
+ {
+ copyDst = clientProcess.MemoryManager.GetDramAddressFromVa(copyDst);
+ copySrc = serverProcess.MemoryManager.GetDramAddressFromVa(copySrc);
+
+ System.Device.Memory.Copy(copyDst, copySrc, copySize);
+ }
+ }
+
+ //Unmap buffers from server.
+ clientResult = request.BufferDescriptorTable.UnmapServerBuffers(serverProcess.MemoryManager);
+
+ if (clientResult != KernelResult.Success)
+ {
+ CleanUpForError();
+
+ return serverResult;
+ }
+
+ WakeClientThread(request, clientResult);
+
+ return serverResult;
+ }
+
+ private MessageHeader GetClientMessageHeader(Message clientMsg)
+ {
+ uint word0 = System.Device.Memory.ReadUInt32((long)clientMsg.DramAddress + 0);
+ uint word1 = System.Device.Memory.ReadUInt32((long)clientMsg.DramAddress + 4);
+ uint word2 = System.Device.Memory.ReadUInt32((long)clientMsg.DramAddress + 8);
+
+ return new MessageHeader(word0, word1, word2);
+ }
+
+ private MessageHeader GetServerMessageHeader(Message serverMsg)
+ {
+ KProcess currentProcess = System.Scheduler.GetCurrentProcess();
+
+ uint word0 = currentProcess.CpuMemory.ReadUInt32((long)serverMsg.Address + 0);
+ uint word1 = currentProcess.CpuMemory.ReadUInt32((long)serverMsg.Address + 4);
+ uint word2 = currentProcess.CpuMemory.ReadUInt32((long)serverMsg.Address + 8);
+
+ return new MessageHeader(word0, word1, word2);
+ }
+
+ private KernelResult GetCopyObjectHandle(
+ KThread srcThread,
+ KProcess dstProcess,
+ int srcHandle,
+ out int dstHandle)
+ {
+ dstHandle = 0;
+
+ KProcess srcProcess = srcThread.Owner;
+
+ KAutoObject obj;
+
+ if (srcHandle == KHandleTable.SelfProcessHandle)
+ {
+ obj = srcProcess;
+ }
+ else if (srcHandle == KHandleTable.SelfThreadHandle)
+ {
+ obj = srcThread;
+ }
+ else
+ {
+ obj = srcProcess.HandleTable.GetObject<KAutoObject>(srcHandle);
+ }
+
+ if (obj != null)
+ {
+ return dstProcess.HandleTable.GenerateHandle(obj, out dstHandle);
+ }
+ else
+ {
+ return KernelResult.InvalidHandle;
+ }
+ }
+
+ private KernelResult GetMoveObjectHandle(
+ KProcess srcProcess,
+ KProcess dstProcess,
+ int srcHandle,
+ out int dstHandle)
+ {
+ dstHandle = 0;
+
+ KAutoObject obj = srcProcess.HandleTable.GetObject<KAutoObject>(srcHandle);
+
+ if (obj != null)
+ {
+ KernelResult result = dstProcess.HandleTable.GenerateHandle(obj, out dstHandle);
+
+ srcProcess.HandleTable.CloseHandle(srcHandle);
+
+ return result;
+ }
+ else
+ {
+ return KernelResult.InvalidHandle;
+ }
+ }
+
+ private ulong[] GetReceiveList(Message message, uint recvListType, uint recvListOffset)
+ {
+ int recvListSize = 0;
+
+ if (recvListType >= 3)
+ {
+ recvListSize = (int)recvListType - 2;
+ }
+ else if (recvListType == 2)
+ {
+ recvListSize = 1;
+ }
+
+ ulong[] receiveList = new ulong[recvListSize];
+
+ long recvListAddress = (long)message.DramAddress + recvListOffset;
+
+ for (int index = 0; index < recvListSize; index++)
+ {
+ receiveList[index] = System.Device.Memory.ReadUInt64(recvListAddress + index * 8);
+ }
+
+ return receiveList;
+ }
+
+ private KernelResult GetReceiveListAddress(
+ PointerBufferDesc descriptor,
+ Message message,
+ uint recvListType,
+ uint messageSizeInWords,
+ ulong[] receiveList,
+ ref uint dstOffset,
+ out ulong address)
+ {
+ ulong recvListBufferAddress = address = 0;
+
+ if (recvListType == 0)
+ {
+ return KernelResult.OutOfResource;
+ }
+ else if (recvListType == 1 || recvListType == 2)
+ {
+ ulong recvListBaseAddr;
+ ulong recvListEndAddr;
+
+ if (recvListType == 1)
+ {
+ recvListBaseAddr = message.Address + messageSizeInWords * 4;
+ recvListEndAddr = message.Address + message.Size;
+ }
+ else /* if (recvListType == 2) */
+ {
+ ulong packed = receiveList[0];
+
+ recvListBaseAddr = packed & 0x7fffffffff;
+
+ uint size = (uint)(packed >> 48);
+
+ if (size == 0)
+ {
+ return KernelResult.OutOfResource;
+ }
+
+ recvListEndAddr = recvListBaseAddr + size;
+ }
+
+ recvListBufferAddress = BitUtils.AlignUp(recvListBaseAddr + dstOffset, 0x10);
+
+ ulong endAddress = recvListBufferAddress + descriptor.BufferSize;
+
+ dstOffset = (uint)endAddress - (uint)recvListBaseAddr;
+
+ if (recvListBufferAddress + descriptor.BufferSize <= recvListBufferAddress ||
+ recvListBufferAddress + descriptor.BufferSize > recvListEndAddr)
+ {
+ return KernelResult.OutOfResource;
+ }
+ }
+ else /* if (recvListType > 2) */
+ {
+ if (descriptor.ReceiveIndex >= receiveList.Length)
+ {
+ return KernelResult.OutOfResource;
+ }
+
+ ulong packed = receiveList[descriptor.ReceiveIndex];
+
+ recvListBufferAddress = packed & 0x7fffffffff;
+
+ uint size = (uint)(packed >> 48);
+
+ if (recvListBufferAddress == 0 || size == 0 || size < descriptor.BufferSize)
+ {
+ return KernelResult.OutOfResource;
+ }
+ }
+
+ address = recvListBufferAddress;
+
+ return KernelResult.Success;
+ }
+
+ private void CloseAllHandles(Message message, MessageHeader header, KProcess process)
+ {
+ if (header.HasHandles)
+ {
+ uint totalHandeslCount = header.CopyHandlesCount + header.MoveHandlesCount;
+
+ uint offset = 3;
+
+ if (header.HasPid)
+ {
+ process.CpuMemory.WriteInt64((long)message.Address + offset * 4, 0);
+
+ offset += 2;
+ }
+
+ for (int index = 0; index < totalHandeslCount; index++)
+ {
+ int handle = process.CpuMemory.ReadInt32((long)message.Address + offset * 4);
+
+ if (handle != 0)
+ {
+ process.HandleTable.CloseHandle(handle);
+
+ process.CpuMemory.WriteInt32((long)message.Address + offset * 4, 0);
+ }
+
+ offset++;
+ }
+ }
+ }
+
+ public override bool IsSignaled()
+ {
+ if (_parent.ClientSession.State != ChannelState.Open)
+ {
+ return true;
+ }
+
+ return _requests.Count != 0 && _activeRequest == null;
+ }
+
+ protected override void Destroy()
+ {
+ _parent.DisconnectServer();
+
+ CancelAllRequestsServerDisconnected();
+
+ _parent.DecrementReferenceCount();
+ }
+
+ private void CancelAllRequestsServerDisconnected()
+ {
+ foreach (KSessionRequest request in IterateWithRemovalOfAllRequests())
+ {
+ CancelRequest(request, KernelResult.PortRemoteClosed);
+ }
+ }
+
+ public void CancelAllRequestsClientDisconnected()
+ {
+ foreach (KSessionRequest request in IterateWithRemovalOfAllRequests())
+ {
+ if (request.ClientThread.ShallBeTerminated ||
+ request.ClientThread.SchedFlags == ThreadSchedState.TerminationPending)
+ {
+ continue;
+ }
+
+ //Client sessions can only be disconnected on async requests (because
+ //the client would be otherwise blocked waiting for the response), so
+ //we only need to handle the async case here.
+ if (request.AsyncEvent != null)
+ {
+ SendResultToAsyncRequestClient(request, KernelResult.PortRemoteClosed);
+ }
+ }
+
+ WakeServerThreads(KernelResult.PortRemoteClosed);
+ }
+
+ private IEnumerable<KSessionRequest> IterateWithRemovalOfAllRequests()
+ {
+ System.CriticalSection.Enter();
+
+ if (_activeRequest != null)
+ {
+ KSessionRequest request = _activeRequest;
+
+ _activeRequest = null;
+
+ System.CriticalSection.Leave();
+
+ yield return request;
+ }
+ else
+ {
+ System.CriticalSection.Leave();
+ }
+
+ while (DequeueRequest(out KSessionRequest request))
+ {
+ yield return request;
+ }
+ }
+
+ private bool DequeueRequest(out KSessionRequest request)
+ {
+ request = null;
+
+ System.CriticalSection.Enter();
+
+ bool hasRequest = _requests.First != null;
+
+ if (hasRequest)
+ {
+ request = _requests.First.Value;
+
+ _requests.RemoveFirst();
+ }
+
+ System.CriticalSection.Leave();
+
+ return hasRequest;
+ }
+
+ private void CancelRequest(KSessionRequest request, KernelResult result)
+ {
+ KProcess clientProcess = request.ClientThread.Owner;
+ KProcess serverProcess = request.ServerProcess;
+
+ KernelResult unmapResult = KernelResult.Success;
+
+ if (serverProcess != null)
+ {
+ unmapResult = request.BufferDescriptorTable.UnmapServerBuffers(serverProcess.MemoryManager);
+ }
+
+ if (unmapResult == KernelResult.Success)
+ {
+ request.BufferDescriptorTable.RestoreClientBuffers(clientProcess.MemoryManager);
+ }
+
+ WakeClientThread(request, result);
+ }
+
+ private void WakeClientThread(KSessionRequest request, KernelResult result)
+ {
+ //Wait client thread waiting for a response for the given request.
+ if (request.AsyncEvent != null)
+ {
+ SendResultToAsyncRequestClient(request, result);
+ }
+ else
+ {
+ System.CriticalSection.Enter();
+
+ WakeAndSetResult(request.ClientThread, result);
+
+ System.CriticalSection.Leave();
+ }
+ }
+
+ private void SendResultToAsyncRequestClient(KSessionRequest request, KernelResult result)
+ {
+ KProcess clientProcess = request.ClientThread.Owner;
+
+ ulong address = clientProcess.MemoryManager.GetDramAddressFromVa(request.CustomCmdBuffAddr);
+
+ System.Device.Memory.WriteInt64((long)address + 0, 0);
+ System.Device.Memory.WriteInt32((long)address + 8, (int)result);
+
+ clientProcess.MemoryManager.UnborrowIpcBuffer(
+ request.CustomCmdBuffAddr,
+ request.CustomCmdBuffSize);
+
+ request.AsyncEvent.Signal();
+ }
+
+ private void WakeServerThreads(KernelResult result)
+ {
+ //Wake all server threads waiting for requests.
+ System.CriticalSection.Enter();
+
+ foreach (KThread thread in WaitingThreads)
+ {
+ WakeAndSetResult(thread, result);
+ }
+
+ System.CriticalSection.Leave();
+ }
+
+ private void WakeAndSetResult(KThread thread, KernelResult result)
+ {
+ if ((thread.SchedFlags & ThreadSchedState.LowMask) == ThreadSchedState.Paused)
+ {
+ thread.SignaledObj = null;
+ thread.ObjSyncResult = result;
+
+ thread.Reschedule(ThreadSchedState.Running);
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KSession.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KSession.cs
index f2b30493..cbf689a5 100644
--- a/Ryujinx.HLE/HOS/Kernel/Ipc/KSession.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KSession.cs
@@ -1,18 +1,40 @@
-using Ryujinx.HLE.HOS.Services;
+using Ryujinx.HLE.HOS.Kernel.Common;
+using Ryujinx.HLE.HOS.Kernel.Process;
using System;
namespace Ryujinx.HLE.HOS.Kernel.Ipc
{
- class KSession : IDisposable
+ class KSession : KAutoObject, IDisposable
{
- public IpcService Service { get; private set; }
+ public KServerSession ServerSession { get; }
+ public KClientSession ClientSession { get; }
- public string ServiceName { get; private set; }
+ private bool _hasBeenInitialized;
- public KSession(IpcService service, string serviceName)
+ public KSession(Horizon system) : base(system)
{
- Service = service;
- ServiceName = serviceName;
+ ServerSession = new KServerSession(system, this);
+ ClientSession = new KClientSession(system, this);
+
+ _hasBeenInitialized = true;
+ }
+
+ public void DisconnectClient()
+ {
+ if (ClientSession.State == ChannelState.Open)
+ {
+ ClientSession.State = ChannelState.ClientDisconnected;
+
+ ServerSession.CancelAllRequestsClientDisconnected();
+ }
+ }
+
+ public void DisconnectServer()
+ {
+ if (ClientSession.State == ChannelState.Open)
+ {
+ ClientSession.State = ChannelState.ServerDisconnected;
+ }
}
public void Dispose()
@@ -22,10 +44,22 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
protected virtual void Dispose(bool disposing)
{
- if (disposing && Service is IDisposable disposableService)
+ if (disposing && ClientSession.Service is IDisposable disposableService)
{
disposableService.Dispose();
}
}
+
+ protected override void Destroy()
+ {
+ if (_hasBeenInitialized)
+ {
+ KProcess creatorProcess = ClientSession.CreatorProcess;
+
+ creatorProcess.ResourceLimit?.Release(LimitableResource.Session, 1);
+
+ creatorProcess.DecrementReferenceCount();
+ }
+ }
}
} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KSessionRequest.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KSessionRequest.cs
new file mode 100644
index 00000000..f3467f39
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KSessionRequest.cs
@@ -0,0 +1,31 @@
+using Ryujinx.HLE.HOS.Kernel.Process;
+using Ryujinx.HLE.HOS.Kernel.Threading;
+
+namespace Ryujinx.HLE.HOS.Kernel.Ipc
+{
+ class KSessionRequest
+ {
+ public KBufferDescriptorTable BufferDescriptorTable { get; }
+
+ public KThread ClientThread { get; }
+
+ public KProcess ServerProcess { get; set; }
+
+ public KWritableEvent AsyncEvent { get; }
+
+ public ulong CustomCmdBuffAddr { get; }
+ public ulong CustomCmdBuffSize { get; }
+
+ public KSessionRequest(
+ KThread clientThread,
+ ulong customCmdBuffAddr,
+ ulong customCmdBuffSize)
+ {
+ ClientThread = clientThread;
+ CustomCmdBuffAddr = customCmdBuffAddr;
+ CustomCmdBuffSize = customCmdBuffSize;
+
+ BufferDescriptorTable = new KBufferDescriptorTable();
+ }
+ }
+} \ No newline at end of file