mirror of
https://github.com/FEX-Emu/FEX.git
synced 2026-10-15 05:00:41 +02:00
WOW64: Handle target threads where the JIT is uninitialised
Suspend may be called on a thread before it has finished WOW64 initialisation, keep track of all initialized threads and fallback to direct NtSuspendThread when this is the case.
This commit is contained in:
1 parent
a78ffeeaba
commit
0806d4ec25
1 file changed
+20
@@ -35,6 +35,7 @@ $end_info$
|
||||
#include <atomic>
|
||||
#include <mutex>
|
||||
#include <utility>
|
||||
#include <unordered_set>
|
||||
#include <ntstatus.h>
|
||||
#include <windef.h>
|
||||
#include <winternl.h>
|
||||
@@ -94,6 +95,7 @@ namespace {
|
||||
SYSTEM_CPU_INFORMATION CpuInfo{};
|
||||
|
||||
std::mutex ThreadSuspendLock;
|
||||
std::unordered_set<DWORD> InitializedWOWThreads; // Set of TIDs, `ThreadSuspendLock` must be locked when accessing
|
||||
|
||||
std::pair<NTSTATUS, TLS> GetThreadTLS(HANDLE Thread) {
|
||||
THREAD_BASIC_INFORMATION Info;
|
||||
@@ -555,6 +557,8 @@ void BTCpuProcessInit() {
|
||||
NTSTATUS BTCpuThreadInit() {
|
||||
GetTLS().ThreadState() = CTX->CreateThread(nullptr, 0);
|
||||
|
||||
std::scoped_lock Lock(ThreadSuspendLock);
|
||||
InitializedWOWThreads.emplace(GetCurrentThreadId());
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -564,6 +568,17 @@ NTSTATUS BTCpuThreadTerm(HANDLE Thread) {
|
||||
return Err;
|
||||
}
|
||||
|
||||
{
|
||||
THREAD_BASIC_INFORMATION Info;
|
||||
if (NTSTATUS Err = NtQueryInformationThread(Thread, ThreadBasicInformation, &Info, sizeof(Info), nullptr); Err) {
|
||||
return Err;
|
||||
}
|
||||
|
||||
const auto ThreadTID = reinterpret_cast<uint64_t>(Info.ClientId.UniqueThread);
|
||||
std::scoped_lock Lock(ThreadSuspendLock);
|
||||
InitializedWOWThreads.erase(ThreadTID);
|
||||
}
|
||||
|
||||
CTX->DestroyThread(TLS.ThreadState());
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
@@ -666,6 +681,11 @@ NTSTATUS BTCpuSuspendLocalThread(HANDLE Thread, ULONG *Count) {
|
||||
}
|
||||
|
||||
std::scoped_lock Lock(ThreadSuspendLock);
|
||||
|
||||
// If the thread hasn't yet been initialized, suspend it without special handling as it wont yet have entered the JIT
|
||||
if (!InitializedWOWThreads.contains(ThreadTID))
|
||||
return NtSuspendThread(Thread, Count);
|
||||
|
||||
// If CONTROL_IN_JIT is unset at this point, then it can never be set (and thus the JIT cannot be reentered) as
|
||||
// CONTROL_PAUSED has been set, as such, while this may redundantly request interrupts in rare cases it will never
|
||||
// miss them
|
||||
|
||||
Reference in new issue
Block a user