[TMP] detect held_interrupts violations

NathanRoyer · Sep 6, 2023 · ad54f48 · ad54f48
1 parent 3833cee
commit ad54f48
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/applications/rq_access_eval/Cargo.toml b/applications/rq_access_eval/Cargo.toml
@@ -9,6 +9,6 @@ edition = "2021"
 app_io = { path = "../../kernel/app_io" }
 cpu = { path = "../../kernel/cpu" }
 getopts = "0.2"
-irq_safety = { git = "https://github.com/theseus-os/irq_safety" }
+irq_safety = { path = "../../../irq_safety" }
 runqueue = { path = "../../kernel/runqueue" }
 time = { path = "../../kernel/time" }
diff --git a/kernel/ap_start/Cargo.toml b/kernel/ap_start/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 log = "0.4.8"
 
-irq_safety = { git = "https://github.com/theseus-os/irq_safety" }
+irq_safety = { path = "../../../irq_safety" }
 sync_irq = { path = "../../libs/sync_irq" }
 memory = { path = "../memory" }
 stack = { path = "../stack" }

diff --git a/kernel/captain/Cargo.toml b/kernel/captain/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 log = "0.4.8"
 
-irq_safety = { git = "https://github.com/theseus-os/irq_safety" }
+irq_safety = { path = "../../../irq_safety" }
 dfqueue = { path = "../../libs/dfqueue", version = "0.1.0" }
 interrupt_controller = { path = "../interrupt_controller" }
 multicore_bringup = { path = "../multicore_bringup" }

diff --git a/kernel/cls/Cargo.toml b/kernel/cls/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 cls_macros = { path = "cls_macros" }
-irq_safety = { git = "https://github.com/theseus-os/irq_safety" }
+irq_safety = { path = "../../../irq_safety" }
 preemption = { path = "../preemption" }
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]

diff --git a/kernel/memory_initialization/Cargo.toml b/kernel/memory_initialization/Cargo.toml
@@ -17,4 +17,4 @@ kernel_config = { path = "../kernel_config" }
 bootloader_modules = { path = "../bootloader_modules" }
 heap = { path = "../heap" }
 
-irq_safety = { git = "https://github.com/theseus-os/irq_safety" }
+irq_safety = { path = "../../../irq_safety" }
diff --git a/kernel/nano_core/Cargo.toml b/kernel/nano_core/Cargo.toml
@@ -12,7 +12,7 @@ multiboot2 = { version = "0.14.0", optional = true }
 libm = "0.2.1"
 log = "0.4.8"
 
-irq_safety = { git = "https://github.com/theseus-os/irq_safety" }
+irq_safety = { path = "../../../irq_safety" }
 
 kernel_config = { path = "../kernel_config" }
 state_store = { path = "../state_store" }

diff --git a/kernel/spawn/Cargo.toml b/kernel/spawn/Cargo.toml
@@ -11,7 +11,7 @@ log = "0.4.8"
 spin = "0.9.4"
 lazy_static = { features = ["spin_no_std"], version = "1.4.0" }
 
-irq_safety = { git = "https://github.com/theseus-os/irq_safety" }
+irq_safety = { path = "../../../irq_safety" }
 
 debugit = { path = "../../libs/debugit" }
 

diff --git a/kernel/task/Cargo.toml b/kernel/task/Cargo.toml
@@ -11,7 +11,7 @@ spin = "0.9.4"
 static_assertions = "1.1.0"
 crossbeam-utils = { version = "0.8.2", default-features = false }
 
-irq_safety = { git = "https://github.com/theseus-os/irq_safety" }
+irq_safety = { path = "../../../irq_safety" }
 
 context_switch = { path = "../context_switch" }
 cls = { path = "../cls" }

diff --git a/kernel/task/src/lib.rs b/kernel/task/src/lib.rs
@@ -930,7 +930,7 @@ fn task_switch_inner(
     // on this CPU during the schedule/task_switch routines cannot observe inconsistencies
     // in task runstates, e.g., when an interrupt handler accesses the current task context.
     {
-        let _held_interrupts = hold_interrupts();
+        let _held_interrupts = hold_interrupts("task_switch_inner");
         next.0.task.running_on_cpu().store(Some(cpu_id).into());
         next.set_as_current_task();
         drop(_held_interrupts);

diff --git a/kernel/tlb_shootdown/Cargo.toml b/kernel/tlb_shootdown/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 log = "0.4.8"
-irq_safety = { git = "https://github.com/theseus-os/irq_safety" }
+irq_safety = { path = "../../../irq_safety" }
 memory = { path = "../memory" }
 cpu = { path = "../cpu" }
 sync_irq = { path = "../../libs/sync_irq" }

diff --git a/kernel/tlb_shootdown/src/lib.rs b/kernel/tlb_shootdown/src/lib.rs
@@ -69,7 +69,7 @@ fn broadcast_tlb_shootdown(pages_to_invalidate: PageRange) {
 
     // interrupts must be disabled here, because this IPI sequence must be fully synchronous with other cores,
     // and we wouldn't want this core to be interrupted while coordinating IPI responses across multiple cores.
-    let _held_ints = hold_interrupts();
+    let _held_ints = hold_interrupts("tlb_shootdown");
 
     // acquire lock
     // TODO: add timeout!!

diff --git a/libs/sync_irq/Cargo.toml b/libs/sync_irq/Cargo.toml
@@ -5,5 +5,5 @@ description = "Interrupt-request-disabling synchronisation primitives"
 edition = "2021"
 
 [dependencies]
-irq_safety = { git = "https://github.com/theseus-os/irq_safety" }
+irq_safety = { path = "../../../irq_safety" }
 sync = { path = "../sync" }
diff --git a/libs/sync_irq/src/lib.rs b/libs/sync_irq/src/lib.rs
@@ -1,6 +1,6 @@
 #![no_std]
 
-use irq_safety::{hold_interrupts, HeldInterrupts};
+pub use irq_safety::{hold_interrupts, HeldInterrupts};
 
 pub type Mutex<T> = sync::Mutex<T, DisableIrq>;
 pub type MutexGuard<'a, T> = sync::MutexGuard<'a, T, DisableIrq>;
@@ -27,6 +27,6 @@ impl sync::DeadlockPrevention for DisableIrq {
 
     #[inline]
     fn enter() -> Self::Guard {
-        hold_interrupts()
+        hold_interrupts("DeadlockPrevention::enter")
     }
 }