vance/ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Horizon: Impl Prepo, Fixes bugs, Clean things (#4220)

Browse Source 
* Horizon: Impl Prepo, Fixes bugs, Clean things

* remove ToArray()

* resultCode > status

* Remove old services

* Addresses gdkchan's comments and more cleanup

* Addresses Gdkchan's feedback 2

* Reorganize services, make sure service are loaded before guest

Co-Authored-By: gdkchan <5624669+gdkchan@users.noreply.github.com>

* Create interfaces for lm and sm

Co-authored-by: gdkchan <5624669+gdkchan@users.noreply.github.com>
This commit is contained in:
Ac_K 2023-01-08 13:13:39 +01:00 committed by GitHub
parent 3ffceab1fb
commit 550747eac6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
83 changed files with 1106 additions and 880 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Ryujinx.HLE/HOS/Horizon.cs
View File

@ -123,6 +123,8 @@ namespace Ryujinx.HLE.HOS
internal LibHacHorizonManager LibHacHorizonManager { get; private set; } internal LibHacHorizonManager LibHacHorizonManager { get; private set; }
internal ServiceTable ServiceTable { get; private set; }
public bool IsPaused { get; private set; } public bool IsPaused { get; private set; }
public Horizon(Switch device) public Horizon(Switch device)
@ -326,6 +328,7 @@ namespace Ryujinx.HLE.HOS
private void StartNewServices() private void StartNewServices()
{ {
ServiceTable = new ServiceTable();
var services = ServiceTable.GetServices(new HorizonOptions(Device.Configuration.IgnoreMissingServices)); var services = ServiceTable.GetServices(new HorizonOptions(Device.Configuration.IgnoreMissingServices));
foreach (var service in services) foreach (var service in services)

2
Ryujinx.HLE/HOS/ProgramLoader.cs
View File

@ -182,6 +182,8 @@ namespace Ryujinx.HLE.HOS
byte[] arguments = null, byte[] arguments = null,
params IExecutable[] executables) params IExecutable[] executables)
{ {
context.Device.System.ServiceTable.WaitServicesReady();
LibHac.Result rc = metaData.GetNpdm(out var npdm); LibHac.Result rc = metaData.GetNpdm(out var npdm);
if (rc.IsFailure()) if (rc.IsFailure())

19
Ryujinx.HLE/HOS/Services/Lm/ILogService.cs
View File

@ -1,19 +0,0 @@
using Ryujinx.HLE.HOS.Services.Lm.LogService;
namespace Ryujinx.HLE.HOS.Services.Lm
{
[Service("lm")]
class ILogService : IpcService
{
public ILogService(ServiceCtx context) { }
[CommandHipc(0)]
// Initialize(u64, pid) -> object<nn::lm::ILogger>
public ResultCode Initialize(ServiceCtx context)
{
MakeObject(context, new ILogger());
return ResultCode.Success;
}
}
}

109
Ryujinx.HLE/HOS/Services/Lm/LogService/ILogger.cs
View File

@ -1,109 +0,0 @@
using Ryujinx.Common.Logging;
using System.IO;
using System.Text;
namespace Ryujinx.HLE.HOS.Services.Lm.LogService
{
class ILogger : IpcService
{
public ILogger() { }
[CommandHipc(0)]
// Log(buffer<unknown, 0x21>)
public ResultCode Log(ServiceCtx context)
{
Logger.Guest?.Print(LogClass.ServiceLm, LogImpl(context));
return ResultCode.Success;
}
private string LogImpl(ServiceCtx context)
{
(ulong bufPos, ulong bufSize) = context.Request.GetBufferType0x21();
byte[] logBuffer = new byte[bufSize];
context.Memory.Read(bufPos, logBuffer);
using MemoryStream ms = new MemoryStream(logBuffer);
BinaryReader reader = new BinaryReader(ms);
long pid = reader.ReadInt64();
long threadContext = reader.ReadInt64();
short flags = reader.ReadInt16();
byte level = reader.ReadByte();
byte verbosity = reader.ReadByte();
int payloadLength = reader.ReadInt32();
StringBuilder sb = new StringBuilder();
sb.AppendLine($"Guest Log:\n Log level: {(LmLogLevel)level}");
while (ms.Position < ms.Length)
{
int type = ReadEncodedInt(reader);
int size = ReadEncodedInt(reader);
LmLogField field = (LmLogField)type;
string fieldStr = string.Empty;
if (field == LmLogField.Start)
{
reader.ReadBytes(size);
continue;
}
else if (field == LmLogField.Stop)
{
break;
}
else if (field == LmLogField.Line)
{
fieldStr = $"{field}: {reader.ReadInt32()}";
}
else if (field == LmLogField.DropCount)
{
fieldStr = $"{field}: {reader.ReadInt64()}";
}
else if (field == LmLogField.Time)
{
fieldStr = $"{field}: {reader.ReadInt64()}s";
}
else if (field < LmLogField.Count)
{
fieldStr = $"{field}: '{Encoding.UTF8.GetString(reader.ReadBytes(size)).TrimEnd()}'";
}
else
{
fieldStr = $"Field{field}: '{Encoding.UTF8.GetString(reader.ReadBytes(size)).TrimEnd()}'";
}
sb.AppendLine($" {fieldStr}");
}
return sb.ToString();
}
private static int ReadEncodedInt(BinaryReader reader)
{
int result = 0;
int position = 0;
byte encoded;
do
{
encoded = reader.ReadByte();
result += (encoded & 0x7F) << (7 * position);
position++;
} while ((encoded & 0x80) != 0);
return result;
}
}
}

18
Ryujinx.HLE/HOS/Services/Lm/LogService/Types/LmLogField.cs
View File

@ -1,18 +0,0 @@
namespace Ryujinx.HLE.HOS.Services.Lm.LogService
{
enum LmLogField
{
Start = 0,
Stop = 1,
Message = 2,
Line = 3,
Filename = 4,
Function = 5,
Module = 6,
Thread = 7,
DropCount = 8,
Time = 9,
ProgramName = 10,
Count
}
}

11
Ryujinx.HLE/HOS/Services/Lm/LogService/Types/LmLogLevel.cs
View File

@ -1,11 +0,0 @@
namespace Ryujinx.HLE.HOS.Services.Lm.LogService
{
enum LmLogLevel
{
Trace,
Info,
Warning,
Error,
Critical
}
}

182
Ryujinx.HLE/HOS/Services/Prepo/IPrepoService.cs
View File

@ -1,182 +0,0 @@
using MsgPack;
using MsgPack.Serialization;
using Ryujinx.Common;
using Ryujinx.Common.Logging;
using Ryujinx.Common.Utilities;
using Ryujinx.HLE.HOS.Services.Account.Acc;
using Ryujinx.HLE.Utilities;
using System;
using System.Text;
namespace Ryujinx.HLE.HOS.Services.Prepo
{
[Service("prepo:a", PrepoServicePermissionLevel.Admin)] // 1.0.0-5.1.0
[Service("prepo:a2", PrepoServicePermissionLevel.Admin)] // 6.0.0+
[Service("prepo:m", PrepoServicePermissionLevel.Manager)]
[Service("prepo:u", PrepoServicePermissionLevel.User)]
[Service("prepo:s", PrepoServicePermissionLevel.System)]
class IPrepoService : IpcService
{
private PrepoServicePermissionLevel _permission;
private ulong _systemSessionId;
public IPrepoService(ServiceCtx context, PrepoServicePermissionLevel permission)
{
_permission = permission;
}
[CommandHipc(10100)] // 1.0.0-5.1.0
[CommandHipc(10102)] // 6.0.0-9.2.0
[CommandHipc(10104)] // 10.0.0+
// SaveReport(u64, pid, buffer<u8, 9>, buffer<bytes, 5>)
public ResultCode SaveReport(ServiceCtx context)
{
if ((_permission & PrepoServicePermissionLevel.User) == 0)
{
return ResultCode.PermissionDenied;
}
// We don't care about the differences since we don't use the play report.
return ProcessReport(context, withUserID: false);
}
[CommandHipc(10101)] // 1.0.0-5.1.0
[CommandHipc(10103)] // 6.0.0-9.2.0
[CommandHipc(10105)] // 10.0.0+
// SaveReportWithUser(nn::account::Uid, u64, pid, buffer<u8, 9>, buffer<bytes, 5>)
public ResultCode SaveReportWithUser(ServiceCtx context)
{
if ((_permission & PrepoServicePermissionLevel.User) == 0)
{
return ResultCode.PermissionDenied;
}
// We don't care about the differences since we don't use the play report.
return ProcessReport(context, withUserID: true);
}
[CommandHipc(10200)]
// RequestImmediateTransmission()
public ResultCode RequestImmediateTransmission(ServiceCtx context)
{
// It signals an event of nn::prepo::detail::service::core::TransmissionStatusManager that requests the transmission of the report.
// Since we don't use reports it's fine to do nothing.
return ResultCode.Success;
}
[CommandHipc(10300)]
// GetTransmissionStatus() -> u32
public ResultCode GetTransmissionStatus(ServiceCtx context)
{
// It returns the transmission result of nn::prepo::detail::service::core::TransmissionStatusManager.
// Since we don't use reports it's fine to return ResultCode.Success.
context.ResponseData.Write((int)ResultCode.Success);
return ResultCode.Success;
}
[CommandHipc(10400)] // 9.0.0+
// GetSystemSessionId() -> u64
public ResultCode GetSystemSessionId(ServiceCtx context)
{
if ((_permission & PrepoServicePermissionLevel.User) == 0)
{
return ResultCode.PermissionDenied;
}
if (_systemSessionId == 0)
{
byte[] randomBuffer = new byte[8];
Random.Shared.NextBytes(randomBuffer);
_systemSessionId = BitConverter.ToUInt64(randomBuffer, 0);
}
context.ResponseData.Write(_systemSessionId);
return ResultCode.Success;
}
[CommandHipc(20100)]
// SaveSystemReport(u64, pid, buffer<u8, 9>, buffer<bytes, 5>)
public ResultCode SaveSystemReport(ServiceCtx context)
{
if ((_permission & PrepoServicePermissionLevel.System) != 0)
{
return ResultCode.PermissionDenied;
}
// We don't care about the differences since we don't use the play report.
return ProcessReport(context, withUserID: false);
}
[CommandHipc(20101)]
// SaveSystemReportWithUser(nn::account::Uid, u64, pid, buffer<u8, 9>, buffer<bytes, 5>)
public ResultCode SaveSystemReportWithUser(ServiceCtx context)
{
if ((_permission & PrepoServicePermissionLevel.System) != 0)
{
return ResultCode.PermissionDenied;
}
// We don't care about the differences since we don't use the play report.
return ProcessReport(context, withUserID: true);
}
private ResultCode ProcessReport(ServiceCtx context, bool withUserID)
{
UserId userId = withUserID ? context.RequestData.ReadStruct<UserId>() : new UserId();
string gameRoom = StringUtils.ReadUtf8String(context);
if (withUserID)
{
if (userId.IsNull)
{
return ResultCode.InvalidArgument;
}
}
if (gameRoom == string.Empty)
{
return ResultCode.InvalidState;
}
ulong inputPosition = context.Request.SendBuff[0].Position;
ulong inputSize = context.Request.SendBuff[0].Size;
if (inputSize == 0)
{
return ResultCode.InvalidBufferSize;
}
byte[] inputBuffer = new byte[inputSize];
context.Memory.Read(inputPosition, inputBuffer);
Logger.Info?.Print(LogClass.ServicePrepo, ReadReportBuffer(inputBuffer, gameRoom, userId));
return ResultCode.Success;
}
private string ReadReportBuffer(byte[] buffer, string room, UserId userId)
{
StringBuilder builder = new StringBuilder();
MessagePackObject deserializedReport = MessagePackSerializer.UnpackMessagePackObject(buffer);
builder.AppendLine();
builder.AppendLine("PlayReport log:");
if (!userId.IsNull)
{
builder.AppendLine($" UserId: {userId}");
}
builder.AppendLine($" Room: {room}");
builder.AppendLine($" Report: {MessagePackObjectFormatter.Format(deserializedReport)}");
return builder.ToString();
}
}
}

15
Ryujinx.HLE/HOS/Services/Prepo/ResultCode.cs
View File

@ -1,15 +0,0 @@
namespace Ryujinx.HLE.HOS.Services.Prepo
{
enum ResultCode
{
ModuleId = 129,
ErrorCodeShift = 9,
Success = 0,
InvalidArgument = (1 << ErrorCodeShift) | ModuleId,
InvalidState = (5 << ErrorCodeShift) | ModuleId,
InvalidBufferSize = (9 << ErrorCodeShift) | ModuleId,
PermissionDenied = (90 << ErrorCodeShift) | ModuleId
}
}

2
Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs
View File

@ -180,7 +180,7 @@ namespace Ryujinx.HLE.HOS.Services.Sm
return ResultCode.InvalidName; return ResultCode.InvalidName;
} }
Logger.Info?.Print(LogClass.ServiceSm, $"Register \"{name}\"."); Logger.Debug?.Print(LogClass.ServiceSm, $"Register \"{name}\".");
KPort port = new KPort(context.Device.System.KernelContext, maxSessions, isLight, null); KPort port = new KPort(context.Device.System.KernelContext, maxSessions, isLight, null);

7
Ryujinx.Horizon.Generators/Hipc/HipcGenerator.cs
View File

@ -123,6 +123,12 @@ namespace Ryujinx.Horizon.Generators.Hipc
{ {
string[] args = new string[method.ParameterList.Parameters.Count]; string[] args = new string[method.ParameterList.Parameters.Count];
if (args.Length == 0)
{
generator.AppendLine($"{{ {commandId}, new CommandHandler({method.Identifier.Text}, Array.Empty<CommandArg>()) }},");
}
else
{
int index = 0; int index = 0;
foreach (var parameter in method.ParameterList.Parameters) foreach (var parameter in method.ParameterList.Parameters)
@ -163,6 +169,7 @@ namespace Ryujinx.Horizon.Generators.Hipc
generator.AppendLine($"{{ {commandId}, new CommandHandler({method.Identifier.Text}, {string.Join(", ", args)}) }},"); generator.AppendLine($"{{ {commandId}, new CommandHandler({method.Identifier.Text}, {string.Join(", ", args)}) }},");
} }
} }
}
generator.LeaveScope(";"); generator.LeaveScope(";");
generator.LeaveScope(); generator.LeaveScope();

2
Ryujinx.Horizon/HorizonOptions.cs
View File

@ -3,10 +3,12 @@ namespace Ryujinx.Horizon
public struct HorizonOptions public struct HorizonOptions
{ {
public bool IgnoreMissingServices { get; } public bool IgnoreMissingServices { get; }
public bool ThrowOnInvalidCommandIds { get; }
public HorizonOptions(bool ignoreMissingServices) public HorizonOptions(bool ignoreMissingServices)
{ {
IgnoreMissingServices = ignoreMissingServices; IgnoreMissingServices = ignoreMissingServices;
ThrowOnInvalidCommandIds = true;
} }
} }
} }

2
Ryujinx.Horizon/IService.cs
View File

@ -2,6 +2,6 @@
{ {
interface IService interface IService
{ {
abstract static void Main(); abstract static void Main(ServiceTable serviceTable);
} }
} }

31
Ryujinx.Horizon/LogManager/LmLogger.cs → Ryujinx.Horizon/LogManager/Ipc/LmLogger.cs
View File

@ -9,23 +9,23 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
namespace Ryujinx.Horizon.LogManager namespace Ryujinx.Horizon.LogManager.Ipc
{ {
partial class LmLogger : IServiceObject partial class LmLogger : ILmLogger
{ {
private readonly LmLog _log; private readonly LogService _log;
private readonly ulong _clientProcessId; private readonly ulong _pid;
public LmLogger(LmLog log, ulong clientProcessId) public LmLogger(LogService log, ulong pid)
{ {
_log = log; _log = log;
_clientProcessId = clientProcessId; _pid = pid;
} }
[CmifCommand(0)] [CmifCommand(0)]
public Result Log([Buffer(HipcBufferFlags.In | HipcBufferFlags.AutoSelect)] Span<byte> message) public Result Log([Buffer(HipcBufferFlags.In | HipcBufferFlags.AutoSelect)] Span<byte> message)
{ {
if (!SetProcessId(message, _clientProcessId)) if (!SetProcessId(message, _pid))
{ {
return Result.Success; return Result.Success;
} }
@ -35,7 +35,7 @@ namespace Ryujinx.Horizon.LogManager
return Result.Success; return Result.Success;
} }
[CmifCommand(1)] [CmifCommand(1)] // 3.0.0+
public Result SetDestination(LogDestination destination) public Result SetDestination(LogDestination destination)
{ {
_log.LogDestination = destination; _log.LogDestination = destination;
@ -48,7 +48,6 @@ namespace Ryujinx.Horizon.LogManager
ref LogPacketHeader header = ref MemoryMarshal.Cast<byte, LogPacketHeader>(message)[0]; ref LogPacketHeader header = ref MemoryMarshal.Cast<byte, LogPacketHeader>(message)[0];
uint expectedMessageSize = (uint)Unsafe.SizeOf<LogPacketHeader>() + header.PayloadSize; uint expectedMessageSize = (uint)Unsafe.SizeOf<LogPacketHeader>() + header.PayloadSize;
if (expectedMessageSize != (uint)message.Length) if (expectedMessageSize != (uint)message.Length)
{ {
Logger.Warning?.Print(LogClass.ServiceLm, $"Invalid message size (expected 0x{expectedMessageSize:X} but got 0x{message.Length:X})."); Logger.Warning?.Print(LogClass.ServiceLm, $"Invalid message size (expected 0x{expectedMessageSize:X} but got 0x{message.Length:X}).");
@ -63,13 +62,11 @@ namespace Ryujinx.Horizon.LogManager
private static string LogImpl(ReadOnlySpan<byte> message) private static string LogImpl(ReadOnlySpan<byte> message)
{ {
SpanReader reader = new SpanReader(message); SpanReader reader = new(message);
LogPacketHeader header = reader.Read<LogPacketHeader>(); LogPacketHeader header = reader.Read<LogPacketHeader>();
StringBuilder builder = new();
StringBuilder sb = new StringBuilder(); builder.AppendLine($"Guest Log:\n Log level: {header.Severity}");
sb.AppendLine($"Guest Log:\n Log level: {header.Severity}");
while (reader.Length > 0) while (reader.Length > 0)
{ {
@ -78,7 +75,7 @@ namespace Ryujinx.Horizon.LogManager
LogDataChunkKey field = (LogDataChunkKey)type; LogDataChunkKey field = (LogDataChunkKey)type;
string fieldStr = string.Empty; string fieldStr;
if (field == LogDataChunkKey.Start) if (field == LogDataChunkKey.Start)
{ {
@ -111,10 +108,10 @@ namespace Ryujinx.Horizon.LogManager
fieldStr = $"Field{field}: '{Encoding.UTF8.GetString(reader.GetSpan(size)).TrimEnd()}'"; fieldStr = $"Field{field}: '{Encoding.UTF8.GetString(reader.GetSpan(size)).TrimEnd()}'";
} }
sb.AppendLine($" {fieldStr}"); builder.AppendLine($" {fieldStr}");
} }
return sb.ToString(); return builder.ToString();
} }
private static int ReadUleb128(ref SpanReader reader) private static int ReadUleb128(ref SpanReader reader)

9
Ryujinx.Horizon/LogManager/LmLog.cs → Ryujinx.Horizon/LogManager/Ipc/LogService.cs
View File

@ -2,16 +2,17 @@
using Ryujinx.Horizon.Sdk.Lm; using Ryujinx.Horizon.Sdk.Lm;
using Ryujinx.Horizon.Sdk.Sf; using Ryujinx.Horizon.Sdk.Sf;
namespace Ryujinx.Horizon.LogManager namespace Ryujinx.Horizon.LogManager.Ipc
{ {
partial class LmLog : IServiceObject partial class LogService : ILogService
{ {
public LogDestination LogDestination { get; set; } = LogDestination.TargetManager; public LogDestination LogDestination { get; set; } = LogDestination.TargetManager;
[CmifCommand(0)] [CmifCommand(0)]
public Result OpenLogger(out LmLogger logger, [ClientProcessId] ulong clientProcessId) public Result OpenLogger(out LmLogger logger, [ClientProcessId] ulong pid)
{ {
logger = new LmLogger(this, clientProcessId); // NOTE: Internal name is Logger, but we rename it LmLogger to avoid name clash with Ryujinx.Common.Logging logger.
logger = new LmLogger(this, pid);
return Result.Success; return Result.Success;
} }

21
Ryujinx.Horizon/LogManager/LmIpcServer.cs
View File

@ -1,6 +1,6 @@
using Ryujinx.Horizon.Sdk.Sf.Hipc; using Ryujinx.Horizon.LogManager.Ipc;
using Ryujinx.Horizon.Sdk.Sf.Hipc;
using Ryujinx.Horizon.Sdk.Sm; using Ryujinx.Horizon.Sdk.Sm;
using Ryujinx.Horizon.Sm;
namespace Ryujinx.Horizon.LogManager namespace Ryujinx.Horizon.LogManager
{ {
@ -11,34 +11,23 @@ namespace Ryujinx.Horizon.LogManager
private const int PointerBufferSize = 0x400; private const int PointerBufferSize = 0x400;
private const int MaxDomains = 31; private const int MaxDomains = 31;
private const int MaxDomainObjects = 61; private const int MaxDomainObjects = 61;
private const int MaxPortsCount = 1; private const int MaxPortsCount = 1;
private static readonly ManagerOptions _logManagerOptions = new ManagerOptions( private static readonly ManagerOptions _logManagerOptions = new(PointerBufferSize, MaxDomains, MaxDomainObjects, false);
PointerBufferSize,
MaxDomains,
MaxDomainObjects,
false);
private static readonly ServiceName _logServiceName = ServiceName.Encode("lm");
private SmApi _sm; private SmApi _sm;
private ServerManager _serverManager; private ServerManager _serverManager;
private LmLog _logServiceObject;
public void Initialize() public void Initialize()
{ {
HeapAllocator allocator = new HeapAllocator(); HeapAllocator allocator = new();
_sm = new SmApi(); _sm = new SmApi();
_sm.Initialize().AbortOnFailure(); _sm.Initialize().AbortOnFailure();
_serverManager = new ServerManager(allocator, _sm, MaxPortsCount, _logManagerOptions, LogMaxSessionsCount); _serverManager = new ServerManager(allocator, _sm, MaxPortsCount, _logManagerOptions, LogMaxSessionsCount);
_logServiceObject = new LmLog(); _serverManager.RegisterObjectForServer(new LogService(), ServiceName.Encode("lm"), LogMaxSessionsCount);
_serverManager.RegisterObjectForServer(_logServiceObject, _logServiceName, LogMaxSessionsCount);
} }
public void ServiceRequests() public void ServiceRequests()

7
Ryujinx.Horizon/LogManager/LmMain.cs
View File

@ -2,11 +2,14 @@
{ {
class LmMain : IService class LmMain : IService
{ {
public static void Main() public static void Main(ServiceTable serviceTable)
{ {
LmIpcServer ipcServer = new LmIpcServer(); LmIpcServer ipcServer = new();
ipcServer.Initialize(); ipcServer.Initialize();
serviceTable.SignalServiceReady();
ipcServer.ServiceRequests(); ipcServer.ServiceRequests();
ipcServer.Shutdown(); ipcServer.Shutdown();
} }

218
Ryujinx.Horizon/Prepo/Ipc/PrepoService.cs Normal file
View File

@ -0,0 +1,218 @@
using MsgPack;
using MsgPack.Serialization;
using Ryujinx.Common.Logging;
using Ryujinx.Common.Utilities;
using Ryujinx.Horizon.Common;
using Ryujinx.Horizon.Prepo.Types;
using Ryujinx.Horizon.Sdk.Account;
using Ryujinx.Horizon.Sdk.Prepo;
using Ryujinx.Horizon.Sdk.Sf;
using Ryujinx.Horizon.Sdk.Sf.Hipc;
using System;
using System.Text;
namespace Ryujinx.Horizon.Prepo.Ipc
{
partial class PrepoService : IPrepoService
{
enum PlayReportKind
{
Normal,
System
}
private readonly PrepoServicePermissionLevel _permissionLevel;
private ulong _systemSessionId;
private bool _immediateTransmissionEnabled = false;
private bool _userAgreementCheckEnabled = true;
public PrepoService(PrepoServicePermissionLevel permissionLevel)
{
_permissionLevel = permissionLevel;
}
[CmifCommand(10100)] // 1.0.0-5.1.0
[CmifCommand(10102)] // 6.0.0-9.2.0
[CmifCommand(10104)] // 10.0.0+
public Result SaveReport([Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid)
{
if ((_permissionLevel & PrepoServicePermissionLevel.User) == 0)
{
return PrepoResult.PermissionDenied;
}
ProcessPlayReport(PlayReportKind.Normal, pid, gameRoomBuffer, reportBuffer, Uid.Null);
return Result.Success;
}
[CmifCommand(10101)] // 1.0.0-5.1.0
[CmifCommand(10103)] // 6.0.0-9.2.0
[CmifCommand(10105)] // 10.0.0+
public Result SaveReportWithUser(Uid userId, [Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid)
{
if ((_permissionLevel & PrepoServicePermissionLevel.User) == 0)
{
return PrepoResult.PermissionDenied;
}
ProcessPlayReport(PlayReportKind.Normal, pid, gameRoomBuffer, reportBuffer, userId, true);
return Result.Success;
}
[CmifCommand(10200)]
public Result RequestImmediateTransmission()
{
_immediateTransmissionEnabled = true;
// It signals an event of nn::prepo::detail::service::core::TransmissionStatusManager that requests the transmission of the report.
// Since we don't use reports, it's fine to do nothing.
return Result.Success;
}
[CmifCommand(10300)]
public Result GetTransmissionStatus(out int status)
{
status = 0;
if (_immediateTransmissionEnabled && _userAgreementCheckEnabled)
{
status = 1;
}
return Result.Success;
}
[CmifCommand(10400)] // 9.0.0+
public Result GetSystemSessionId(out ulong systemSessionId)
{
systemSessionId = default;
if ((_permissionLevel & PrepoServicePermissionLevel.User) == 0)
{
return PrepoResult.PermissionDenied;
}
if (_systemSessionId == 0)
{
_systemSessionId = (ulong)Random.Shared.NextInt64();
}
systemSessionId = _systemSessionId;
return Result.Success;
}
[CmifCommand(20100)]
public Result SaveSystemReport([Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid)
{
if ((_permissionLevel & PrepoServicePermissionLevel.System) != 0)
{
return PrepoResult.PermissionDenied;
}
return ProcessPlayReport(PlayReportKind.System, pid, gameRoomBuffer, reportBuffer, Uid.Null);
}
[CmifCommand(20101)]
public Result SaveSystemReportWithUser(Uid userId, [Buffer(HipcBufferFlags.In | HipcBufferFlags.Pointer)] ReadOnlySpan<byte> gameRoomBuffer, [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan<byte> reportBuffer, [ClientProcessId] ulong pid)
{
if ((_permissionLevel & PrepoServicePermissionLevel.System) != 0)
{
return PrepoResult.PermissionDenied;
}
return ProcessPlayReport(PlayReportKind.System, pid, gameRoomBuffer, reportBuffer, userId, true);
}
[CmifCommand(40100)] // 2.0.0+
public Result IsUserAgreementCheckEnabled(out bool enabled)
{
enabled = false;
if (_permissionLevel == PrepoServicePermissionLevel.User || _permissionLevel == PrepoServicePermissionLevel.System)
{
enabled = _userAgreementCheckEnabled;
// If "enabled" is false, it sets some internal fields to 0.
// Then, it mounts "prepo-sys:/is_user_agreement_check_enabled.bin" and returns the contained bool.
// We can return the private bool instead, we don't care about the agreement since we don't send reports.
return Result.Success;
}
return PrepoResult.PermissionDenied;
}
[CmifCommand(40101)] // 2.0.0+
public Result SetUserAgreementCheckEnabled(bool enabled)
{
if (_permissionLevel == PrepoServicePermissionLevel.User || _permissionLevel == PrepoServicePermissionLevel.System)
{
_userAgreementCheckEnabled = enabled;
// If "enabled" is false, it sets some internal fields to 0.
// Then, it mounts "prepo-sys:/is_user_agreement_check_enabled.bin" and stores the "enabled" value.
// We can store in the private bool instead, we don't care about the agreement since we don't send reports.
return Result.Success;
}
return PrepoResult.PermissionDenied;
}
private static Result ProcessPlayReport(PlayReportKind playReportKind, ulong pid, ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, Uid userId, bool withUserId = false)
{
if (withUserId)
{
if (userId.IsNull)
{
return PrepoResult.InvalidArgument;
}
}
if (gameRoomBuffer.Length > 31)
{
return PrepoResult.InvalidArgument;
}
string gameRoom = Encoding.UTF8.GetString(gameRoomBuffer).TrimEnd();
if (gameRoom == string.Empty)
{
return PrepoResult.InvalidState;
}
if (reportBuffer.Length == 0)
{
return PrepoResult.InvalidBufferSize;
}
// NOTE: The service calls arp:r using the pid to get the application id, if it fails PrepoResult.InvalidPid is returned.
// Reports are stored internally and an event is signaled to transmit them.
StringBuilder builder = new();
MessagePackObject deserializedReport = MessagePackSerializer.UnpackMessagePackObject(reportBuffer.ToArray());
builder.AppendLine();
builder.AppendLine("PlayReport log:");
builder.AppendLine($" Kind: {playReportKind}");
builder.AppendLine($" Pid: {pid}");
if (!userId.IsNull)
{
builder.AppendLine($" UserId: {userId}");
}
builder.AppendLine($" Room: {gameRoom}");
builder.AppendLine($" Report: {MessagePackObjectFormatter.Format(deserializedReport)}");
Logger.Info?.Print(LogClass.ServicePrepo, builder.ToString());
return Result.Success;
}
}
}

49
Ryujinx.Horizon/Prepo/PrepoIpcServer.cs Normal file
View File

@ -0,0 +1,49 @@
using Ryujinx.Horizon.Prepo.Types;
using Ryujinx.Horizon.Sdk.Sf.Hipc;
using Ryujinx.Horizon.Sdk.Sm;
namespace Ryujinx.Horizon.Prepo
{
class PrepoIpcServer
{
private const int PrepoMaxSessionsCount = 12;
private const int PrepoTotalMaxSessionsCount = PrepoMaxSessionsCount * 6;
private const int PointerBufferSize = 0x3800;
private const int MaxDomains = 64;
private const int MaxDomainObjects = 16;
private const int MaxPortsCount = 6;
private static readonly ManagerOptions _logManagerOptions = new(PointerBufferSize, MaxDomains, MaxDomainObjects, false);
private SmApi _sm;
private PrepoServerManager _serverManager;
public void Initialize()
{
HeapAllocator allocator = new();
_sm = new SmApi();
_sm.Initialize().AbortOnFailure();
_serverManager = new PrepoServerManager(allocator, _sm, MaxPortsCount, _logManagerOptions, PrepoTotalMaxSessionsCount);
_serverManager.RegisterServer((int)PrepoPortIndex.Admin, ServiceName.Encode("prepo:a"), PrepoMaxSessionsCount); // 1.0.0-5.1.0
_serverManager.RegisterServer((int)PrepoPortIndex.Admin2, ServiceName.Encode("prepo:a2"), PrepoMaxSessionsCount); // 6.0.0+
_serverManager.RegisterServer((int)PrepoPortIndex.Manager, ServiceName.Encode("prepo:m"), PrepoMaxSessionsCount);
_serverManager.RegisterServer((int)PrepoPortIndex.User, ServiceName.Encode("prepo:u"), PrepoMaxSessionsCount);
_serverManager.RegisterServer((int)PrepoPortIndex.System, ServiceName.Encode("prepo:s"), PrepoMaxSessionsCount);
_serverManager.RegisterServer((int)PrepoPortIndex.Debug, ServiceName.Encode("prepo:d"), PrepoMaxSessionsCount); // 1.0.0
}
public void ServiceRequests()
{
_serverManager.ServiceRequests();
}
public void Shutdown()
{
_serverManager.Dispose();
}
}
}

17
Ryujinx.Horizon/Prepo/PrepoMain.cs Normal file
View File

@ -0,0 +1,17 @@
namespace Ryujinx.Horizon.Prepo
{
class PrepoMain : IService
{
public static void Main(ServiceTable serviceTable)
{
PrepoIpcServer ipcServer = new();
ipcServer.Initialize();
serviceTable.SignalServiceReady();
ipcServer.ServiceRequests();
ipcServer.Shutdown();
}
}
}

15
Ryujinx.Horizon/Prepo/PrepoResult.cs Normal file
View File

@ -0,0 +1,15 @@
using Ryujinx.Horizon.Common;
namespace Ryujinx.Horizon.Prepo
{
static class PrepoResult
{
private const int ModuleId = 129;
public static Result InvalidArgument => new(ModuleId, 1);
public static Result InvalidState => new(ModuleId, 5);
public static Result InvalidBufferSize => new(ModuleId, 9);
public static Result PermissionDenied => new(ModuleId, 90);
public static Result InvalidPid => new(ModuleId, 101);
}
}

30
Ryujinx.Horizon/Prepo/PrepoServerManager.cs Normal file
View File

@ -0,0 +1,30 @@
using Ryujinx.Horizon.Common;
using Ryujinx.Horizon.Prepo.Ipc;
using Ryujinx.Horizon.Prepo.Types;
using Ryujinx.Horizon.Sdk.Sf.Hipc;
using Ryujinx.Horizon.Sdk.Sm;
using System;
namespace Ryujinx.Horizon.Prepo
{
class PrepoServerManager : ServerManager
{
public PrepoServerManager(HeapAllocator allocator, SmApi sm, int maxPorts, ManagerOptions options, int maxSessions) : base(allocator, sm, maxPorts, options, maxSessions)
{
}
protected override Result OnNeedsToAccept(int portIndex, Server server)
{
return (PrepoPortIndex)portIndex switch
{
PrepoPortIndex.Admin => AcceptImpl(server, new PrepoService(PrepoServicePermissionLevel.Admin)),
PrepoPortIndex.Admin2 => AcceptImpl(server, new PrepoService(PrepoServicePermissionLevel.Admin)),
PrepoPortIndex.Manager => AcceptImpl(server, new PrepoService(PrepoServicePermissionLevel.Manager)),
PrepoPortIndex.User => AcceptImpl(server, new PrepoService(PrepoServicePermissionLevel.User)),
PrepoPortIndex.System => AcceptImpl(server, new PrepoService(PrepoServicePermissionLevel.System)),
PrepoPortIndex.Debug => AcceptImpl(server, new PrepoService(PrepoServicePermissionLevel.Debug)),
_ => throw new ArgumentOutOfRangeException(nameof(portIndex)),
};
}
}
}

12
Ryujinx.Horizon/Prepo/Types/PrepoPortIndex.cs Normal file
View File

@ -0,0 +1,12 @@
namespace Ryujinx.Horizon.Prepo.Types
{
enum PrepoPortIndex
{
Admin,
Admin2,
Manager,
User,
System,
Debug
}
}

5
Ryujinx.HLE/HOS/Services/Prepo/Types/PrepoServicePermissionLevel.cs → Ryujinx.Horizon/Prepo/Types/PrepoServicePermissionLevel.cs
View File

@ -1,10 +1,11 @@
namespace Ryujinx.HLE.HOS.Services.Prepo namespace Ryujinx.Horizon.Prepo.Types
{ {
enum PrepoServicePermissionLevel enum PrepoServicePermissionLevel
{ {
Admin = -1, Admin = -1,
User = 1, User = 1,
System = 2, System = 2,
Manager = 6 Manager = 6,
Debug = unchecked((int)0x80000006)
} }
} }

4
Ryujinx.Horizon/Ryujinx.Horizon.csproj
View File

@ -11,4 +11,8 @@
<ProjectReference Include="..\Ryujinx.Memory\Ryujinx.Memory.csproj" /> <ProjectReference Include="..\Ryujinx.Memory\Ryujinx.Memory.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="LibHac" />
</ItemGroup>
</Project> </Project>

62
Ryujinx.Horizon/Sdk/Account/Uid.cs Normal file
View File

@ -0,0 +1,62 @@
using System;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
namespace Ryujinx.Horizon.Sdk.Account
{
[StructLayout(LayoutKind.Sequential)]
public readonly record struct Uid
{
public readonly long High;
public readonly long Low;
public bool IsNull => (Low | High) == 0;
public static Uid Null => new(0, 0);
public Uid(long low, long high)
{
Low = low;
High = high;
}
public Uid(byte[] bytes)
{
High = BitConverter.ToInt64(bytes, 0);
Low = BitConverter.ToInt64(bytes, 8);
}
public Uid(string hex)
{
if (hex == null || hex.Length != 32 || !hex.All("0123456789abcdefABCDEF".Contains))
{
throw new ArgumentException("Invalid Hex value!", nameof(hex));
}
Low = Convert.ToInt64(hex[16..], 16);
High = Convert.ToInt64(hex[..16], 16);
}
public void Write(BinaryWriter binaryWriter)
{
binaryWriter.Write(High);
binaryWriter.Write(Low);
}
public override string ToString()
{
return High.ToString("x16") + Low.ToString("x16");
}
public LibHac.Account.Uid ToLibHacUid()
{
return new LibHac.Account.Uid((ulong)High, (ulong)Low);
}
public UInt128 ToUInt128()
{
return new UInt128((ulong)High, (ulong)Low);
}
}
}

12
Ryujinx.Horizon/Sdk/Lm/ILmLogger.cs Normal file
View File

@ -0,0 +1,12 @@
using Ryujinx.Horizon.Common;
using Ryujinx.Horizon.Sdk.Sf;
using System;
namespace Ryujinx.Horizon.Sdk.Lm
{
interface ILmLogger : IServiceObject
{
Result Log(Span<byte> message);
Result SetDestination(LogDestination destination);
}
}

11
Ryujinx.Horizon/Sdk/Lm/ILogService.cs Normal file
View File

@ -0,0 +1,11 @@
using Ryujinx.Horizon.Common;
using Ryujinx.Horizon.LogManager.Ipc;
using Ryujinx.Horizon.Sdk.Sf;
namespace Ryujinx.Horizon.Sdk.Lm
{
interface ILogService : IServiceObject
{
Result OpenLogger(out LmLogger logger, ulong pid);
}
}

20
Ryujinx.Horizon/Sdk/Prepo/IPrepoService.cs Normal file
View File

@ -0,0 +1,20 @@
using Ryujinx.Horizon.Common;
using Ryujinx.Horizon.Sdk.Account;
using Ryujinx.Horizon.Sdk.Sf;
using System;
namespace Ryujinx.Horizon.Sdk.Prepo
{
interface IPrepoService : IServiceObject
{
Result SaveReport(ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid);
Result SaveReportWithUser(Uid userId, ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid);
Result RequestImmediateTransmission();
Result GetTransmissionStatus(out int status);
Result GetSystemSessionId(out ulong systemSessionId);
Result SaveSystemReport(ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid);
Result SaveSystemReportWithUser(Uid userId, ReadOnlySpan<byte> gameRoomBuffer, ReadOnlySpan<byte> reportBuffer, ulong pid);
Result IsUserAgreementCheckEnabled(out bool enabled);
Result SetUserAgreementCheckEnabled(bool enabled);
}
}

1
Ryujinx.Horizon/Sdk/ServiceUtil.cs
View File

@ -29,6 +29,7 @@ namespace Ryujinx.Horizon.Sdk
if (result.IsFailure) if (result.IsFailure)
{ {
response = default; response = default;
return result; return result;
} }

31
Ryujinx.Horizon/Sdk/Sf/Cmif/CmifMessage.cs
View File

@ -22,14 +22,17 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
totalSize += Unsafe.SizeOf<CmifInHeader>() + format.DataSize; totalSize += Unsafe.SizeOf<CmifInHeader>() + format.DataSize;
totalSize = (totalSize + 1) & ~1; totalSize = (totalSize + 1) & ~1;
int outPointerSizeTableOffset = totalSize; int outPointerSizeTableOffset = totalSize;
int outPointerSizeTableSize = format.OutAutoBuffersCount + format.OutPointersCount; int outPointerSizeTableSize = format.OutAutoBuffersCount + format.OutPointersCount;
totalSize += sizeof(ushort) * outPointerSizeTableSize; totalSize += sizeof(ushort) * outPointerSizeTableSize;
int rawDataSizeInWords = (totalSize + sizeof(uint) - 1) / sizeof(uint); int rawDataSizeInWords = (totalSize + sizeof(uint) - 1) / sizeof(uint);
CmifRequest request = new CmifRequest(); CmifRequest request = new()
{
request.Hipc = HipcMessage.WriteMessage(output, new HipcMetadata() Hipc = HipcMessage.WriteMessage(output, new HipcMetadata()
{ {
Type = format.Context != 0 ? (int)CommandType.RequestWithContext : (int)CommandType.Request, Type = format.Context != 0 ? (int)CommandType.RequestWithContext : (int)CommandType.Request,
SendStaticsCount = format.InAutoBuffersCount + format.InPointersCount, SendStaticsCount = format.InAutoBuffersCount + format.InPointersCount,
@ -41,7 +44,8 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
SendPid = format.SendPid, SendPid = format.SendPid,
CopyHandlesCount = format.HandlesCount, CopyHandlesCount = format.HandlesCount,
MoveHandlesCount = 0 MoveHandlesCount = 0
}); })
};
Span<uint> data = request.Hipc.DataWords; Span<uint> data = request.Hipc.DataWords;
@ -61,9 +65,9 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
Token = format.Context Token = format.Context
}; };
data = data.Slice(Unsafe.SizeOf<CmifDomainInHeader>() / sizeof(uint)); data = data[(Unsafe.SizeOf<CmifDomainInHeader>() / sizeof(uint))..];
request.Objects = data.Slice((payloadSize + sizeof(uint) - 1) / sizeof(uint)); request.Objects = data[((payloadSize + sizeof(uint) - 1) / sizeof(uint))..];
} }
ref CmifInHeader header = ref MemoryMarshal.Cast<uint, CmifInHeader>(data)[0]; ref CmifInHeader header = ref MemoryMarshal.Cast<uint, CmifInHeader>(data)[0];
@ -76,11 +80,12 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
Token = format.ObjectId != 0 ? 0u : format.Context Token = format.ObjectId != 0 ? 0u : format.Context
}; };
request.Data = MemoryMarshal.Cast<uint, byte>(data).Slice(Unsafe.SizeOf<CmifInHeader>()); request.Data = MemoryMarshal.Cast<uint, byte>(data)[Unsafe.SizeOf<CmifInHeader>()..];
int paddingSizeBefore = (rawDataSizeInWords - request.Hipc.DataWords.Length) * sizeof(uint); int paddingSizeBefore = (rawDataSizeInWords - request.Hipc.DataWords.Length) * sizeof(uint);
Span<byte> outPointerTable = MemoryMarshal.Cast<uint, byte>(request.Hipc.DataWords).Slice(outPointerSizeTableOffset - paddingSizeBefore); Span<byte> outPointerTable = MemoryMarshal.Cast<uint, byte>(request.Hipc.DataWords)[(outPointerSizeTableOffset - paddingSizeBefore)..];
request.OutPointerSizes = MemoryMarshal.Cast<byte, ushort>(outPointerTable); request.OutPointerSizes = MemoryMarshal.Cast<byte, ushort>(outPointerTable);
request.ServerPointerSize = format.ServerPointerSize; request.ServerPointerSize = format.ServerPointerSize;
@ -89,15 +94,15 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
public static Result ParseResponse(out CmifResponse response, Span<byte> input, bool isDomain, int size) public static Result ParseResponse(out CmifResponse response, Span<byte> input, bool isDomain, int size)
{ {
HipcMessage responseMessage = new HipcMessage(input); HipcMessage responseMessage = new(input);
Span<byte> data = MemoryMarshal.Cast<uint, byte>(responseMessage.Data.DataWords); Span<byte> data = MemoryMarshal.Cast<uint, byte>(responseMessage.Data.DataWords);
Span<uint> objects = Span<uint>.Empty; Span<uint> objects = Span<uint>.Empty;
if (isDomain) if (isDomain)
{ {
data = data.Slice(Unsafe.SizeOf<CmifDomainOutHeader>()); data = data[Unsafe.SizeOf<CmifDomainOutHeader>()..];
objects = MemoryMarshal.Cast<byte, uint>(data.Slice(Unsafe.SizeOf<CmifOutHeader>() + size)); objects = MemoryMarshal.Cast<byte, uint>(data[(Unsafe.SizeOf<CmifOutHeader>() + size)..]);
} }
CmifOutHeader header = MemoryMarshal.Cast<byte, CmifOutHeader>(data)[0]; CmifOutHeader header = MemoryMarshal.Cast<byte, CmifOutHeader>(data)[0];
@ -105,18 +110,20 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
if (header.Magic != CmifOutHeaderMagic) if (header.Magic != CmifOutHeaderMagic)
{ {
response = default; response = default;
return SfResult.InvalidOutHeader; return SfResult.InvalidOutHeader;
} }
if (header.Result.IsFailure) if (header.Result.IsFailure)
{ {
response = default; response = default;
return header.Result; return header.Result;
} }
response = new CmifResponse() response = new CmifResponse()
{ {
Data = data.Slice(Unsafe.SizeOf<CmifOutHeader>()), Data = data[Unsafe.SizeOf<CmifOutHeader>()..],
Objects = objects, Objects = objects,
CopyHandles = responseMessage.Data.CopyHandles, CopyHandles = responseMessage.Data.CopyHandles,
MoveHandles = responseMessage.Data.MoveHandles MoveHandles = responseMessage.Data.MoveHandles

4
Ryujinx.Horizon/Sdk/Sf/Cmif/DomainServiceObjectDispatchTable.cs
View File

@ -21,7 +21,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
var inHeader = MemoryMarshal.Cast<byte, CmifDomainInHeader>(inRawData)[0]; var inHeader = MemoryMarshal.Cast<byte, CmifDomainInHeader>(inRawData)[0];
ReadOnlySpan<byte> inDomainRawData = inRawData.Slice(Unsafe.SizeOf<CmifDomainInHeader>()); ReadOnlySpan<byte> inDomainRawData = inRawData[Unsafe.SizeOf<CmifDomainInHeader>()..];
int targetObjectId = inHeader.ObjectId; int targetObjectId = inHeader.ObjectId;
@ -39,7 +39,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
return SfResult.InvalidHeaderSize; return SfResult.InvalidHeaderSize;
} }
ReadOnlySpan<byte> inMessageRawData = inDomainRawData.Slice(0, inHeader.DataSize); ReadOnlySpan<byte> inMessageRawData = inDomainRawData[..inHeader.DataSize];
if (inHeader.ObjectsCount > DomainServiceObjectProcessor.MaximumObjects) if (inHeader.ObjectsCount > DomainServiceObjectProcessor.MaximumObjects)
{ {

10
Ryujinx.Horizon/Sdk/Sf/Cmif/DomainServiceObjectProcessor.cs
View File

@ -63,7 +63,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
return SfResult.InvalidInObjectsCount; return SfResult.InvalidInObjectsCount;
} }
Result result = _domain.ReserveIds(new Span<int>(_reservedObjectIds).Slice(0, OutObjectsCount)); Result result = _domain.ReserveIds(new Span<int>(_reservedObjectIds)[..OutObjectsCount]);
if (result.IsFailure) if (result.IsFailure)
{ {
@ -92,7 +92,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
DebugUtil.Assert(outHeaderSize + implOutDataTotalSize + OutObjectsCount * sizeof(int) <= outRawData.Length); DebugUtil.Assert(outHeaderSize + implOutDataTotalSize + OutObjectsCount * sizeof(int) <= outRawData.Length);
outRawData = outRawData.Slice(outHeaderSize); outRawData = outRawData[outHeaderSize..];
_outObjectIdsOffset = (response.DataWords.Length * sizeof(uint) - outRawData.Length) + implOutDataTotalSize; _outObjectIdsOffset = (response.DataWords.Length * sizeof(uint) - outRawData.Length) + implOutDataTotalSize;
return response; return response;
@ -107,9 +107,9 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
DebugUtil.Assert(outHeaderSize + implOutDataTotalSize <= outRawData.Length); DebugUtil.Assert(outHeaderSize + implOutDataTotalSize <= outRawData.Length);
outRawData = outRawData.Slice(outHeaderSize); outRawData = outRawData[outHeaderSize..];
_domain.UnreserveIds(new Span<int>(_reservedObjectIds).Slice(0, OutObjectsCount)); _domain.UnreserveIds(new Span<int>(_reservedObjectIds)[..OutObjectsCount]);
} }
public override void SetOutObjects(scoped ref ServiceDispatchContext context, HipcMessageData response, Span<ServiceObjectHolder> outObjects) public override void SetOutObjects(scoped ref ServiceDispatchContext context, HipcMessageData response, Span<ServiceObjectHolder> outObjects)
@ -129,7 +129,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
_domain.RegisterObject(objectIds[i], outObjects[i]); _domain.RegisterObject(objectIds[i], outObjects[i]);
} }
Span<int> outObjectIds = MemoryMarshal.Cast<byte, int>(MemoryMarshal.Cast<uint, byte>(response.DataWords).Slice(_outObjectIdsOffset)); Span<int> outObjectIds = MemoryMarshal.Cast<byte, int>(MemoryMarshal.Cast<uint, byte>(response.DataWords)[_outObjectIdsOffset..]);
for (int i = 0; i < outObjectsCount; i++) for (int i = 0; i < outObjectsCount; i++)
{ {

2
Ryujinx.Horizon/Sdk/Sf/Cmif/PointerAndSize.cs
View File

@ -2,7 +2,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
{ {
struct PointerAndSize struct PointerAndSize
{ {
public static PointerAndSize Empty => new PointerAndSize(0UL, 0UL); public static PointerAndSize Empty => new(0UL, 0UL);
public ulong Address { get; } public ulong Address { get; }
public ulong Size { get; } public ulong Size { get; }

1
Ryujinx.Horizon/Sdk/Sf/Cmif/ServerMessageRuntimeMetadata.cs
View File

@ -8,6 +8,7 @@
public byte OutHeadersSize { get; } public byte OutHeadersSize { get; }
public byte InObjectsCount { get; } public byte InObjectsCount { get; }
public byte OutObjectsCount { get; } public byte OutObjectsCount { get; }
public int UnfixedOutPointerSizeOffset => InDataSize + InHeadersSize + 0x10; public int UnfixedOutPointerSizeOffset => InDataSize + InHeadersSize + 0x10;
public ServerMessageRuntimeMetadata( public ServerMessageRuntimeMetadata(

14
Ryujinx.Horizon/Sdk/Sf/Cmif/ServiceDispatchTableBase.cs
View File

@ -39,17 +39,21 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
if (!entries.TryGetValue((int)commandId, out var commandHandler)) if (!entries.TryGetValue((int)commandId, out var commandHandler))
{ {
Logger.Warning?.Print(LogClass.KernelIpc, $"{objectName} command ID 0x{commandId:X} is not implemented");
if (HorizonStatic.Options.IgnoreMissingServices) if (HorizonStatic.Options.IgnoreMissingServices)
{ {
// If ignore missing services is enabled, just pretend that everything is fine. // If ignore missing services is enabled, just pretend that everything is fine.
var response = PrepareForStubReply(ref context, out Span<byte> outRawData); PrepareForStubReply(ref context, out Span<byte> outRawData);
CommandHandler.GetCmifOutHeaderPointer(ref outHeader, ref outRawData); CommandHandler.GetCmifOutHeaderPointer(ref outHeader, ref outRawData);
outHeader[0] = new CmifOutHeader() { Magic = CmifMessage.CmifOutHeaderMagic, Result = Result.Success }; outHeader[0] = new CmifOutHeader() { Magic = CmifMessage.CmifOutHeaderMagic, Result = Result.Success };
Logger.Warning?.Print(LogClass.Service, $"Missing service {objectName} (command ID: {commandId}) ignored");
return Result.Success; return Result.Success;
} }
else if (HorizonStatic.Options.ThrowOnInvalidCommandIds)
{
throw new NotImplementedException($"{objectName} command ID: {commandId} is not implemented");
}
return SfResult.UnknownCommandId; return SfResult.UnknownCommandId;
} }
@ -72,6 +76,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
if (outHeader.IsEmpty) if (outHeader.IsEmpty)
{ {
commandResult.AbortOnSuccess(); commandResult.AbortOnSuccess();
return commandResult; return commandResult;
} }
@ -80,11 +85,10 @@ namespace Ryujinx.Horizon.Sdk.Sf.Cmif
return Result.Success; return Result.Success;
} }
private static HipcMessageData PrepareForStubReply(scoped ref ServiceDispatchContext context, out Span<byte> outRawData) private static void PrepareForStubReply(scoped ref ServiceDispatchContext context, out Span<byte> outRawData)
{ {
var response = HipcMessage.WriteResponse(context.OutMessageBuffer, 0, 0x20 / sizeof(uint), 0, 0); var response = HipcMessage.WriteResponse(context.OutMessageBuffer, 0, 0x20 / sizeof(uint), 0, 0);
outRawData = MemoryMarshal.Cast<uint, byte>(response.DataWords); outRawData = MemoryMarshal.Cast<uint, byte>(response.DataWords);
return response;
} }
} }
} }

4
Ryujinx.Horizon/Sdk/Sf/CommandHandler.cs
View File

@ -50,8 +50,8 @@ namespace Ryujinx.Horizon.Sdk.Sf
public static void GetCmifOutHeaderPointer(ref Span<CmifOutHeader> outHeader, ref Span<byte> outRawData) public static void GetCmifOutHeaderPointer(ref Span<CmifOutHeader> outHeader, ref Span<byte> outRawData)
{ {
outHeader = MemoryMarshal.Cast<byte, CmifOutHeader>(outRawData).Slice(0, 1); outHeader = MemoryMarshal.Cast<byte, CmifOutHeader>(outRawData)[..1];
outRawData = outRawData.Slice(Unsafe.SizeOf<CmifOutHeader>()); outRawData = outRawData[Unsafe.SizeOf<CmifOutHeader>()..];
} }
} }
} }

1
Ryujinx.Horizon/Sdk/Sf/CommandSerialization.cs
View File

@ -22,6 +22,7 @@ namespace Ryujinx.Horizon.Sdk.Sf
public static ref T GetRef<T>(PointerAndSize bufferRange) where T : unmanaged public static ref T GetRef<T>(PointerAndSize bufferRange) where T : unmanaged
{ {
var writableRegion = GetWritableRegion(bufferRange); var writableRegion = GetWritableRegion(bufferRange);
return ref MemoryMarshal.Cast<byte, T>(writableRegion.Memory.Span)[0]; return ref MemoryMarshal.Cast<byte, T>(writableRegion.Memory.Span)[0];
} }

2
Ryujinx.Horizon/Sdk/Sf/Hipc/HipcManager.cs
View File

@ -61,7 +61,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
{ {
clientHandle = 0; clientHandle = 0;
if (!(_session.ServiceObjectHolder.ServiceObject is DomainServiceObject domain)) if (_session.ServiceObjectHolder.ServiceObject is not DomainServiceObject domain)
{ {
return HipcResult.TargetNotDomain; return HipcResult.TargetNotDomain;
} }

46
Ryujinx.Horizon/Sdk/Sf/Hipc/HipcMessage.cs
View File

@ -20,7 +20,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
Header header = MemoryMarshal.Cast<byte, Header>(data)[0]; Header header = MemoryMarshal.Cast<byte, Header>(data)[0];
data = data.Slice(Unsafe.SizeOf<Header>()); data = data[Unsafe.SizeOf<Header>()..];
int receiveStaticsCount = 0; int receiveStaticsCount = 0;
ulong pid = 0; ulong pid = 0;
@ -42,14 +42,12 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
if (header.HasSpecialHeader) if (header.HasSpecialHeader)
{ {
specialHeader = MemoryMarshal.Cast<byte, SpecialHeader>(data)[0]; specialHeader = MemoryMarshal.Cast<byte, SpecialHeader>(data)[0];
data = data[Unsafe.SizeOf<SpecialHeader>()..];
data = data.Slice(Unsafe.SizeOf<SpecialHeader>());
if (specialHeader.SendPid) if (specialHeader.SendPid)
{ {
pid = MemoryMarshal.Cast<byte, ulong>(data)[0]; pid = MemoryMarshal.Cast<byte, ulong>(data)[0];
data = data[sizeof(ulong)..];
data = data.Slice(sizeof(ulong));
} }
} }
@ -90,7 +88,6 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
public static HipcMessageData WriteMessage(Span<byte> destination, HipcMetadata meta) public static HipcMessageData WriteMessage(Span<byte> destination, HipcMetadata meta)
{ {
int initialLength = destination.Length; int initialLength = destination.Length;
bool hasSpecialHeader = meta.SendPid || meta.CopyHandlesCount != 0 || meta.MoveHandlesCount != 0; bool hasSpecialHeader = meta.SendPid || meta.CopyHandlesCount != 0 || meta.MoveHandlesCount != 0;
MemoryMarshal.Cast<byte, Header>(destination)[0] = new Header() MemoryMarshal.Cast<byte, Header>(destination)[0] = new Header()
@ -105,7 +102,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
HasSpecialHeader = hasSpecialHeader HasSpecialHeader = hasSpecialHeader
}; };
destination = destination.Slice(Unsafe.SizeOf<Header>()); destination = destination[Unsafe.SizeOf<Header>()..];
if (hasSpecialHeader) if (hasSpecialHeader)
{ {
@ -116,11 +113,11 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
MoveHandlesCount = meta.MoveHandlesCount MoveHandlesCount = meta.MoveHandlesCount
}; };
destination = destination.Slice(Unsafe.SizeOf<SpecialHeader>()); destination = destination[Unsafe.SizeOf<SpecialHeader>()..];
if (meta.SendPid) if (meta.SendPid)
{ {
destination = destination.Slice(sizeof(ulong)); destination = destination[sizeof(ulong)..];
} }
} }
@ -133,54 +130,54 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
if (meta.CopyHandlesCount != 0) if (meta.CopyHandlesCount != 0)
{ {
copyHandles = MemoryMarshal.Cast<byte, int>(data).Slice(0, meta.CopyHandlesCount); copyHandles = MemoryMarshal.Cast<byte, int>(data)[..meta.CopyHandlesCount];
data = data.Slice(meta.CopyHandlesCount * sizeof(int)); data = data[(meta.CopyHandlesCount * sizeof(int))..];
} }
Span<int> moveHandles = Span<int>.Empty; Span<int> moveHandles = Span<int>.Empty;
if (meta.MoveHandlesCount != 0) if (meta.MoveHandlesCount != 0)
{ {
moveHandles = MemoryMarshal.Cast<byte, int>(data).Slice(0, meta.MoveHandlesCount); moveHandles = MemoryMarshal.Cast<byte, int>(data)[..meta.MoveHandlesCount];
data = data.Slice(meta.MoveHandlesCount * sizeof(int)); data = data[(meta.MoveHandlesCount * sizeof(int))..];
} }
Span<HipcStaticDescriptor> sendStatics = Span<HipcStaticDescriptor>.Empty; Span<HipcStaticDescriptor> sendStatics = Span<HipcStaticDescriptor>.Empty;
if (meta.SendStaticsCount != 0) if (meta.SendStaticsCount != 0)
{ {
sendStatics = MemoryMarshal.Cast<byte, HipcStaticDescriptor>(data).Slice(0, meta.SendStaticsCount); sendStatics = MemoryMarshal.Cast<byte, HipcStaticDescriptor>(data)[..meta.SendStaticsCount];
data = data.Slice(meta.SendStaticsCount * Unsafe.SizeOf<HipcStaticDescriptor>()); data = data[(meta.SendStaticsCount * Unsafe.SizeOf<HipcStaticDescriptor>())..];
} }
Span<HipcBufferDescriptor> sendBuffers = Span<HipcBufferDescriptor>.Empty; Span<HipcBufferDescriptor> sendBuffers = Span<HipcBufferDescriptor>.Empty;
if (meta.SendBuffersCount != 0) if (meta.SendBuffersCount != 0)
{ {
sendBuffers = MemoryMarshal.Cast<byte, HipcBufferDescriptor>(data).Slice(0, meta.SendBuffersCount); sendBuffers = MemoryMarshal.Cast<byte, HipcBufferDescriptor>(data)[..meta.SendBuffersCount];
data = data.Slice(meta.SendBuffersCount * Unsafe.SizeOf<HipcBufferDescriptor>()); data = data[(meta.SendBuffersCount * Unsafe.SizeOf<HipcBufferDescriptor>())..];
} }
Span<HipcBufferDescriptor> receiveBuffers = Span<HipcBufferDescriptor>.Empty; Span<HipcBufferDescriptor> receiveBuffers = Span<HipcBufferDescriptor>.Empty;
if (meta.ReceiveBuffersCount != 0) if (meta.ReceiveBuffersCount != 0)
{ {
receiveBuffers = MemoryMarshal.Cast<byte, HipcBufferDescriptor>(data).Slice(0, meta.ReceiveBuffersCount); receiveBuffers = MemoryMarshal.Cast<byte, HipcBufferDescriptor>(data)[..meta.ReceiveBuffersCount];
data = data.Slice(meta.ReceiveBuffersCount * Unsafe.SizeOf<HipcBufferDescriptor>()); data = data[(meta.ReceiveBuffersCount * Unsafe.SizeOf<HipcBufferDescriptor>())..];
} }
Span<HipcBufferDescriptor> exchangeBuffers = Span<HipcBufferDescriptor>.Empty; Span<HipcBufferDescriptor> exchangeBuffers = Span<HipcBufferDescriptor>.Empty;
if (meta.ExchangeBuffersCount != 0) if (meta.ExchangeBuffersCount != 0)
{ {
exchangeBuffers = MemoryMarshal.Cast<byte, HipcBufferDescriptor>(data).Slice(0, meta.ExchangeBuffersCount); exchangeBuffers = MemoryMarshal.Cast<byte, HipcBufferDescriptor>(data)[..meta.ExchangeBuffersCount];
data = data.Slice(meta.ExchangeBuffersCount * Unsafe.SizeOf<HipcBufferDescriptor>()); data = data[(meta.ExchangeBuffersCount * Unsafe.SizeOf<HipcBufferDescriptor>())..];
} }
Span<uint> dataWords = Span<uint>.Empty; Span<uint> dataWords = Span<uint>.Empty;
@ -189,12 +186,11 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
{ {
int dataOffset = initialLength - data.Length; int dataOffset = initialLength - data.Length;
int dataOffsetAligned = BitUtils.AlignUp(dataOffset, 0x10); int dataOffsetAligned = BitUtils.AlignUp(dataOffset, 0x10);
int padding = (dataOffsetAligned - dataOffset) / sizeof(uint); int padding = (dataOffsetAligned - dataOffset) / sizeof(uint);
dataWords = MemoryMarshal.Cast<byte, uint>(data).Slice(padding, meta.DataWordsCount - padding); dataWords = MemoryMarshal.Cast<byte, uint>(data)[padding..meta.DataWordsCount];
data = data.Slice(meta.DataWordsCount * sizeof(uint)); data = data[(meta.DataWordsCount * sizeof(uint))..];
} }
Span<HipcReceiveListEntry> receiveList = Span<HipcReceiveListEntry>.Empty; Span<HipcReceiveListEntry> receiveList = Span<HipcReceiveListEntry>.Empty;
@ -203,7 +199,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
{ {
int receiveListSize = meta.ReceiveStaticsCount == AutoReceiveStatic ? 1 : meta.ReceiveStaticsCount; int receiveListSize = meta.ReceiveStaticsCount == AutoReceiveStatic ? 1 : meta.ReceiveStaticsCount;
receiveList = MemoryMarshal.Cast<byte, HipcReceiveListEntry>(data).Slice(0, receiveListSize); receiveList = MemoryMarshal.Cast<byte, HipcReceiveListEntry>(data)[..receiveListSize];
} }
return new HipcMessageData() return new HipcMessageData()

21
Ryujinx.Horizon/Sdk/Sf/Hipc/HipcResult.cs
View File

@ -6,17 +6,14 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
{ {
public const int ModuleId = 11; public const int ModuleId = 11;
public static Result OutOfSessionMemory => new Result(ModuleId, 102); public static Result OutOfSessionMemory => new(ModuleId, 102);
public static Result OutOfSessions => new Result(ModuleId, 131); public static Result OutOfSessions => new(ModuleId, 131);
public static Result PointerBufferTooSmall => new Result(ModuleId, 141); public static Result PointerBufferTooSmall => new(ModuleId, 141);
public static Result OutOfDomains => new Result(ModuleId, 200); public static Result OutOfDomains => new(ModuleId, 200);
public static Result InvalidRequestSize => new(ModuleId, 402);
public static Result InvalidRequestSize => new Result(ModuleId, 402); public static Result UnknownCommandType => new(ModuleId, 403);
public static Result UnknownCommandType => new Result(ModuleId, 403); public static Result InvalidCmifRequest => new(ModuleId, 420);
public static Result TargetNotDomain => new(ModuleId, 491);
public static Result InvalidCmifRequest => new Result(ModuleId, 420); public static Result DomainObjectNotFound => new(ModuleId, 492);
public static Result TargetNotDomain => new Result(ModuleId, 491);
public static Result DomainObjectNotFound => new Result(ModuleId, 492);
} }
} }

2
Ryujinx.Horizon/Sdk/Sf/Hipc/ManagerOptions.cs
View File

@ -2,7 +2,7 @@
{ {
struct ManagerOptions struct ManagerOptions
{ {
public static ManagerOptions Default => new ManagerOptions(0, 0, 0, false); public static ManagerOptions Default => new(0, 0, 0, false);
public int PointerBufferSize { get; } public int PointerBufferSize { get; }
public int MaxDomains { get; } public int MaxDomains { get; }

2
Ryujinx.Horizon/Sdk/Sf/Hipc/ServerDomainSessionManager.cs
View File

@ -15,7 +15,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
protected override Result DispatchManagerRequest(ServerSession session, Span<byte> inMessage, Span<byte> outMessage) protected override Result DispatchManagerRequest(ServerSession session, Span<byte> inMessage, Span<byte> outMessage)
{ {
HipcManager hipcManager = new HipcManager(this, session); HipcManager hipcManager = new(this, session);
return DispatchRequest(new ServiceObjectHolder(hipcManager), session, inMessage, outMessage); return DispatchRequest(new ServiceObjectHolder(hipcManager), session, inMessage, outMessage);
} }

4
Ryujinx.Horizon/Sdk/Sf/Hipc/ServerManager.cs
View File

@ -80,7 +80,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
return null; return null;
} }
ServerSession session = new ServerSession(sessionIndex, sessionHandle, obj); ServerSession session = new(sessionIndex, sessionHandle, obj);
_sessions.Add(session); _sessions.Add(session);
@ -111,7 +111,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
{ {
lock (_resourceLock) lock (_resourceLock)
{ {
Server server = new Server(portIndex, portHandle, name, managed, staticHoder); Server server = new(portIndex, portHandle, name, managed, staticHoder);
_servers.Add(server); _servers.Add(server);

23
Ryujinx.Horizon/Sdk/Sf/Hipc/ServerManagerBase.cs
View File

@ -46,6 +46,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
_requestStopEventHolder = new MultiWaitHolderOfEvent(_requestStopEvent); _requestStopEventHolder = new MultiWaitHolderOfEvent(_requestStopEvent);
_multiWait.LinkMultiWaitHolder(_requestStopEventHolder); _multiWait.LinkMultiWaitHolder(_requestStopEventHolder);
_notifyEventHolder = new MultiWaitHolderOfEvent(_notifyEvent); _notifyEventHolder = new MultiWaitHolderOfEvent(_notifyEvent);
_multiWait.LinkMultiWaitHolder(_notifyEventHolder); _multiWait.LinkMultiWaitHolder(_notifyEventHolder);
} }
@ -73,6 +74,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
private void RegisterServerImpl(int portIndex, ServiceObjectHolder staticHolder, int portHandle) private void RegisterServerImpl(int portIndex, ServiceObjectHolder staticHolder, int portHandle)
{ {
Server server = AllocateServer(portIndex, portHandle, ServiceName.Invalid, managed: false, staticHolder); Server server = AllocateServer(portIndex, portHandle, ServiceName.Invalid, managed: false, staticHolder);
RegisterServerImpl(server); RegisterServerImpl(server);
} }
@ -86,6 +88,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
} }
Server server = AllocateServer(portIndex, portHandle, name, managed: true, staticHolder); Server server = AllocateServer(portIndex, portHandle, name, managed: true, staticHolder);
RegisterServerImpl(server); RegisterServerImpl(server);
return Result.Success; return Result.Success;
@ -103,6 +106,11 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
throw new NotSupportedException(); throw new NotSupportedException();
} }
protected Result AcceptImpl(Server server, IServiceObject obj)
{
return AcceptSession(server.PortHandle, new ServiceObjectHolder(obj));
}
public void ServiceRequests() public void ServiceRequests()
{ {
while (WaitAndProcessRequestsImpl()); while (WaitAndProcessRequestsImpl());
@ -176,6 +184,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
{ {
session.HasReceived = false; session.HasReceived = false;
session.UserData = UserDataTag.Session; session.UserData = UserDataTag.Session;
RegisterToWaitList(session); RegisterToWaitList(session);
} }
@ -198,15 +207,12 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
private Result Process(MultiWaitHolder holder) private Result Process(MultiWaitHolder holder)
{ {
switch ((UserDataTag)holder.UserData) return (UserDataTag)holder.UserData switch
{ {
case UserDataTag.Server: UserDataTag.Server => ProcessForServer(holder),
return ProcessForServer(holder); UserDataTag.Session => ProcessForSession(holder),
case UserDataTag.Session: _ => throw new NotImplementedException(((UserDataTag)holder.UserData).ToString())
return ProcessForSession(holder); };
default:
throw new NotImplementedException(((UserDataTag)holder.UserData).ToString());
}
} }
private Result ProcessForServer(MultiWaitHolder holder) private Result ProcessForServer(MultiWaitHolder holder)
@ -259,6 +265,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
} }
session.HasReceived = true; session.HasReceived = true;
tlsMessage.Memory.Span.CopyTo(savedMessage.Memory.Span); tlsMessage.Memory.Span.CopyTo(savedMessage.Memory.Span);
} }
else else

5
Ryujinx.Horizon/Sdk/Sf/Hipc/ServerSessionManager.cs
View File

@ -78,6 +78,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
session.SavedMessage = GetSessionSavedMessageBuffer(session); session.SavedMessage = GetSessionSavedMessageBuffer(session);
RegisterSessionToWaitList(session); RegisterSessionToWaitList(session);
return Result.Success; return Result.Success;
} }
@ -141,6 +142,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
protected void CloseSessionImpl(ServerSession session) protected void CloseSessionImpl(ServerSession session)
{ {
int sessionHandle = session.Handle; int sessionHandle = session.Handle;
Os.FinalizeMultiWaitHolder(session); Os.FinalizeMultiWaitHolder(session);
DestroySession(session); DestroySession(session);
HorizonStatic.Syscall.CloseHandle(sessionHandle).AbortOnFailure(); HorizonStatic.Syscall.CloseHandle(sessionHandle).AbortOnFailure();
@ -156,6 +158,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
if (session.IsClosed || GetCmifCommandType(message) == CommandType.Close) if (session.IsClosed || GetCmifCommandType(message) == CommandType.Close)
{ {
CloseSessionImpl(session); CloseSessionImpl(session);
return Result.Success; return Result.Success;
} }
else else
@ -165,6 +168,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
if (result.IsSuccess) if (result.IsSuccess)
{ {
RegisterSessionToWaitList(session); RegisterSessionToWaitList(session);
return Result.Success; return Result.Success;
} }
else if (SfResult.RequestContextChanged(result)) else if (SfResult.RequestContextChanged(result))
@ -176,6 +180,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
Logger.Warning?.Print(LogClass.KernelIpc, $"Request processing returned error {result}"); Logger.Warning?.Print(LogClass.KernelIpc, $"Request processing returned error {result}");
CloseSessionImpl(session); CloseSessionImpl(session);
return Result.Success; return Result.Success;
} }
} }

8
Ryujinx.Horizon/Sdk/Sf/HipcCommandProcessor.cs
View File

@ -190,6 +190,7 @@ namespace Ryujinx.Horizon.Sdk.Sf
var descriptor = context.Request.Data.SendStatics[sendPointerIndex++]; var descriptor = context.Request.Data.SendStatics[sendPointerIndex++];
ulong address = descriptor.Address; ulong address = descriptor.Address;
ulong size = descriptor.Size; ulong size = descriptor.Size;
_bufferRanges[i] = new PointerAndSize(address, size); _bufferRanges[i] = new PointerAndSize(address, size);
if (size != 0) if (size != 0)
@ -208,7 +209,8 @@ namespace Ryujinx.Horizon.Sdk.Sf
else else
{ {
var data = MemoryMarshal.Cast<uint, byte>(context.Request.Data.DataWords); var data = MemoryMarshal.Cast<uint, byte>(context.Request.Data.DataWords);
var recvPointerSizes = MemoryMarshal.Cast<byte, ushort>(data.Slice(runtimeMetadata.UnfixedOutPointerSizeOffset)); var recvPointerSizes = MemoryMarshal.Cast<byte, ushort>(data[runtimeMetadata.UnfixedOutPointerSizeOffset..]);
size = recvPointerSizes[unfixedRecvPointerIndex++]; size = recvPointerSizes[unfixedRecvPointerIndex++];
} }
@ -314,6 +316,7 @@ namespace Ryujinx.Horizon.Sdk.Sf
int rawSizeInBytes = meta.DataWordsCount * sizeof(uint); int rawSizeInBytes = meta.DataWordsCount * sizeof(uint);
int commandRawSize = BitUtils.AlignUp(runtimeMetadata.UnfixedOutPointerSizeOffset + (OutUnfixedSizePointerBuffersCount * sizeof(ushort)), sizeof(uint)); int commandRawSize = BitUtils.AlignUp(runtimeMetadata.UnfixedOutPointerSizeOffset + (OutUnfixedSizePointerBuffersCount * sizeof(ushort)), sizeof(uint));
requestValid &= rawSizeInBytes >= commandRawSize; requestValid &= rawSizeInBytes >= commandRawSize;
return requestValid ? Result.Success : HipcResult.InvalidCmifRequest; return requestValid ? Result.Success : HipcResult.InvalidCmifRequest;
@ -365,6 +368,7 @@ namespace Ryujinx.Horizon.Sdk.Sf
_outCopyHandlesCount, _outCopyHandlesCount,
_outMoveHandlesCount + runtimeMetadata.OutObjectsCount); _outMoveHandlesCount + runtimeMetadata.OutObjectsCount);
outRawData = MemoryMarshal.Cast<uint, byte>(response.DataWords); outRawData = MemoryMarshal.Cast<uint, byte>(response.DataWords);
return response; return response;
} }
@ -377,6 +381,7 @@ namespace Ryujinx.Horizon.Sdk.Sf
(BitUtils.AlignUp(rawDataSize, 4) + 0x10) / sizeof(uint), (BitUtils.AlignUp(rawDataSize, 4) + 0x10) / sizeof(uint),
0, 0,
0); 0);
outRawData = MemoryMarshal.Cast<uint, byte>(response.DataWords); outRawData = MemoryMarshal.Cast<uint, byte>(response.DataWords);
} }
@ -410,6 +415,7 @@ namespace Ryujinx.Horizon.Sdk.Sf
if (obj == null) if (obj == null)
{ {
response.MoveHandles[index] = 0; response.MoveHandles[index] = 0;
return; return;
} }

4
Ryujinx.Horizon/Sdk/Sf/RawDataOffsetCalculator.cs
View File

@ -27,9 +27,7 @@ namespace Ryujinx.Horizon.Sdk.Sf
{ {
for (int j = i; j > 0 && aligns[map[j - 1]] > aligns[map[j]]; j--) for (int j = i; j > 0 && aligns[map[j - 1]] > aligns[map[j]]; j--)
{ {
var temp = map[j - 1]; (map[j], map[j - 1]) = (map[j - 1], map[j]);
map[j - 1] = map[j];
map[j] = temp;
} }
} }

30
Ryujinx.Horizon/Sdk/Sf/SfResult.cs
View File

@ -6,26 +6,22 @@ namespace Ryujinx.Horizon.Sdk.Sf
{ {
public const int ModuleId = 10; public const int ModuleId = 10;
public static Result NotSupported => new Result(ModuleId, 1); public static Result NotSupported => new(ModuleId, 1);
public static Result InvalidHeaderSize => new Result(ModuleId, 202); public static Result InvalidHeaderSize => new(ModuleId, 202);
public static Result InvalidInHeader => new Result(ModuleId, 211); public static Result InvalidInHeader => new(ModuleId, 211);
public static Result InvalidOutHeader => new Result(ModuleId, 212); public static Result InvalidOutHeader => new(ModuleId, 212);
public static Result UnknownCommandId => new Result(ModuleId, 221); public static Result UnknownCommandId => new(ModuleId, 221);
public static Result InvalidOutRawSize => new Result(ModuleId, 232); public static Result InvalidOutRawSize => new(ModuleId, 232);
public static Result InvalidInObjectsCount => new Result(ModuleId, 235); public static Result InvalidInObjectsCount => new(ModuleId, 235);
public static Result InvalidOutObjectsCount => new Result(ModuleId, 236); public static Result InvalidOutObjectsCount => new(ModuleId, 236);
public static Result InvalidInObject => new Result(ModuleId, 239); public static Result InvalidInObject => new(ModuleId, 239);
public static Result TargetNotFound => new(ModuleId, 261);
public static Result TargetNotFound => new Result(ModuleId, 261); public static Result OutOfDomainEntries => new(ModuleId, 301);
public static Result InvalidatedByUser => new(ModuleId, 802);
public static Result OutOfDomainEntries => new Result(ModuleId, 301); public static Result RequestDeferredByUser => new(ModuleId, 812);
public static Result InvalidatedByUser => new Result(ModuleId, 802);
public static Result RequestDeferredByUser => new Result(ModuleId, 812);
public static bool RequestContextChanged(Result result) => result.InRange(800, 899); public static bool RequestContextChanged(Result result) => result.InRange(800, 899);
public static bool Invalidated(Result result) => result.InRange(801, 809); public static bool Invalidated(Result result) => result.InRange(801, 809);
public static bool RequestDeferred(Result result) => result.InRange(811, 819); public static bool RequestDeferred(Result result) => result.InRange(811, 819);
} }
} }

8
Ryujinx.Horizon/Sdk/Sm/IManagerService.cs Normal file
View File

@ -0,0 +1,8 @@
using Ryujinx.Horizon.Sdk.Sf;
namespace Ryujinx.Horizon.Sdk.Sm
{
interface IManagerService : IServiceObject
{
}
}

13
Ryujinx.Horizon/Sdk/Sm/IUserService.cs Normal file
View File

@ -0,0 +1,13 @@
using Ryujinx.Horizon.Common;
using Ryujinx.Horizon.Sdk.Sf;
namespace Ryujinx.Horizon.Sdk.Sm
{
interface IUserService : IServiceObject
{
Result Initialize(ulong clientProcessId);
Result GetService(out int handle, ServiceName name);
Result RegisterService(out int handle, ServiceName name, int maxSessions, bool isLight);
Result UnregisterService(ServiceName name);
}
}

20
Ryujinx.Horizon/Sdk/Sm/SmApi.cs
View File

@ -7,16 +7,18 @@ namespace Ryujinx.Horizon.Sdk.Sm
{ {
class SmApi class SmApi
{ {
private const string SmName = "sm:";
private int _portHandle; private int _portHandle;
public Result Initialize() public Result Initialize()
{ {
Result result = HorizonStatic.Syscall.ConnectToNamedPort(out int portHandle, "sm:"); Result result = HorizonStatic.Syscall.ConnectToNamedPort(out int portHandle, SmName);
while (result == KernelResult.NotFound) while (result == KernelResult.NotFound)
{ {
HorizonStatic.Syscall.SleepThread(50000000L); HorizonStatic.Syscall.SleepThread(50000000L);
result = HorizonStatic.Syscall.ConnectToNamedPort(out portHandle, "sm:"); result = HorizonStatic.Syscall.ConnectToNamedPort(out portHandle, SmName);
} }
if (result.IsFailure) if (result.IsFailure)
@ -33,7 +35,7 @@ namespace Ryujinx.Horizon.Sdk.Sm
{ {
Span<byte> data = stackalloc byte[8]; Span<byte> data = stackalloc byte[8];
SpanWriter writer = new SpanWriter(data); SpanWriter writer = new(data);
writer.Write(0UL); writer.Write(0UL);
@ -44,7 +46,7 @@ namespace Ryujinx.Horizon.Sdk.Sm
{ {
Span<byte> data = stackalloc byte[8]; Span<byte> data = stackalloc byte[8];
SpanWriter writer = new SpanWriter(data); SpanWriter writer = new(data);
writer.Write(name); writer.Write(name);
@ -53,10 +55,12 @@ namespace Ryujinx.Horizon.Sdk.Sm
if (result.IsFailure) if (result.IsFailure)
{ {
handle = 0; handle = 0;
return result; return result;
} }
handle = response.MoveHandles[0]; handle = response.MoveHandles[0];
return Result.Success; return Result.Success;
} }
@ -64,7 +68,7 @@ namespace Ryujinx.Horizon.Sdk.Sm
{ {
Span<byte> data = stackalloc byte[16]; Span<byte> data = stackalloc byte[16];
SpanWriter writer = new SpanWriter(data); SpanWriter writer = new(data);
writer.Write(name); writer.Write(name);
writer.Write(isLight ? 1 : 0); writer.Write(isLight ? 1 : 0);
@ -75,10 +79,12 @@ namespace Ryujinx.Horizon.Sdk.Sm
if (result.IsFailure) if (result.IsFailure)
{ {
handle = 0; handle = 0;
return result; return result;
} }
handle = response.MoveHandles[0]; handle = response.MoveHandles[0];
return Result.Success; return Result.Success;
} }
@ -86,7 +92,7 @@ namespace Ryujinx.Horizon.Sdk.Sm
{ {
Span<byte> data = stackalloc byte[8]; Span<byte> data = stackalloc byte[8];
SpanWriter writer = new SpanWriter(data); SpanWriter writer = new(data);
writer.Write(name); writer.Write(name);
@ -97,7 +103,7 @@ namespace Ryujinx.Horizon.Sdk.Sm
{ {
Span<byte> data = stackalloc byte[8]; Span<byte> data = stackalloc byte[8];
SpanWriter writer = new SpanWriter(data); SpanWriter writer = new(data);
writer.Write(0UL); writer.Write(0UL);

8
Ryujinx.Horizon/ServiceEntry.cs
View File

@ -6,12 +6,14 @@ namespace Ryujinx.Horizon
{ {
public struct ServiceEntry public struct ServiceEntry
{ {
private readonly Action _entrypoint; private readonly Action<ServiceTable> _entrypoint;
private readonly ServiceTable _serviceTable;
private readonly HorizonOptions _options; private readonly HorizonOptions _options;
internal ServiceEntry(Action entrypoint, HorizonOptions options) internal ServiceEntry(Action<ServiceTable> entrypoint, ServiceTable serviceTable, HorizonOptions options)
{ {
_entrypoint = entrypoint; _entrypoint = entrypoint;
_serviceTable = serviceTable;
_options = options; _options = options;
} }
@ -19,7 +21,7 @@ namespace Ryujinx.Horizon
{ {
HorizonStatic.Register(_options, syscallApi, addressSpace, threadContext, (int)threadContext.GetX(1)); HorizonStatic.Register(_options, syscallApi, addressSpace, threadContext, (int)threadContext.GetX(1));
_entrypoint(); _entrypoint(_serviceTable);
} }
} }
} }

44
Ryujinx.Horizon/ServiceTable.cs
View File

@ -1,22 +1,58 @@
using Ryujinx.Horizon.LogManager; using Ryujinx.Horizon.LogManager;
using Ryujinx.Horizon.Prepo;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading;
namespace Ryujinx.Horizon namespace Ryujinx.Horizon
{ {
public static class ServiceTable public class ServiceTable
{ {
public static IEnumerable<ServiceEntry> GetServices(HorizonOptions options) private int _readyServices;
private int _totalServices;
private readonly ManualResetEvent _servicesReadyEvent = new(false);
public IEnumerable<ServiceEntry> GetServices(HorizonOptions options)
{ {
List<ServiceEntry> entries = new List<ServiceEntry>(); List<ServiceEntry> entries = new();
void RegisterService<T>() where T : IService void RegisterService<T>() where T : IService
{ {
entries.Add(new ServiceEntry(T.Main, options)); entries.Add(new ServiceEntry(T.Main, this, options));
} }
RegisterService<LmMain>(); RegisterService<LmMain>();
RegisterService<PrepoMain>();
_totalServices = entries.Count;
return entries; return entries;
} }
internal void SignalServiceReady()
{
if (Interlocked.Increment(ref _readyServices) == _totalServices)
{
_servicesReadyEvent.Set();
}
}
public void WaitServicesReady()
{
_servicesReadyEvent.WaitOne();
}
protected virtual void Dispose(bool disposing)
{
if (disposing)
{
_servicesReadyEvent.Dispose();
}
}
public void Dispose()
{
Dispose(true);
}
} }
} }

3
Ryujinx.Horizon/Sm/Impl/ServiceManager.cs
View File

@ -126,20 +126,19 @@ namespace Ryujinx.Horizon.Sm.Impl
// TODO: Validation with GetProcessInfo etc. // TODO: Validation with GetProcessInfo etc.
int serviceIndex = GetServiceInfo(name); int serviceIndex = GetServiceInfo(name);
if (serviceIndex < 0) if (serviceIndex < 0)
{ {
return SmResult.NotRegistered; return SmResult.NotRegistered;
} }
ref var serviceInfo = ref _services[serviceIndex]; ref var serviceInfo = ref _services[serviceIndex];
if (serviceInfo.OwnerProcessId != processId) if (serviceInfo.OwnerProcessId != processId)
{ {
return SmResult.NotAllowed; return SmResult.NotAllowed;
} }
serviceInfo.Free(); serviceInfo.Free();
return Result.Success; return Result.Success;
} }

8
Ryujinx.Horizon/Sm/Ipc/ManagerService.cs Normal file
View File

@ -0,0 +1,8 @@
using Ryujinx.Horizon.Sdk.Sm;
namespace Ryujinx.Horizon.Sm.Ipc
{
partial class ManagerService : IManagerService
{
}
}

4
Ryujinx.Horizon/Sm/UserService.cs → Ryujinx.Horizon/Sm/Ipc/UserService.cs
View File

@ -3,9 +3,9 @@ using Ryujinx.Horizon.Sdk.Sf;
using Ryujinx.Horizon.Sdk.Sm; using Ryujinx.Horizon.Sdk.Sm;
using Ryujinx.Horizon.Sm.Impl; using Ryujinx.Horizon.Sm.Impl;
namespace Ryujinx.Horizon.Sm namespace Ryujinx.Horizon.Sm.Ipc
{ {
partial class UserService : IServiceObject partial class UserService : IUserService
{ {
private readonly ServiceManager _serviceManager; private readonly ServiceManager _serviceManager;

8
Ryujinx.Horizon/Sm/ManagerService.cs
View File

@ -1,8 +0,0 @@
using Ryujinx.Horizon.Sdk.Sf;
namespace Ryujinx.Horizon.Sm
{
partial class ManagerService : IServiceObject
{
}
}

28
Ryujinx.Horizon/Sm/SmMain.cs
View File

@ -1,29 +1,33 @@
using Ryujinx.Horizon.Sdk.Sf.Hipc; using Ryujinx.Horizon.Prepo.Types;
using Ryujinx.Horizon.Prepo;
using Ryujinx.Horizon.Sdk.Sf.Hipc;
using Ryujinx.Horizon.Sdk.Sm; using Ryujinx.Horizon.Sdk.Sm;
using Ryujinx.Horizon.Sm.Impl; using Ryujinx.Horizon.Sm.Impl;
using Ryujinx.Horizon.Sm.Types;
namespace Ryujinx.Horizon.Sm namespace Ryujinx.Horizon.Sm
{ {
public class SmMain public class SmMain
{ {
private enum PortIndex private const int SmMaxSessionsCount = 64;
{ private const int SmmMaxSessionsCount = 1;
User, private const int SmTotalMaxSessionsCount = SmMaxSessionsCount + SmmMaxSessionsCount;
Manager
}
private const int MaxPortsCount = 2; private const int MaxPortsCount = 2;
private readonly ServerManager _serverManager = new ServerManager(null, null, MaxPortsCount, ManagerOptions.Default, 0); private SmServerManager _serverManager;
private readonly ServiceManager _serviceManager = new ServiceManager();
private readonly ServiceManager _serviceManager = new();
public void Main() public void Main()
{ {
HorizonStatic.Syscall.ManageNamedPort(out int smHandle, "sm:", 64).AbortOnFailure(); HorizonStatic.Syscall.ManageNamedPort(out int smHandle, "sm:", SmMaxSessionsCount).AbortOnFailure();
_serverManager.RegisterServer((int)PortIndex.User, smHandle); _serverManager = new SmServerManager(_serviceManager, null, null, MaxPortsCount, ManagerOptions.Default, SmTotalMaxSessionsCount);
_serviceManager.RegisterServiceForSelf(out int smmHandle, ServiceName.Encode("sm:m"), 1).AbortOnFailure();
_serverManager.RegisterServer((int)PortIndex.Manager, smmHandle); _serverManager.RegisterServer((int)SmPortIndex.User, smHandle);
_serviceManager.RegisterServiceForSelf(out int smmHandle, ServiceName.Encode("sm:m"), SmmMaxSessionsCount).AbortOnFailure();
_serverManager.RegisterServer((int)SmPortIndex.Manager, smmHandle);
_serverManager.ServiceRequests(); _serverManager.ServiceRequests();
} }
} }

18
Ryujinx.Horizon/Sm/SmResult.cs
View File

@ -6,14 +6,14 @@ namespace Ryujinx.Horizon.Sm
{ {
private const int ModuleId = 21; private const int ModuleId = 21;
public static Result OutOfProcess => new Result(ModuleId, 1); public static Result OutOfProcess => new(ModuleId, 1);
public static Result InvalidClient => new Result(ModuleId, 2); public static Result InvalidClient => new(ModuleId, 2);
public static Result OutOfSessions => new Result(ModuleId, 3); public static Result OutOfSessions => new(ModuleId, 3);
public static Result AlreadyRegistered => new Result(ModuleId, 4); public static Result AlreadyRegistered => new(ModuleId, 4);
public static Result OutOfServices => new Result(ModuleId, 5); public static Result OutOfServices => new(ModuleId, 5);
public static Result InvalidServiceName => new Result(ModuleId, 6); public static Result InvalidServiceName => new(ModuleId, 6);
public static Result NotRegistered => new Result(ModuleId, 7); public static Result NotRegistered => new(ModuleId, 7);
public static Result NotAllowed => new Result(ModuleId, 8); public static Result NotAllowed => new(ModuleId, 8);
public static Result TooLargeAccessControl => new Result(ModuleId, 9); public static Result TooLargeAccessControl => new(ModuleId, 9);
} }
} }

30
Ryujinx.Horizon/Sm/SmServerManager.cs Normal file
View File

@ -0,0 +1,30 @@
using Ryujinx.Horizon.Common;
using Ryujinx.Horizon.Sdk.Sf.Hipc;
using Ryujinx.Horizon.Sdk.Sm;
using Ryujinx.Horizon.Sm.Impl;
using Ryujinx.Horizon.Sm.Ipc;
using Ryujinx.Horizon.Sm.Types;
using System;
namespace Ryujinx.Horizon.Sm
{
class SmServerManager : ServerManager
{
private readonly ServiceManager _serviceManager;
public SmServerManager(ServiceManager serviceManager, HeapAllocator allocator, SmApi sm, int maxPorts, ManagerOptions options, int maxSessions) : base(allocator, sm, maxPorts, options, maxSessions)
{
_serviceManager = serviceManager;
}
protected override Result OnNeedsToAccept(int portIndex, Server server)
{
return (SmPortIndex)portIndex switch
{
SmPortIndex.User => AcceptImpl(server, new UserService(_serviceManager)),
SmPortIndex.Manager => AcceptImpl(server, new ManagerService()),
_ => throw new ArgumentOutOfRangeException(nameof(portIndex)),
};
}
}
}

8
Ryujinx.Horizon/Sm/Types/SmPortIndex.cs Normal file
View File

@ -0,0 +1,8 @@
namespace Ryujinx.Horizon.Sm.Types
{
enum SmPortIndex
{
User,
Manager
}
}