rust: devres: require T: Send for Devres
Subsystems (2)
Danilo Krummrich
maintainerPATCH 1/1 rust: devres: require T: Send for Devres
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.
--- rust/kernel/devres.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
rust/kernel/devres.rs +5 -5
@@ -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
Signature · 1 line
2.49.0
Quoted 5 lines · Danilo Krummrich
Due to calling
Revocable::revoke()fromDevres::devres_callback()T may be dropped fromDevres::devres_callback()and hence must be Send.Fix this by adding the corresponding bound to Devres and DevresInner.
Quoted 7 lines
Reported-by Boqun Feng <[email protected]>Fixes 76c01ded724b ("rust: add devres abstraction")Signed-off-by Danilo Krummrich <[email protected]>--- 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.
---
Cheers,
Benno
Quoted 9 lines · Danilo Krummrich
Due to calling
Revocable::revoke()fromDevres::devres_callback()T may be dropped fromDevres::devres_callback()and hence must be Send.Fix this by adding the corresponding bound to Devres and DevresInner.
Reported-by Boqun Feng <[email protected]>Fixes 76c01ded724b ("rust: add devres abstraction")Signed-off-by Danilo Krummrich <[email protected]>
Thanks!
Regards,
Boqun
Danilo Krummrich
maintainerQuoted 9 lines · Danilo Krummrich
Due to calling
Revocable::revoke()fromDevres::devres_callback()T may be dropped fromDevres::devres_callback()and hence must be Send.Fix this by adding the corresponding bound to Devres and DevresInner.
Reported-by Boqun Feng <[email protected]>Fixes 76c01ded724b ("rust: add devres abstraction")Signed-off-by Danilo Krummrich <[email protected]>
Applied to driver-core-testing, thanks!