From 42a2a80b876bfbaac212f4f485f3e4019893b8a0 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Thu, 5 May 2022 15:23:30 -0300 Subject: [PATCH] Enable JIT service LLE (#2959) * Enable JIT service LLE * Force disable PPTC when using the JIT service PPTC does not support multiple guest processes * Fix build * Make SM service registration per emulation context rather than global * Address PR feedback --- Ryujinx.HLE/HOS/ApplicationLoader.cs | 103 ++++++++++++++++-- Ryujinx.HLE/HOS/Horizon.cs | 7 +- .../ApplicationProxy/IApplicationFunctions.cs | 33 ++++++ Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs | 9 ++ Ryujinx.HLE/HOS/Services/ServerBase.cs | 1 - .../Settings/ISystemSettingsServer.cs | 13 ++- Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs | 45 ++++---- Ryujinx.HLE/HOS/Services/Sm/SmRegistry.cs | 49 +++++++++ 8 files changed, 229 insertions(+), 31 deletions(-) create mode 100644 Ryujinx.HLE/HOS/Services/Sm/SmRegistry.cs diff --git a/Ryujinx.HLE/HOS/ApplicationLoader.cs b/Ryujinx.HLE/HOS/ApplicationLoader.cs index b3d23ea7b0..50ab9e1f8a 100644 --- a/Ryujinx.HLE/HOS/ApplicationLoader.cs +++ b/Ryujinx.HLE/HOS/ApplicationLoader.cs @@ -24,6 +24,7 @@ using System.Globalization; using System.IO; using System.Linq; using System.Reflection; +using System.Text; using static LibHac.Fs.ApplicationSaveDataManagement; using static Ryujinx.HLE.HOS.ModLoader; @@ -308,6 +309,94 @@ namespace Ryujinx.HLE.HOS LoadNca(nca, null, null); } + public void LoadServiceNca(string ncaFile) + { + // Disable PPTC here as it does not support multiple processes running. + // TODO: This should be eventually removed and it should stop using global state and + // instead manage the cache per process. + Ptc.Close(); + PtcProfiler.Stop(); + + FileStream file = new FileStream(ncaFile, FileMode.Open, FileAccess.Read); + Nca mainNca = new Nca(_device.Configuration.VirtualFileSystem.KeySet, file.AsStorage(false)); + + if (mainNca.Header.ContentType != NcaContentType.Program) + { + Logger.Error?.Print(LogClass.Loader, "Selected NCA is not a \"Program\" NCA"); + + return; + } + + IFileSystem codeFs = null; + + if (mainNca.CanOpenSection(NcaSectionType.Code)) + { + codeFs = mainNca.OpenFileSystem(NcaSectionType.Code, _device.System.FsIntegrityCheckLevel); + } + + if (codeFs == null) + { + Logger.Error?.Print(LogClass.Loader, "No ExeFS found in NCA"); + + return; + } + + using var npdmFile = new UniqueRef(); + + Result result = codeFs.OpenFile(ref npdmFile.Ref(), "/main.npdm".ToU8Span(), OpenMode.Read); + + MetaLoader metaData; + + npdmFile.Get.GetSize(out long fileSize).ThrowIfFailure(); + + var npdmBuffer = new byte[fileSize]; + npdmFile.Get.Read(out _, 0, npdmBuffer).ThrowIfFailure(); + + metaData = new MetaLoader(); + metaData.Load(npdmBuffer).ThrowIfFailure(); + + NsoExecutable[] nsos = new NsoExecutable[ExeFsPrefixes.Length]; + + for (int i = 0; i < nsos.Length; i++) + { + string name = ExeFsPrefixes[i]; + + if (!codeFs.FileExists($"/{name}")) + { + continue; // File doesn't exist, skip. + } + + Logger.Info?.Print(LogClass.Loader, $"Loading {name}..."); + + using var nsoFile = new UniqueRef(); + + codeFs.OpenFile(ref nsoFile.Ref(), $"/{name}".ToU8Span(), OpenMode.Read).ThrowIfFailure(); + + nsos[i] = new NsoExecutable(nsoFile.Release().AsStorage(), name); + } + + // Collect the nsos, ignoring ones that aren't used. + NsoExecutable[] programs = nsos.Where(x => x != null).ToArray(); + + MemoryManagerMode memoryManagerMode = _device.Configuration.MemoryManagerMode; + + if (!MemoryBlock.SupportsFlags(MemoryAllocationFlags.ViewCompatible)) + { + memoryManagerMode = MemoryManagerMode.SoftwarePageTable; + } + + metaData.GetNpdm(out Npdm npdm).ThrowIfFailure(); + ProgramInfo programInfo = new ProgramInfo(in npdm, allowCodeMemoryForJit: false); + ProgramLoader.LoadNsos(_device.System.KernelContext, out _, metaData, programInfo, executables: programs); + + string titleIdText = npdm.Aci.Value.ProgramId.Value.ToString("x16"); + bool titleIs64Bit = (npdm.Meta.Value.Flags & 1) != 0; + + string programName = Encoding.ASCII.GetString(npdm.Meta.Value.ProgramName).TrimEnd('\0'); + + Logger.Info?.Print(LogClass.Loader, $"Service Loaded: {programName} [{titleIdText}] [{(titleIs64Bit ? "64-bit" : "32-bit")}]"); + } + private void LoadNca(Nca mainNca, Nca patchNca, Nca controlNca) { if (mainNca.Header.ContentType != NcaContentType.Program) @@ -508,7 +597,7 @@ namespace Ryujinx.HLE.HOS { if (_device.Configuration.VirtualFileSystem.ModLoader.ReplaceExefsPartition(TitleId, ref codeFs)) { - metaData = null; //TODO: Check if we should retain old npdm + metaData = null; // TODO: Check if we should retain old npdm. } metaData ??= ReadNpdm(codeFs); @@ -521,7 +610,7 @@ namespace Ryujinx.HLE.HOS if (!codeFs.FileExists($"/{name}")) { - continue; // file doesn't exist, skip + continue; // File doesn't exist, skip. } Logger.Info?.Print(LogClass.Loader, $"Loading {name}..."); @@ -533,13 +622,13 @@ namespace Ryujinx.HLE.HOS nsos[i] = new NsoExecutable(nsoFile.Release().AsStorage(), name); } - // ExeFs file replacements + // ExeFs file replacements. ModLoadResult modLoadResult = _device.Configuration.VirtualFileSystem.ModLoader.ApplyExefsMods(TitleId, nsos); - // collect the nsos, ignoring ones that aren't used + // Collect the nsos, ignoring ones that aren't used. NsoExecutable[] programs = nsos.Where(x => x != null).ToArray(); - // take the npdm from mods if present + // Take the npdm from mods if present. if (modLoadResult.Npdm != null) { metaData = modLoadResult.Npdm; @@ -598,7 +687,7 @@ namespace Ryujinx.HLE.HOS executable = obj; - // homebrew NRO can actually have some data after the actual NRO + // Homebrew NRO can actually have some data after the actual NRO. if (input.Length > obj.FileSize) { input.Position = obj.FileSize; @@ -677,7 +766,7 @@ namespace Ryujinx.HLE.HOS TitleIs64Bit = (npdm.Meta.Value.Flags & 1) != 0; _device.System.LibHacHorizonManager.ArpIReader.ApplicationId = new LibHac.ApplicationId(TitleId); - // Explicitly null titleid to disable the shader cache + // Explicitly null titleid to disable the shader cache. Graphics.Gpu.GraphicsConfig.TitleId = null; _device.Gpu.HostInitalized.Set(); diff --git a/Ryujinx.HLE/HOS/Horizon.cs b/Ryujinx.HLE/HOS/Horizon.cs index 24d04c1221..7de9bdf339 100644 --- a/Ryujinx.HLE/HOS/Horizon.cs +++ b/Ryujinx.HLE/HOS/Horizon.cs @@ -72,6 +72,8 @@ namespace Ryujinx.HLE.HOS internal List NfpDevices { get; private set; } + internal SmRegistry SmRegistry { get; private set; } + internal ServerBase SmServer { get; private set; } internal ServerBase BsdServer { get; private set; } internal ServerBase AudRenServer { get; private set; } @@ -291,7 +293,8 @@ namespace Ryujinx.HLE.HOS private void InitializeServices() { - SmServer = new ServerBase(KernelContext, "SmServer", () => new IUserInterface(KernelContext)); + SmRegistry = new SmRegistry(); + SmServer = new ServerBase(KernelContext, "SmServer", () => new IUserInterface(KernelContext, SmRegistry)); // Wait until SM server thread is done with initialization, // only then doing connections to SM is safe. @@ -468,7 +471,7 @@ namespace Ryujinx.HLE.HOS AudioRendererManager.Dispose(); LibHacHorizonManager.PmClient.Fs.UnregisterProgram(LibHacHorizonManager.ApplicationClient.Os.GetCurrentProcessId().Value).ThrowIfFailure(); - + KernelContext.Dispose(); } } diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs b/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs index efc1884f77..b4a92d6932 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs @@ -2,9 +2,12 @@ using LibHac; using LibHac.Account; using LibHac.Common; using LibHac.Fs; +using LibHac.FsSystem; +using LibHac.Ncm; using LibHac.Ns; using Ryujinx.Common; using Ryujinx.Common.Logging; +using Ryujinx.HLE.Exceptions; using Ryujinx.HLE.HOS.Ipc; using Ryujinx.HLE.HOS.Kernel.Common; using Ryujinx.HLE.HOS.Kernel.Memory; @@ -12,9 +15,11 @@ using Ryujinx.HLE.HOS.Kernel.Threading; using Ryujinx.HLE.HOS.Services.Am.AppletAE.Storage; using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types; using Ryujinx.HLE.HOS.Services.Sdb.Pdm.QueryService; +using Ryujinx.HLE.HOS.Services.Sm; using Ryujinx.HLE.HOS.SystemState; using System; using System.Numerics; +using System.Threading; using static LibHac.Fs.ApplicationSaveDataManagement; using AccountUid = Ryujinx.HLE.HOS.Services.Account.Acc.UserId; @@ -37,6 +42,8 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati private int _notificationStorageChannelEventHandle; private int _healthWarningDisappearedSystemEventHandle; + private int _jitLoaded; + private HorizonClient _horizon; public IApplicationFunctions(Horizon system) @@ -631,5 +638,31 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } + + [CommandHipc(1001)] // 10.0.0+ + // PrepareForJit() + public ResultCode PrepareForJit(ServiceCtx context) + { + if (Interlocked.Exchange(ref _jitLoaded, 1) == 0) + { + string jitPath = context.Device.System.ContentManager.GetInstalledContentPath(0x010000000000003B, StorageId.BuiltInSystem, NcaContentType.Program); + string filePath = context.Device.FileSystem.SwitchPathToSystemPath(jitPath); + + if (string.IsNullOrWhiteSpace(filePath)) + { + throw new InvalidSystemResourceException($"JIT (010000000000003B) system title not found! The JIT will not work, provide the system archive to fix this error. (See https://github.com/Ryujinx/Ryujinx#requirements for more information)"); + } + + context.Device.Application.LoadServiceNca(filePath); + + // FIXME: Most likely not how this should be done? + while (!context.Device.System.SmRegistry.IsServiceRegistered("jit:u")) + { + context.Device.System.SmRegistry.WaitForServiceRegistration(); + } + } + + return ResultCode.Success; + } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs b/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs index d986bc41f9..5590bfddf4 100644 --- a/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs @@ -579,6 +579,15 @@ namespace Ryujinx.HLE.HOS.Services.Ro return ResultCode.Success; } + [CommandHipc(10)] + // LoadNrr2(u64, u64, u64, pid) + public ResultCode LoadNrr2(ServiceCtx context) + { + context.Device.System.KernelContext.Syscall.CloseHandle(context.Request.HandleDesc.ToCopy[0]); + + return LoadNrr(context); + } + protected override void Dispose(bool isDisposing) { if (isDisposing) diff --git a/Ryujinx.HLE/HOS/Services/ServerBase.cs b/Ryujinx.HLE/HOS/Services/ServerBase.cs index 1a1e4a340e..9078334417 100644 --- a/Ryujinx.HLE/HOS/Services/ServerBase.cs +++ b/Ryujinx.HLE/HOS/Services/ServerBase.cs @@ -4,7 +4,6 @@ using Ryujinx.HLE.HOS.Kernel.Common; using Ryujinx.HLE.HOS.Kernel.Ipc; using Ryujinx.HLE.HOS.Kernel.Process; using Ryujinx.HLE.HOS.Kernel.Threading; -using Ryujinx.HLE.HOS.Services.Sm; using System; using System.Buffers.Binary; using System.Collections.Generic; diff --git a/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs b/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs index 88888f34f0..1ce7bbfc13 100644 --- a/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs +++ b/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs @@ -222,7 +222,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(60)] + [CommandHipc(60)] // IsUserSystemClockAutomaticCorrectionEnabled() -> bool public ResultCode IsUserSystemClockAutomaticCorrectionEnabled(ServiceCtx context) { @@ -234,6 +234,17 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } + [CommandHipc(62)] + // GetDebugModeFlag() -> bool + public ResultCode GetDebugModeFlag(ServiceCtx context) + { + context.ResponseData.Write(false); + + Logger.Stub?.PrintStub(LogClass.ServiceSet); + + return ResultCode.Success; + } + [CommandHipc(77)] // GetDeviceNickName() -> buffer public ResultCode GetDeviceNickName(ServiceCtx context) diff --git a/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs b/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs index a5595e3100..8e66b28dad 100644 --- a/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs @@ -1,11 +1,9 @@ using Ryujinx.Common.Logging; -using Ryujinx.HLE.Exceptions; using Ryujinx.HLE.HOS.Ipc; using Ryujinx.HLE.HOS.Kernel; using Ryujinx.HLE.HOS.Kernel.Common; using Ryujinx.HLE.HOS.Kernel.Ipc; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.IO; using System.Linq; @@ -17,21 +15,19 @@ namespace Ryujinx.HLE.HOS.Services.Sm { private static Dictionary _services; - private static readonly ConcurrentDictionary _registeredServices; - + private readonly SmRegistry _registry; private readonly ServerBase _commonServer; private bool _isInitialized; - public IUserInterface(KernelContext context) + public IUserInterface(KernelContext context, SmRegistry registry) { _commonServer = new ServerBase(context, "CommonServer"); + _registry = registry; } static IUserInterface() { - _registeredServices = new ConcurrentDictionary(); - _services = Assembly.GetExecutingAssembly().GetTypes() .SelectMany(type => type.GetCustomAttributes(typeof(ServiceAttribute), true) .Select(service => (((ServiceAttribute)service).Name, type))) @@ -74,7 +70,7 @@ namespace Ryujinx.HLE.HOS.Services.Sm KSession session = new KSession(context.Device.System.KernelContext); - if (_registeredServices.TryGetValue(name, out KPort port)) + if (_registry.TryGetService(name, out KPort port)) { KernelResult result = port.EnqueueIncomingSession(session.ServerSession); @@ -82,6 +78,15 @@ namespace Ryujinx.HLE.HOS.Services.Sm { throw new InvalidOperationException($"Session enqueue on port returned error \"{result}\"."); } + + if (context.Process.HandleTable.GenerateHandle(session.ClientSession, out int handle) != KernelResult.Success) + { + throw new InvalidOperationException("Out of handles!"); + } + + session.ClientSession.DecrementReferenceCount(); + + context.Response.HandleDesc = IpcHandleDesc.MakeMove(handle); } else { @@ -107,18 +112,18 @@ namespace Ryujinx.HLE.HOS.Services.Sm throw new NotImplementedException(name); } } + + if (context.Process.HandleTable.GenerateHandle(session.ClientSession, out int handle) != KernelResult.Success) + { + throw new InvalidOperationException("Out of handles!"); + } + + session.ServerSession.DecrementReferenceCount(); + session.ClientSession.DecrementReferenceCount(); + + context.Response.HandleDesc = IpcHandleDesc.MakeMove(handle); } - if (context.Process.HandleTable.GenerateHandle(session.ClientSession, out int handle) != KernelResult.Success) - { - throw new InvalidOperationException("Out of handles!"); - } - - session.ServerSession.DecrementReferenceCount(); - session.ClientSession.DecrementReferenceCount(); - - context.Response.HandleDesc = IpcHandleDesc.MakeMove(handle); - return ResultCode.Success; } @@ -179,7 +184,7 @@ namespace Ryujinx.HLE.HOS.Services.Sm KPort port = new KPort(context.Device.System.KernelContext, maxSessions, isLight, 0); - if (!_registeredServices.TryAdd(name, port)) + if (!_registry.TryRegister(name, port)) { return ResultCode.AlreadyRegistered; } @@ -219,7 +224,7 @@ namespace Ryujinx.HLE.HOS.Services.Sm return ResultCode.InvalidName; } - if (!_registeredServices.TryRemove(name, out _)) + if (!_registry.Unregister(name)) { return ResultCode.NotRegistered; } diff --git a/Ryujinx.HLE/HOS/Services/Sm/SmRegistry.cs b/Ryujinx.HLE/HOS/Services/Sm/SmRegistry.cs new file mode 100644 index 0000000000..e62e0eb534 --- /dev/null +++ b/Ryujinx.HLE/HOS/Services/Sm/SmRegistry.cs @@ -0,0 +1,49 @@ +using Ryujinx.HLE.HOS.Kernel.Ipc; +using System.Collections.Concurrent; +using System.Threading; + +namespace Ryujinx.HLE.HOS.Services.Sm +{ + class SmRegistry + { + private readonly ConcurrentDictionary _registeredServices; + private readonly AutoResetEvent _serviceRegistrationEvent; + + public SmRegistry() + { + _registeredServices = new ConcurrentDictionary(); + _serviceRegistrationEvent = new AutoResetEvent(false); + } + + public bool TryGetService(string name, out KPort port) + { + return _registeredServices.TryGetValue(name, out port); + } + + public bool TryRegister(string name, KPort port) + { + if (_registeredServices.TryAdd(name, port)) + { + _serviceRegistrationEvent.Set(); + return true; + } + + return false; + } + + public bool Unregister(string name) + { + return _registeredServices.TryRemove(name, out _); + } + + public bool IsServiceRegistered(string name) + { + return _registeredServices.TryGetValue(name, out _); + } + + public void WaitForServiceRegistration() + { + _serviceRegistrationEvent.WaitOne(); + } + } +} \ No newline at end of file