IPC refactor part 3+4: New server HIPC message processor (#4188)
* IPC refactor part 3 + 4: New server HIPC message processor with source generator based serialization * Make types match on calls to AlignUp/AlignDown * Formatting * Address some PR feedback * Move BitfieldExtensions to Ryujinx.Common.Utilities and consolidate implementations * Rename Reader/Writer to SpanReader/SpanWriter and move to Ryujinx.Common.Memory * Implement EventType * Address more PR feedback * Log request processing errors since they are not normal * Rename waitable to multiwait and add missing lock * PR feedback * Ac_K PR feedback
This commit is contained in:
parent
c6a139a6e7
commit
08831eecf7
213 changed files with 9762 additions and 1010 deletions
20
Ryujinx.Horizon/Sm/Impl/ServiceInfo.cs
Normal file
20
Ryujinx.Horizon/Sm/Impl/ServiceInfo.cs
Normal file
|
@ -0,0 +1,20 @@
|
|||
using Ryujinx.Horizon.Sdk.Sm;
|
||||
|
||||
namespace Ryujinx.Horizon.Sm.Impl
|
||||
{
|
||||
struct ServiceInfo
|
||||
{
|
||||
public ServiceName Name;
|
||||
public ulong OwnerProcessId;
|
||||
public int PortHandle;
|
||||
|
||||
public void Free()
|
||||
{
|
||||
HorizonStatic.Syscall.CloseHandle(PortHandle);
|
||||
|
||||
Name = ServiceName.Invalid;
|
||||
OwnerProcessId = 0L;
|
||||
PortHandle = 0;
|
||||
}
|
||||
}
|
||||
}
|
197
Ryujinx.Horizon/Sm/Impl/ServiceManager.cs
Normal file
197
Ryujinx.Horizon/Sm/Impl/ServiceManager.cs
Normal file
|
@ -0,0 +1,197 @@
|
|||
using Ryujinx.Horizon.Common;
|
||||
using Ryujinx.Horizon.Sdk.OsTypes;
|
||||
using Ryujinx.Horizon.Sdk.Sf;
|
||||
using Ryujinx.Horizon.Sdk.Sm;
|
||||
|
||||
namespace Ryujinx.Horizon.Sm.Impl
|
||||
{
|
||||
class ServiceManager
|
||||
{
|
||||
private const int MaxServicesCount = 256;
|
||||
|
||||
private readonly ServiceInfo[] _services;
|
||||
|
||||
public ServiceManager()
|
||||
{
|
||||
_services = new ServiceInfo[MaxServicesCount];
|
||||
}
|
||||
|
||||
public Result GetService(out int handle, ulong processId, ServiceName name)
|
||||
{
|
||||
handle = 0;
|
||||
Result result = ValidateServiceName(name);
|
||||
|
||||
if (result.IsFailure)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
||||
// TODO: Validation with GetProcessInfo etc.
|
||||
|
||||
int serviceIndex = GetServiceInfo(name);
|
||||
|
||||
if (serviceIndex < 0)
|
||||
{
|
||||
return SfResult.RequestDeferredByUser;
|
||||
}
|
||||
|
||||
result = GetServiceImpl(out handle, ref _services[serviceIndex]);
|
||||
|
||||
if (result == KernelResult.SessionCountExceeded)
|
||||
{
|
||||
return SmResult.OutOfSessions;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private Result GetServiceImpl(out int handle, ref ServiceInfo serviceInfo)
|
||||
{
|
||||
return HorizonStatic.Syscall.ConnectToPort(out handle, serviceInfo.PortHandle);
|
||||
}
|
||||
|
||||
public Result RegisterService(out int handle, ulong processId, ServiceName name, int maxSessions, bool isLight)
|
||||
{
|
||||
handle = 0;
|
||||
Result result = ValidateServiceName(name);
|
||||
|
||||
if (result.IsFailure)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
||||
// TODO: Validation with GetProcessInfo etc.
|
||||
|
||||
if (HasServiceInfo(name))
|
||||
{
|
||||
return SmResult.AlreadyRegistered;
|
||||
}
|
||||
|
||||
return RegisterServiceImpl(out handle, processId, name, maxSessions, isLight);
|
||||
}
|
||||
|
||||
public Result RegisterServiceForSelf(out int handle, ServiceName name, int maxSessions)
|
||||
{
|
||||
return RegisterServiceImpl(out handle, Os.GetCurrentProcessId(), name, maxSessions, false);
|
||||
}
|
||||
|
||||
private Result RegisterServiceImpl(out int handle, ulong processId, ServiceName name, int maxSessions, bool isLight)
|
||||
{
|
||||
handle = 0;
|
||||
|
||||
Result result = ValidateServiceName(name);
|
||||
|
||||
if (!result.IsSuccess)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
||||
if (HasServiceInfo(name))
|
||||
{
|
||||
return SmResult.AlreadyRegistered;
|
||||
}
|
||||
|
||||
int freeServiceIndex = GetFreeService();
|
||||
|
||||
if (freeServiceIndex < 0)
|
||||
{
|
||||
return SmResult.OutOfServices;
|
||||
}
|
||||
|
||||
ref ServiceInfo freeService = ref _services[freeServiceIndex];
|
||||
|
||||
result = HorizonStatic.Syscall.CreatePort(out handle, out int clientPort, maxSessions, isLight, null);
|
||||
|
||||
if (!result.IsSuccess)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
||||
freeService.PortHandle = clientPort;
|
||||
freeService.Name = name;
|
||||
freeService.OwnerProcessId = processId;
|
||||
|
||||
return Result.Success;
|
||||
}
|
||||
|
||||
public Result UnregisterService(ulong processId, ServiceName name)
|
||||
{
|
||||
Result result = ValidateServiceName(name);
|
||||
|
||||
if (result.IsFailure)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
||||
// TODO: Validation with GetProcessInfo etc.
|
||||
|
||||
int serviceIndex = GetServiceInfo(name);
|
||||
|
||||
if (serviceIndex < 0)
|
||||
{
|
||||
return SmResult.NotRegistered;
|
||||
}
|
||||
|
||||
ref var serviceInfo = ref _services[serviceIndex];
|
||||
|
||||
if (serviceInfo.OwnerProcessId != processId)
|
||||
{
|
||||
return SmResult.NotAllowed;
|
||||
}
|
||||
|
||||
serviceInfo.Free();
|
||||
return Result.Success;
|
||||
}
|
||||
|
||||
private static Result ValidateServiceName(ServiceName name)
|
||||
{
|
||||
if (name[0] == 0)
|
||||
{
|
||||
return SmResult.InvalidServiceName;
|
||||
}
|
||||
|
||||
int nameLength = 1;
|
||||
|
||||
for (; nameLength < name.Length; nameLength++)
|
||||
{
|
||||
if (name[nameLength] == 0)
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
while (nameLength < name.Length)
|
||||
{
|
||||
if (name[nameLength++] != 0)
|
||||
{
|
||||
return SmResult.InvalidServiceName;
|
||||
}
|
||||
}
|
||||
|
||||
return Result.Success;
|
||||
}
|
||||
|
||||
private bool HasServiceInfo(ServiceName name)
|
||||
{
|
||||
return GetServiceInfo(name) != -1;
|
||||
}
|
||||
|
||||
private int GetFreeService()
|
||||
{
|
||||
return GetServiceInfo(ServiceName.Invalid);
|
||||
}
|
||||
|
||||
private int GetServiceInfo(ServiceName name)
|
||||
{
|
||||
for (int index = 0; index < MaxServicesCount; index++)
|
||||
{
|
||||
if (_services[index].Name == name)
|
||||
{
|
||||
return index;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
}
|
8
Ryujinx.Horizon/Sm/ManagerService.cs
Normal file
8
Ryujinx.Horizon/Sm/ManagerService.cs
Normal file
|
@ -0,0 +1,8 @@
|
|||
using Ryujinx.Horizon.Sdk.Sf;
|
||||
|
||||
namespace Ryujinx.Horizon.Sm
|
||||
{
|
||||
partial class ManagerService : IServiceObject
|
||||
{
|
||||
}
|
||||
}
|
30
Ryujinx.Horizon/Sm/SmMain.cs
Normal file
30
Ryujinx.Horizon/Sm/SmMain.cs
Normal file
|
@ -0,0 +1,30 @@
|
|||
using Ryujinx.Horizon.Sdk.Sf.Hipc;
|
||||
using Ryujinx.Horizon.Sdk.Sm;
|
||||
using Ryujinx.Horizon.Sm.Impl;
|
||||
|
||||
namespace Ryujinx.Horizon.Sm
|
||||
{
|
||||
public class SmMain
|
||||
{
|
||||
private enum PortIndex
|
||||
{
|
||||
User,
|
||||
Manager
|
||||
}
|
||||
|
||||
private const int MaxPortsCount = 2;
|
||||
|
||||
private readonly ServerManager _serverManager = new ServerManager(null, null, MaxPortsCount, ManagerOptions.Default, 0);
|
||||
private readonly ServiceManager _serviceManager = new ServiceManager();
|
||||
|
||||
public void Main()
|
||||
{
|
||||
HorizonStatic.Syscall.ManageNamedPort(out int smHandle, "sm:", 64).AbortOnFailure();
|
||||
|
||||
_serverManager.RegisterServer((int)PortIndex.User, smHandle);
|
||||
_serviceManager.RegisterServiceForSelf(out int smmHandle, ServiceName.Encode("sm:m"), 1).AbortOnFailure();
|
||||
_serverManager.RegisterServer((int)PortIndex.Manager, smmHandle);
|
||||
_serverManager.ServiceRequests();
|
||||
}
|
||||
}
|
||||
}
|
19
Ryujinx.Horizon/Sm/SmResult.cs
Normal file
19
Ryujinx.Horizon/Sm/SmResult.cs
Normal file
|
@ -0,0 +1,19 @@
|
|||
using Ryujinx.Horizon.Common;
|
||||
|
||||
namespace Ryujinx.Horizon.Sm
|
||||
{
|
||||
static class SmResult
|
||||
{
|
||||
private const int ModuleId = 21;
|
||||
|
||||
public static Result OutOfProcess => new Result(ModuleId, 1);
|
||||
public static Result InvalidClient => new Result(ModuleId, 2);
|
||||
public static Result OutOfSessions => new Result(ModuleId, 3);
|
||||
public static Result AlreadyRegistered => new Result(ModuleId, 4);
|
||||
public static Result OutOfServices => new Result(ModuleId, 5);
|
||||
public static Result InvalidServiceName => new Result(ModuleId, 6);
|
||||
public static Result NotRegistered => new Result(ModuleId, 7);
|
||||
public static Result NotAllowed => new Result(ModuleId, 8);
|
||||
public static Result TooLargeAccessControl => new Result(ModuleId, 9);
|
||||
}
|
||||
}
|
66
Ryujinx.Horizon/Sm/UserService.cs
Normal file
66
Ryujinx.Horizon/Sm/UserService.cs
Normal file
|
@ -0,0 +1,66 @@
|
|||
using Ryujinx.Horizon.Common;
|
||||
using Ryujinx.Horizon.Sdk.Sf;
|
||||
using Ryujinx.Horizon.Sdk.Sm;
|
||||
using Ryujinx.Horizon.Sm.Impl;
|
||||
|
||||
namespace Ryujinx.Horizon.Sm
|
||||
{
|
||||
partial class UserService : IServiceObject
|
||||
{
|
||||
private readonly ServiceManager _serviceManager;
|
||||
|
||||
private ulong _clientProcessId;
|
||||
private bool _initialized;
|
||||
|
||||
public UserService(ServiceManager serviceManager)
|
||||
{
|
||||
_serviceManager = serviceManager;
|
||||
}
|
||||
|
||||
[CmifCommand(0)]
|
||||
public Result Initialize([ClientProcessId] ulong clientProcessId)
|
||||
{
|
||||
_clientProcessId = clientProcessId;
|
||||
_initialized = true;
|
||||
|
||||
return Result.Success;
|
||||
}
|
||||
|
||||
[CmifCommand(1)]
|
||||
public Result GetService([MoveHandle] out int handle, ServiceName name)
|
||||
{
|
||||
if (!_initialized)
|
||||
{
|
||||
handle = 0;
|
||||
|
||||
return SmResult.InvalidClient;
|
||||
}
|
||||
|
||||
return _serviceManager.GetService(out handle, _clientProcessId, name);
|
||||
}
|
||||
|
||||
[CmifCommand(2)]
|
||||
public Result RegisterService([MoveHandle] out int handle, ServiceName name, int maxSessions, bool isLight)
|
||||
{
|
||||
if (!_initialized)
|
||||
{
|
||||
handle = 0;
|
||||
|
||||
return SmResult.InvalidClient;
|
||||
}
|
||||
|
||||
return _serviceManager.RegisterService(out handle, _clientProcessId, name, maxSessions, isLight);
|
||||
}
|
||||
|
||||
[CmifCommand(3)]
|
||||
public Result UnregisterService(ServiceName name)
|
||||
{
|
||||
if (!_initialized)
|
||||
{
|
||||
return SmResult.InvalidClient;
|
||||
}
|
||||
|
||||
return _serviceManager.UnregisterService(_clientProcessId, name);
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue