summaryrefslogtreecommitdiff
path: root/rust
diff options
context:
space:
mode:
authorGary Guo <gary@garyguo.net>2026-07-16 15:55:35 +0100
committerBoqun Feng <boqun@kernel.org>2026-08-04 05:52:54 -0700
commit3f90c16d413b2f68407f1c5bb112a1b16ea35dc4 (patch)
treea6b83686d5de68031763b73b7f1408674ddd0585 /rust
parent72856afd33f2fa166c06f1536003e300e51ecf09 (diff)
downloadlinux-3f90c16d413b2f68407f1c5bb112a1b16ea35dc4.tar.gz
linux-3f90c16d413b2f68407f1c5bb112a1b16ea35dc4.zip
rust: revocable: Use LKMM atomics instead of Rust atomics
Kernel code should use LKMM atomics. The existing code is `AtomicBool` with the need to use `xchg`, so convert it to `AtomicFlag`. Signed-off-by: Gary Guo <gary@garyguo.net> Reviewed-by: Alice Ryhl <aliceryhl@google.com> Reviewed-by: FUJITA Tomonori <fujita.tomonori@gmail.com> Signed-off-by: Boqun Feng <boqun@kernel.org> Link: https://patch.msgid.link/20260716145536.3681630-1-gary@kernel.org
Diffstat (limited to 'rust')
-rw-r--r--rust/kernel/revocable.rs21
1 files changed, 13 insertions, 8 deletions
diff --git a/rust/kernel/revocable.rs b/rust/kernel/revocable.rs
index f539603349f1..0e55e2a0fb37 100644
--- a/rust/kernel/revocable.rs
+++ b/rust/kernel/revocable.rs
@@ -9,14 +9,19 @@ use pin_init::Wrapper;
use crate::{
prelude::*,
- sync::rcu,
+ sync::{
+ atomic::{
+ AtomicFlag,
+ Relaxed, //
+ },
+ rcu, //
+ },
types::Opaque, //
};
use core::{
marker::PhantomData,
ops::Deref,
- ptr::drop_in_place,
- sync::atomic::{AtomicBool, Ordering},
+ ptr::drop_in_place, //
};
/// An object that can become inaccessible at runtime.
@@ -69,7 +74,7 @@ use core::{
/// ```
#[pin_data(PinnedDrop)]
pub struct Revocable<T> {
- is_available: AtomicBool,
+ is_available: AtomicFlag,
#[pin]
data: Opaque<T>,
}
@@ -88,7 +93,7 @@ impl<T> Revocable<T> {
/// Creates a new revocable instance of the given data.
pub fn new<E>(data: impl PinInit<T, E>) -> impl PinInit<Self, E> {
try_pin_init!(Self {
- is_available: AtomicBool::new(true),
+ is_available: AtomicFlag::new(true),
data <- Opaque::pin_init(data),
}? E)
}
@@ -102,7 +107,7 @@ impl<T> Revocable<T> {
/// because another CPU may be waiting to complete the revocation of this object.
pub fn try_access(&self) -> Option<RevocableGuard<'_, T>> {
let guard = rcu::read_lock();
- if self.is_available.load(Ordering::Relaxed) {
+ if self.is_available.load(Relaxed) {
// Since `self.is_available` is true, data is initialised and has to remain valid
// because the RCU read side lock prevents it from being dropped.
Some(RevocableGuard::new(self.data.get(), guard))
@@ -120,7 +125,7 @@ impl<T> Revocable<T> {
/// allowed to sleep because another CPU may be waiting to complete the revocation of this
/// object.
pub fn try_access_with_guard<'a>(&'a self, _guard: &'a rcu::Guard) -> Option<&'a T> {
- if self.is_available.load(Ordering::Relaxed) {
+ if self.is_available.load(Relaxed) {
// SAFETY: Since `self.is_available` is true, data is initialised and has to remain
// valid because the RCU read side lock prevents it from being dropped.
Some(unsafe { &*self.data.get() })
@@ -161,7 +166,7 @@ impl<T> Revocable<T> {
///
/// Callers must ensure that there are no more concurrent users of the revocable object.
unsafe fn revoke_internal<const SYNC: bool>(&self) -> bool {
- let revoke = self.is_available.swap(false, Ordering::Relaxed);
+ let revoke = self.is_available.xchg(false, Relaxed);
if revoke {
if SYNC {