Skip to content

Commit

Permalink
Kernel: Make m_halt_requested an atomic variable
Browse files Browse the repository at this point in the history
We need to make sure the change to this variable is visible to all
processors instantly.
  • Loading branch information
tomuta authored and awesomekling committed Nov 11, 2020
1 parent a14884d commit e26e044
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Kernel/Arch/i386/CPU.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1819,11 +1819,11 @@ bool Processor::smp_process_pending_messages()
}
}

if (m_halt_requested)
if (m_halt_requested.load(AK::MemoryOrder::memory_order_relaxed))
halt_this();
}
did_process = true;
} else if (m_halt_requested) {
} else if (m_halt_requested.load(AK::MemoryOrder::memory_order_relaxed)) {
halt_this();
}

Expand Down Expand Up @@ -1876,7 +1876,7 @@ void Processor::smp_broadcast_message(ProcessorMessage& msg, bool async)
// We need to check here if another processor may have requested
// us to halt before this message could be delivered. Otherwise
// we're just spinning the CPU because msg.refs will never drop to 0.
if (cur_proc.m_halt_requested)
if (cur_proc.m_halt_requested.load(AK::MemoryOrder::memory_order_relaxed))
halt_this();
}

Expand Down Expand Up @@ -1918,7 +1918,7 @@ void Processor::smp_broadcast_halt()
// by being out of memory and we might not be able to get a message
for_each(
[&](Processor& proc) -> IterationDecision {
proc.m_halt_requested = true;
proc.m_halt_requested.store(true, AK::MemoryOrder::memory_order_release);
return IterationDecision::Continue;
});

Expand Down
2 changes: 1 addition & 1 deletion Kernel/Arch/i386/CPU.h
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ class Processor {

bool m_invoke_scheduler_async;
bool m_scheduler_initialized;
bool m_halt_requested;
Atomic<bool> m_halt_requested;

DeferredCallEntry* m_pending_deferred_calls; // in reverse order
DeferredCallEntry* m_free_deferred_call_pool_entry;
Expand Down

0 comments on commit e26e044

Please sign in to comment.