i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/smp: call_all_cpus should run with interrupts disabled.

Browse Source 
For consistency. And so should call_single_cpu.

Fixes #19983.
This commit is contained in:
Augustin Cavalier
2026-03-17 14:23:58 -04:00
parent 89c81c2ac1
commit 14b78e205c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/smp.cpp
+6 -6
View File
@@ -1320,6 +1320,8 @@ smp_multicast_ici_interrupts_disabled(int32 currentCPU, const CPUSet& cpuMask,
bool bool
smp_trap_non_boot_cpus(int32 cpu, uint32* rendezVous) smp_trap_non_boot_cpus(int32 cpu, uint32* rendezVous)
{ {
ASSERT(!are_interrupts_enabled());
if (cpu == 0) { if (cpu == 0) {
smp_cpu_rendezvous(rendezVous); smp_cpu_rendezvous(rendezVous);
return true; return true;
@@ -1462,7 +1464,9 @@ call_single_cpu(uint32 targetCPU, void (*func)(void*, int), void* cookie, bool s
thread_pin_to_current_cpu(thread_get_current_thread()); thread_pin_to_current_cpu(thread_get_current_thread());
if (targetCPU == (uint32)smp_get_current_cpu()) { if (targetCPU == (uint32)smp_get_current_cpu()) {
cpu_status state = disable_interrupts();
func(cookie, smp_get_current_cpu()); func(cookie, smp_get_current_cpu());
restore_interrupts(state);
thread_unpin_from_current_cpu(thread_get_current_thread()); thread_unpin_from_current_cpu(thread_get_current_thread());
return; return;
} }
@@ -1507,12 +1511,8 @@ call_all_cpus(void (*func)(void*, int), void* cookie, bool sync)
return; return;
} }
if (sNumCPUs > 1) { smp_broadcast_ici(SMP_MSG_CALL_FUNCTION, (addr_t)cookie,
smp_broadcast_ici(SMP_MSG_CALL_FUNCTION, (addr_t)cookie, 0, 0, (void*)func, sync ? SMP_MSG_FLAG_SYNC : SMP_MSG_FLAG_ASYNC);
0, 0, (void*)func, sync ? SMP_MSG_FLAG_SYNC : SMP_MSG_FLAG_ASYNC);
} else {
func(cookie, smp_get_current_cpu());
}
} }