RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 00:17:46 +00:00
Code Issues Activity Actions

Kernel: Do not cancel stale timers when servicing sys$alarm

Browse source 
The sys$alarm() syscall has logic to cache a m_alarm_timer to avoid
allocating a new timer for every call to alarm. Unfortunately that
logic was broken, and there were conditions in which we could have
a timer allocated, but it was no longer on the timer queue, and we
would attempt to cancel that timer again resulting in an infinite
loop waiting for the timers callback to fire.

To fix this, we need to track if a timer is currently in use or not,
allowing us to avoid attempting to cancel inactive timers.

Luke and Tom did the initial investigation, I just happened to have
time to write a repro and attempt a fix, so I'm adding them as the
as co-authors of this commit.

Co-authored-by: Luke <luke.wilde@live.co.uk>
Co-authored-by: Tom <tomut@yahoo.com>
This commit is contained in:
Brian Gianforcaro 2021-07-31 16:27:44 -07:00 • committed by Andreas Kling
parent 2dd6d2121a
commit fc91eb365d
3 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Kernel/TimerQueue.h
View file

@ -45,6 +45,7 @@ private:
Function<void()> m_callback;
Atomic<bool> m_cancelled { false };
Atomic<bool> m_callback_finished { false };
Atomic<bool> m_in_use { false };
bool operator<(const Timer& rhs) const
{
@ -58,11 +59,18 @@ private:
{
return m_id == rhs.m_id;
}
void clear_cancelled() { return m_cancelled.store(false, AK::memory_order_release); }
bool set_cancelled() { return m_cancelled.exchange(true, AK::memory_order_acq_rel); }
bool is_in_use() { return m_in_use.load(AK::memory_order_acquire); };
void set_in_use() { m_in_use.store(true, AK::memory_order_release); }
void clear_in_use() { return m_in_use.store(false, AK::memory_order_release); }
bool is_callback_finished() const { return m_callback_finished.load(AK::memory_order_acquire); }
void clear_callback_finished() { m_callback_finished.store(false, AK::memory_order_release); }
void set_callback_finished() { m_callback_finished.store(true, AK::memory_order_release); }
Time now(bool) const;
bool is_queued() const { return m_list_node.is_in_list(); }
@ -83,7 +91,7 @@ public:
bool add_timer_without_id(NonnullRefPtr<Timer>, clockid_t, const Time&, Function<void()>&&);
TimerId add_timer(clockid_t, const Time& timeout, Function<void()>&& callback);
bool cancel_timer(TimerId id);
bool cancel_timer(Timer&);
bool cancel_timer(Timer& timer, bool* was_in_use = nullptr);
bool cancel_timer(NonnullRefPtr<Timer>&& timer)
{
return cancel_timer(*move(timer));