rust: workqueue: add #[pin_data]
to Work
The previous two patches made it possible to add `#[pin_data]` on structs with default generic parameter values. This patch makes `Work` use `#[pin_data]` and removes an invocation of `pin_init_from_closure`. This function is intended as a low level manual escape hatch, so it is better to rely on the safe `pin_init!` macro. Signed-off-by: Benno Lossin <benno.lossin@proton.me> Reviewed-by: Martin Rodriguez Reboredo <yakoyoku@gmail.com> Reviewed-by: Gary Guo <gary@garyguo.net> Reviewed-by: Alice Ryhl <aliceryhl@google.com> Tested-by: Alice Ryhl <aliceryhl@google.com> Link: https://lore.kernel.org/r/20240309155243.482334-3-benno.lossin@proton.me Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
This commit is contained in:
parent
22eed6068d
commit
8db31d3f3b
@ -346,8 +346,10 @@ pub trait WorkItem<const ID: u64 = 0> {
|
||||
/// This is a helper type used to associate a `work_struct` with the [`WorkItem`] that uses it.
|
||||
///
|
||||
/// [`run`]: WorkItemPointer::run
|
||||
#[pin_data]
|
||||
#[repr(transparent)]
|
||||
pub struct Work<T: ?Sized, const ID: u64 = 0> {
|
||||
#[pin]
|
||||
work: Opaque<bindings::work_struct>,
|
||||
_inner: PhantomData<T>,
|
||||
}
|
||||
@ -369,21 +371,22 @@ impl<T: ?Sized, const ID: u64> Work<T, ID> {
|
||||
where
|
||||
T: WorkItem<ID>,
|
||||
{
|
||||
// SAFETY: The `WorkItemPointer` implementation promises that `run` can be used as the work
|
||||
// item function.
|
||||
pin_init!(Self {
|
||||
work <- Opaque::ffi_init(|slot| {
|
||||
// SAFETY: The `WorkItemPointer` implementation promises that `run` can be used as
|
||||
// the work item function.
|
||||
unsafe {
|
||||
kernel::init::pin_init_from_closure(move |slot| {
|
||||
let slot = Self::raw_get(slot);
|
||||
bindings::init_work_with_key(
|
||||
slot,
|
||||
Some(T::Pointer::run),
|
||||
false,
|
||||
name.as_char_ptr(),
|
||||
key.as_ptr(),
|
||||
);
|
||||
Ok(())
|
||||
})
|
||||
)
|
||||
}
|
||||
}),
|
||||
_inner: PhantomData,
|
||||
})
|
||||
}
|
||||
|
||||
/// Get a pointer to the inner `work_struct`.
|
||||
|
Loading…
Reference in New Issue
Block a user