From a2b35ecce36767173a9e3db55096e441d550aeef Mon Sep 17 00:00:00 2001
From: Coxxs <58-coxxs@users.noreply.git.ryujinx.app>
Date: Sat, 21 Jun 2025 05:26:48 +0800
Subject: [PATCH] gdb: Add timeout to prevent deadlock in DebugStep

Deadlock can happen when step at some svc instructions.
---
 src/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs b/src/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs
index 7edf263e2..c24d5c3cc 100644
--- a/src/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs
@@ -1283,7 +1283,12 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                 }
                 _kernelContext.CriticalSection.Leave();
 
-                StepBarrier.SignalAndWait();
+                bool stepTimedOut = false;
+                if (!StepBarrier.SignalAndWait(TimeSpan.FromMilliseconds(2000)))
+                {
+                    Logger.Warning?.Print(LogClass.Kernel, $"Failed to step thread {target.ThreadUid} in time.");
+                    stepTimedOut = true;
+                }
 
                 _kernelContext.CriticalSection.Enter();
                 steppingThread = null;
@@ -1302,6 +1307,12 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                     target.Suspend(ThreadSchedState.ThreadPauseFlag);
                 }
                 _kernelContext.CriticalSection.Leave();
+
+                if (stepTimedOut)
+                {
+                    return false;
+                }
+
                 StepBarrier.SignalAndWait();
                 return true;
             }