rust/kernel/devres.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Due to calling Revocable::revoke() from Devres::devres_callback() T may
be dropped from Devres::devres_callback() and hence must be Send.
Fix this by adding the corresponding bound to Devres and DevresInner.
Reported-by: Boqun Feng <boqun.feng@gmail.com>
Closes: https://lore.kernel.org/lkml/aFzI5L__OcB9hqdG@Mac.home/
Fixes: 76c01ded724b ("rust: add devres abstraction")
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
---
rust/kernel/devres.rs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/rust/kernel/devres.rs b/rust/kernel/devres.rs
index 57502534d985..8ede607414fd 100644
--- a/rust/kernel/devres.rs
+++ b/rust/kernel/devres.rs
@@ -18,7 +18,7 @@
};
#[pin_data]
-struct DevresInner<T> {
+struct DevresInner<T: Send> {
dev: ARef<Device>,
callback: unsafe extern "C" fn(*mut c_void),
#[pin]
@@ -95,9 +95,9 @@ struct DevresInner<T> {
/// # Ok(())
/// # }
/// ```
-pub struct Devres<T>(Arc<DevresInner<T>>);
+pub struct Devres<T: Send>(Arc<DevresInner<T>>);
-impl<T> DevresInner<T> {
+impl<T: Send> DevresInner<T> {
fn new(dev: &Device<Bound>, data: T, flags: Flags) -> Result<Arc<DevresInner<T>>> {
let inner = Arc::pin_init(
pin_init!( DevresInner {
@@ -175,7 +175,7 @@ fn remove_action(this: &Arc<Self>) -> bool {
}
}
-impl<T> Devres<T> {
+impl<T: Send> Devres<T> {
/// Creates a new [`Devres`] instance of the given `data`. The `data` encapsulated within the
/// returned `Devres` instance' `data` will be revoked once the device is detached.
pub fn new(dev: &Device<Bound>, data: T, flags: Flags) -> Result<Self> {
@@ -247,7 +247,7 @@ pub fn try_access_with_guard<'a>(&'a self, guard: &'a rcu::Guard) -> Option<&'a
}
}
-impl<T> Drop for Devres<T> {
+impl<T: Send> Drop for Devres<T> {
fn drop(&mut self) {
// SAFETY: When `drop` runs, it is guaranteed that nobody is accessing the revocable data
// anymore, hence it is safe not to wait for the grace period to finish.
base-commit: 86731a2a651e58953fc949573895f2fa6d456841
--
2.49.0
On Thu, Jun 26, 2025 at 03:24:46PM +0200, Danilo Krummrich wrote: > Due to calling Revocable::revoke() from Devres::devres_callback() T may > be dropped from Devres::devres_callback() and hence must be Send. > > Fix this by adding the corresponding bound to Devres and DevresInner. > > Reported-by: Boqun Feng <boqun.feng@gmail.com> > Closes: https://lore.kernel.org/lkml/aFzI5L__OcB9hqdG@Mac.home/ > Fixes: 76c01ded724b ("rust: add devres abstraction") > Signed-off-by: Danilo Krummrich <dakr@kernel.org> Applied to driver-core-testing, thanks!
On Thu, Jun 26, 2025 at 03:24:46PM +0200, Danilo Krummrich wrote: > Due to calling Revocable::revoke() from Devres::devres_callback() T may > be dropped from Devres::devres_callback() and hence must be Send. > > Fix this by adding the corresponding bound to Devres and DevresInner. > > Reported-by: Boqun Feng <boqun.feng@gmail.com> > Closes: https://lore.kernel.org/lkml/aFzI5L__OcB9hqdG@Mac.home/ > Fixes: 76c01ded724b ("rust: add devres abstraction") > Signed-off-by: Danilo Krummrich <dakr@kernel.org> Reviewed-by: Boqun Feng <boqun.fenng@gmail.com> Thanks! Regards, Boqun
On Thu Jun 26, 2025 at 3:24 PM CEST, Danilo Krummrich wrote: > Due to calling Revocable::revoke() from Devres::devres_callback() T may > be dropped from Devres::devres_callback() and hence must be Send. > > Fix this by adding the corresponding bound to Devres and DevresInner. > > Reported-by: Boqun Feng <boqun.feng@gmail.com> > Closes: https://lore.kernel.org/lkml/aFzI5L__OcB9hqdG@Mac.home/ > Fixes: 76c01ded724b ("rust: add devres abstraction") > Signed-off-by: Danilo Krummrich <dakr@kernel.org> > --- > rust/kernel/devres.rs | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) It would be enough to require `Send` on all `impl` blocks and not on the struct itself. Normally, I recommend doing that, because then you can have types like `Foo<Invalid>` existing when they come up in some weird type. But in this case, I think it's fine to add it to the type definition. Reviewed-by: Benno Lossin <lossin@kernel.org> --- Cheers, Benno
© 2016 - 2025 Red Hat, Inc.