Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-17 02:26:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock in FLUSH_OPS by disabling IRQ

Browse Source
This commit is contained in:
Ruize Tang 2024-11-26 21:04:11 +08:00 committed by Tate, Hongliang Tian
parent 6c4f56723c
commit 5313689d6f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ostd/src/mm/tlb.rs
View File

@ -9,7 +9,7 @@ use super::{page::DynPage, Vaddr, PAGE_SIZE};
use crate::{ use crate::{
cpu::{CpuSet, PinCurrentCpu}, cpu::{CpuSet, PinCurrentCpu},
cpu_local, cpu_local,
sync::SpinLock, sync::{LocalIrqDisabled, SpinLock},
task::disable_preempt, task::disable_preempt,
}; };
@ -155,8 +155,8 @@ impl TlbFlushOp {
// //
// Lock ordering: lock FLUSH_OPS before PAGE_KEEPER. // Lock ordering: lock FLUSH_OPS before PAGE_KEEPER.
cpu_local! { cpu_local! {
static FLUSH_OPS: SpinLock<OpsStack> = SpinLock::new(OpsStack::new()); static FLUSH_OPS: SpinLock<OpsStack, LocalIrqDisabled> = SpinLock::new(OpsStack::new());
static PAGE_KEEPER: SpinLock<Vec<DynPage>> = SpinLock::new(Vec::new()); static PAGE_KEEPER: SpinLock<Vec<DynPage>, LocalIrqDisabled> = SpinLock::new(Vec::new());
} }
fn do_remote_flush() { fn do_remote_flush() {