Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Allow relockign mutex even when holding a spinlock 

Only reason mutex locking is now allowed with spinlocks is to prevent
yield.

Also try_lock can be now safely used while holding a spinlock
This commit is contained in:
Bananymous 2025-06-28 16:46:49 +03:00
parent e8491b34b8
commit db571b4859
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/include/kernel/Lock/Mutex.h
View File

@ -32,11 +32,11 @@ namespace Kernel
void lock() override void lock() override
{ {
const auto tid = Thread::current_tid(); const auto tid = Thread::current_tid();
ASSERT(!tid || !Thread::current().has_spinlock());
if (tid == m_locker) if (tid == m_locker)
ASSERT(m_lock_depth > 0); ASSERT(m_lock_depth > 0);
else else
{ {
ASSERT(!tid || !Thread::current().has_spinlock());
pid_t expected = -1; pid_t expected = -1;
while (!m_locker.compare_exchange(expected, tid)) while (!m_locker.compare_exchange(expected, tid))
{ {
@ -53,7 +53,6 @@ namespace Kernel
bool try_lock() override bool try_lock() override
{ {
const auto tid = Thread::current_tid(); const auto tid = Thread::current_tid();
ASSERT(!tid || !Thread::current().has_spinlock());
if (tid == m_locker) if (tid == m_locker)
ASSERT(m_lock_depth > 0); ASSERT(m_lock_depth > 0);
else else
@ -102,12 +101,12 @@ namespace Kernel
void lock() override void lock() override
{ {
const auto tid = Thread::current_tid(); const auto tid = Thread::current_tid();
ASSERT(!tid || !Thread::current().has_spinlock());
if (tid == m_locker) if (tid == m_locker)
ASSERT(m_lock_depth > 0); ASSERT(m_lock_depth > 0);
else else
{ {
ASSERT(!tid || !Thread::current().has_spinlock());
bool has_priority = tid ? !Thread::current().is_userspace() : true; bool has_priority = tid ? !Thread::current().is_userspace() : true;
if (has_priority) if (has_priority)
m_queue_length++; m_queue_length++;
@ -127,7 +126,6 @@ namespace Kernel
bool try_lock() override bool try_lock() override
{ {
const auto tid = Thread::current_tid(); const auto tid = Thread::current_tid();
ASSERT(!tid || !Thread::current().has_spinlock());
if (tid == m_locker) if (tid == m_locker)
ASSERT(m_lock_depth > 0); ASSERT(m_lock_depth > 0);