RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-01-01 06:10:00 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

kernel: umtx: fix race on lock/unlock

Browse source
This commit is contained in:
DH 2024-11-24 15:44:17 +03:00
parent 8c5bde7bc5
commit c029923739
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
orbis-kernel/src/umtx.cpp
View file

@ -176,6 +176,7 @@ static ErrorCode do_lock_normal(Thread *thread, ptr<umutex> m, uint flags,
std::uint64_t ut, umutex_lock_mode mode) {
ORBIS_LOG_TRACE(__FUNCTION__, thread->tid, m, flags, ut, mode);
auto [chain, key, lock] = g_context.getUmtxChain1(thread, flags, m);
ErrorCode error = {};
while (true) {
int owner = m->owner.load(std::memory_order_acquire);
@ -204,7 +205,6 @@ static ErrorCode do_lock_normal(Thread *thread, ptr<umutex> m, uint flags,
if (error != ErrorCode{} && !isSpuriousWakeup(error))
return error;
auto [chain, key, lock] = g_context.getUmtxChain1(thread, flags, m);
auto node = chain.enqueue(key, thread);
if (m->owner.compare_exchange_strong(owner, owner | kUmutexContested)) {
{
@ -232,6 +232,8 @@ static ErrorCode do_lock_pp(Thread *thread, ptr<umutex> m, uint flags,
static ErrorCode do_unlock_normal(Thread *thread, ptr<umutex> m, uint flags) {
ORBIS_LOG_TRACE(__FUNCTION__, thread->tid, m, flags);
auto [chain, key, lock] = g_context.getUmtxChain1(thread, flags, m);
int owner = m->owner.load(std::memory_order_acquire);
if ((owner & ~kUmutexContested) != thread->tid)
return ErrorCode::PERM;
@ -241,7 +243,6 @@ static ErrorCode do_unlock_normal(Thread *thread, ptr<umutex> m, uint flags) {
return {};
}
auto [chain, key, lock] = g_context.getUmtxChain1(thread, flags, m);
std::size_t count = chain.sleep_queue.count(key);
bool ok = m->owner.compare_exchange_strong(
owner, count <= 1 ? kUmutexUnowned : kUmutexContested);