[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240912005539.175428-2-lyude@redhat.com>
Date: Wed, 11 Sep 2024 20:55:32 -0400
From: Lyude Paul <lyude@...hat.com>
To: rust-for-linux@...r.kernel.org
Cc: Danilo Krummrich <dakr@...hat.com>,
airlied@...hat.com,
Ingo Molnar <mingo@...hat.com>,
Will Deacon <will@...nel.org>,
Waiman Long <longman@...hat.com>,
Peter Zijlstra <peterz@...radead.org>,
linux-kernel@...r.kernel.org,
Miguel Ojeda <ojeda@...nel.org>,
Alex Gaynor <alex.gaynor@...il.com>,
Wedson Almeida Filho <wedsonaf@...il.com>,
Boqun Feng <boqun.feng@...il.com>,
Gary Guo <gary@...yguo.net>,
Björn Roy Baron <bjorn3_gh@...tonmail.com>,
Benno Lossin <benno.lossin@...ton.me>,
Andreas Hindborg <a.hindborg@...sung.com>,
Alice Ryhl <aliceryhl@...gle.com>,
Asahi Lina <lina@...hilina.net>,
Valentin Obst <kernel@...entinobst.de>
Subject: [PATCH v4 1/3] rust: Introduce irq module
This introduces a module for dealing with interrupt-disabled contexts,
including the ability to enable and disable interrupts
(with_irqs_disabled()) - along with the ability to annotate functions as
expecting that IRQs are already disabled on the local CPU.
Signed-off-by: Lyude Paul <lyude@...hat.com>
---
V2:
* Actually make it so that we check whether or not we have interrupts
disabled with debug assertions
* Fix issues in the documentation (added suggestions, missing periods, made
sure that all rustdoc examples compile properly)
* Pass IrqDisabled by value, not reference
* Ensure that IrqDisabled is !Send and !Sync using
PhantomData<(&'a (), *mut ())>
* Add all of the suggested derives from Benno Lossin
V3:
* Use `impl` for FnOnce bounds in with_irqs_disabled()
* Use higher-ranked trait bounds for the lifetime of with_irqs_disabled()
* Wording changes in the documentation for the module itself
V4:
* Use the actual unsafe constructor for IrqDisabled in
with_irqs_disabled()
* Fix comment style in with_irqs_disabled example
* Check before calling local_irq_restore() in with_irqs_disabled that
interrupts are still disabled. It would have been nice to do this from a
Drop implementation like I hoped, but I realized rust doesn't allow that
for types that implement Copy.
* Document that interrupts can't be re-enabled within the `cb` provided to
`with_irqs_disabled`, and link to the github issue I just filed about
this that describes the solution for this.
Signed-off-by: Lyude Paul <lyude@...hat.com>
---
rust/helpers.c | 23 ++++++++++++
rust/kernel/irq.rs | 90 ++++++++++++++++++++++++++++++++++++++++++++++
rust/kernel/lib.rs | 1 +
3 files changed, 114 insertions(+)
create mode 100644 rust/kernel/irq.rs
diff --git a/rust/helpers.c b/rust/helpers.c
index 92d3c03ae1bd5..c6109358675ae 100644
--- a/rust/helpers.c
+++ b/rust/helpers.c
@@ -26,6 +26,7 @@
#include <linux/device.h>
#include <linux/err.h>
#include <linux/errname.h>
+#include <linux/irqflags.h>
#include <linux/gfp.h>
#include <linux/highmem.h>
#include <linux/mutex.h>
@@ -85,6 +86,28 @@ void rust_helper_spin_unlock(spinlock_t *lock)
}
EXPORT_SYMBOL_GPL(rust_helper_spin_unlock);
+unsigned long rust_helper_local_irq_save(void)
+{
+ unsigned long flags;
+
+ local_irq_save(flags);
+
+ return flags;
+}
+EXPORT_SYMBOL_GPL(rust_helper_local_irq_save);
+
+void rust_helper_local_irq_restore(unsigned long flags)
+{
+ local_irq_restore(flags);
+}
+EXPORT_SYMBOL_GPL(rust_helper_local_irq_restore);
+
+bool rust_helper_irqs_disabled(void)
+{
+ return irqs_disabled();
+}
+EXPORT_SYMBOL_GPL(rust_helper_irqs_disabled);
+
void rust_helper_init_wait(struct wait_queue_entry *wq_entry)
{
init_wait(wq_entry);
diff --git a/rust/kernel/irq.rs b/rust/kernel/irq.rs
new file mode 100644
index 0000000000000..8dd153ba10bde
--- /dev/null
+++ b/rust/kernel/irq.rs
@@ -0,0 +1,90 @@
+// SPDX-License-Identifier: GPL-2.0
+
+//! Interrupt controls
+//!
+//! This module allows Rust code to control processor interrupts. [`with_irqs_disabled()`] may be
+//! used for nested disables of interrupts, whereas [`IrqDisabled`] can be used for annotating code
+//! that requires interrupts to be disabled.
+
+use bindings;
+use core::marker::*;
+
+/// A token that is only available in contexts where IRQs are disabled.
+///
+/// [`IrqDisabled`] is marker made available when interrupts are not active. Certain functions take
+/// an [`IrqDisabled`] in order to indicate that they may only be run in IRQ-free contexts.
+///
+/// This is a marker type; it has no size, and is simply used as a compile-time guarantee that
+/// interrupts are disabled where required.
+///
+/// This token can be created by [`with_irqs_disabled`]. See [`with_irqs_disabled`] for examples and
+/// further information.
+#[derive(Copy, Clone, Debug, Ord, Eq, PartialOrd, PartialEq, Hash)]
+pub struct IrqDisabled<'a>(PhantomData<(&'a (), *mut ())>);
+
+impl IrqDisabled<'_> {
+ /// Create a new [`IrqDisabled`] without disabling interrupts.
+ ///
+ /// This creates an [`IrqDisabled`] token, which can be passed to functions that must be run
+ /// without interrupts. If debug assertions are enabled, this function will assert that
+ /// interrupts are disabled upon creation. Otherwise, it has no size or cost at runtime.
+ ///
+ /// # Panics
+ ///
+ /// If debug assertions are enabled, this function will panic if interrupts are not disabled
+ /// upon creation.
+ ///
+ /// # Safety
+ ///
+ /// This function must only be called in contexts where it is already known that interrupts have
+ /// been disabled for the current CPU, as the user is making a promise that they will remain
+ /// disabled at least until this [`IrqDisabled`] is dropped.
+ pub unsafe fn new() -> Self {
+ // SAFETY: FFI call with no special requirements
+ debug_assert!(unsafe { bindings::irqs_disabled() });
+
+ Self(PhantomData)
+ }
+}
+
+/// Run the closure `cb` with interrupts disabled on the local CPU.
+///
+/// This creates an [`IrqDisabled`] token, which can be passed to functions that must be run
+/// without interrupts. Note that interrupts must be disabled for the entire duration of `cb`, they
+/// cannot be re-enabled. In the future, this may be expanded on
+/// [as documented here](https://github.com/Rust-for-Linux/linux/issues/1115).
+///
+/// # Examples
+///
+/// Using [`with_irqs_disabled`] to call a function that can only be called with interrupts
+/// disabled:
+///
+/// ```
+/// use kernel::irq::{IrqDisabled, with_irqs_disabled};
+///
+/// // Requiring interrupts be disabled to call a function
+/// fn dont_interrupt_me(_irq: IrqDisabled<'_>) {
+/// // When this token is available, IRQs are known to be disabled. Actions that rely on this
+/// // can be safely performed
+/// }
+///
+/// // Disabling interrupts. They'll be re-enabled once this closure completes.
+/// with_irqs_disabled(|irq| dont_interrupt_me(irq));
+/// ```
+#[inline]
+pub fn with_irqs_disabled<T>(cb: impl for<'a> FnOnce(IrqDisabled<'a>) -> T) -> T {
+ // SAFETY: FFI call with no special requirements
+ let flags = unsafe { bindings::local_irq_save() };
+
+ // SAFETY: We just disabled IRQs using `local_irq_save()`
+ let ret = cb(unsafe { IrqDisabled::new() });
+
+ // Confirm that IRQs are still enabled now that the callback has finished
+ // SAFETY: FFI call with no special requirements
+ debug_assert!(unsafe { bindings::irqs_disabled() });
+
+ // SAFETY: `flags` comes from our previous call to local_irq_save
+ unsafe { bindings::local_irq_restore(flags) };
+
+ ret
+}
diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
index 274bdc1b0a824..ead3a7ca5ba11 100644
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@ -36,6 +36,7 @@
pub mod firmware;
pub mod init;
pub mod ioctl;
+pub mod irq;
#[cfg(CONFIG_KUNIT)]
pub mod kunit;
#[cfg(CONFIG_NET)]
--
2.46.0
Powered by blists - more mailing lists