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

kernel/x86: Always call arch_cpu_global_tlb_invalidate with interrupts disabled.

Browse Source 
Fixes a race. Discovered by SED4906.

Change-Id: I2b267312e9f3ff32bafa2ac2784f5d4a9905e24e
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10416
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Augustin Cavalier
2026-03-09 17:37:05 +00:00
committed by waddlesplash
parent 5d19bcda45
commit de74304510
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/arch_cpu.cpp
+1 -4
View File
@@ -1994,16 +1994,13 @@ void
arch_cpu_global_tlb_invalidate() arch_cpu_global_tlb_invalidate()
{ {
uint32 flags = x86_read_cr4(); uint32 flags = x86_read_cr4();
if ((flags & IA32_CR4_GLOBAL_PAGES) != 0) {
if (flags & IA32_CR4_GLOBAL_PAGES) {
// disable and reenable the global pages to flush all TLBs regardless // disable and reenable the global pages to flush all TLBs regardless
// of the global page bit // of the global page bit
x86_write_cr4(flags & ~IA32_CR4_GLOBAL_PAGES); x86_write_cr4(flags & ~IA32_CR4_GLOBAL_PAGES);
x86_write_cr4(flags | IA32_CR4_GLOBAL_PAGES); x86_write_cr4(flags | IA32_CR4_GLOBAL_PAGES);
} else { } else {
cpu_status state = disable_interrupts();
arch_cpu_user_tlb_invalidate(0); arch_cpu_user_tlb_invalidate(0);
restore_interrupts(state);
} }
} }
src/system/kernel/arch/x86/paging/X86VMTranslationMap.cpp
+2
View File
@@ -104,7 +104,9 @@ X86VMTranslationMap::Flush()
fInvalidPagesCount); fInvalidPagesCount);
if (fIsKernelMap) { if (fIsKernelMap) {
cpu_status state = disable_interrupts();
arch_cpu_global_tlb_invalidate(); arch_cpu_global_tlb_invalidate();
restore_interrupts(state);
smp_send_broadcast_ici(SMP_MSG_GLOBAL_INVALIDATE_PAGES, 0, 0, 0, smp_send_broadcast_ici(SMP_MSG_GLOBAL_INVALIDATE_PAGES, 0, 0, 0,
NULL, SMP_MSG_FLAG_SYNC); NULL, SMP_MSG_FLAG_SYNC);
} else { } else {