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

Kernel: Fix thread signal handling

Browse Source 
Threads will now only handle signals once they are not holding any
mutexes. This removes some dead locks.
This commit is contained in:
Bananymous
2024-05-26 20:08:35 +03:00
parent a4c634e4bf
commit 2d3810874d
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,8 @@ namespace Kernel
while (!m_locker.compare_exchange(-1, tid))
Scheduler::get().yield();
ASSERT(m_lock_depth == 0);
if (Scheduler::current_tid())
Thread::current().add_mutex();
}
m_lock_depth++;
}
@@ -41,6 +43,8 @@ namespace Kernel
if (!m_locker.compare_exchange(-1, tid))
return false;
ASSERT(m_lock_depth == 0);
if (Scheduler::current_tid())
Thread::current().add_mutex();
}
m_lock_depth++;
return true;
@@ -51,7 +55,11 @@ namespace Kernel
ASSERT(m_locker == Scheduler::current_tid());
ASSERT(m_lock_depth > 0);
if (--m_lock_depth == 0)
{
m_locker = -1;
if (Scheduler::current_tid())
Thread::current().remove_mutex();
}
}
pid_t locker() const { return m_locker; }
@@ -84,6 +92,8 @@ namespace Kernel
while (!(has_priority || m_queue_length == 0) || !m_locker.compare_exchange(-1, tid))
Scheduler::get().yield();
ASSERT(m_lock_depth == 0);
if (Scheduler::current_tid())
Thread::current().add_mutex();
}
m_lock_depth++;
}
@@ -101,6 +111,8 @@ namespace Kernel
if (has_priority)
m_queue_length++;
ASSERT(m_lock_depth == 0);
if (Scheduler::current_tid())
Thread::current().add_mutex();
}
m_lock_depth++;
return true;
@@ -117,6 +129,8 @@ namespace Kernel
if (has_priority)
m_queue_length--;
m_locker = -1;
if (Scheduler::current_tid())
Thread::current().remove_mutex();
}
}

10
kernel/include/kernel/Thread.h
View File

@@ -38,9 +38,8 @@ namespace Kernel
void setup_exec();
void setup_process_cleanup();
// Adds pending signals to thread if possible and
// returns true, if thread is going to trigger signal
bool is_interrupted_by_signal();
// Returns true, if thread is going to trigger signal
bool is_interrupted_by_signal() const;
// Returns true if pending signal can be added to thread
bool can_add_signal_to_execute() const;
@@ -86,6 +85,9 @@ namespace Kernel
static Thread* sse_thread();
#endif
void add_mutex() { m_mutex_count++; }
void remove_mutex() { m_mutex_count--; }
private:
Thread(pid_t tid, Process*);
@@ -111,6 +113,8 @@ namespace Kernel
SpinLock m_signal_lock;
static_assert(_SIGMAX < 64);
BAN::Atomic<uint32_t> m_mutex_count { 0 };
#if __enable_sse
alignas(16) uint8_t m_sse_storage[512] {};
#endif