mirrors-yuzu-emu/yuzu-mainline
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-mainline synced 2024-11-23 03:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

kernel: fix slab heap ABA

Browse source
This commit is contained in:
Liam 2022-10-17 00:01:50 -04:00
parent d574bb4610
commit 282cd3e5fe
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/core/hle/kernel/k_slab_heap.h
View file

@ -8,6 +8,7 @@
#include "common/assert.h" #include "common/assert.h"
#include "common/common_funcs.h" #include "common/common_funcs.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "common/spin_lock.h"
namespace Kernel { namespace Kernel {
@ -36,28 +37,34 @@ public:
} }
void* Allocate() { void* Allocate() {
Node* ret = m_head.load(); // KScopedInterruptDisable di;
do { m_lock.lock();
if (ret == nullptr) {
break; Node* ret = m_head;
if (ret != nullptr) [[likely]] {
m_head = ret->next;
} }
} while (!m_head.compare_exchange_weak(ret, ret->next));
m_lock.unlock();
return ret; return ret;
} }
void Free(void* obj) { void Free(void* obj) {
Node* node = static_cast<Node*>(obj); // KScopedInterruptDisable di;
Node* cur_head = m_head.load(); m_lock.lock();
do {
node->next = cur_head; Node* node = static_cast<Node*>(obj);
} while (!m_head.compare_exchange_weak(cur_head, node)); node->next = m_head;
m_head = node;
m_lock.unlock();
} }
private: private:
std::atomic<Node*> m_head{}; std::atomic<Node*> m_head{};
Common::SpinLock m_lock;
}; };
} // namespace impl } // namespace impl