| Message ID | 20250319145350.69543-1-dakr@kernel.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | [1/2] rust: pci: require Send for Driver trait implementers | expand |
On Wed Mar 19, 2025 at 3:52 PM CET, Danilo Krummrich wrote: > The instance of Self, returned and created by Driver::probe() is > dropped in the bus' remove() callback. > > Request implementers of the Driver trait to implement Send, since the > remove() callback is not guaranteed to run from the same thread as > probe(). > > Fixes: 1bd8b6b2c5d3 ("rust: pci: add basic PCI device / driver abstractions") > Reported-by: Alice Ryhl <aliceryhl@google.com> > Closes: https://lore.kernel.org/lkml/Z9rDxOJ2V2bPjj5i@google.com/ > Signed-off-by: Danilo Krummrich <dakr@kernel.org> Reviewed-by: Benno Lossin <benno.lossin@proton.me> --- Cheers, Benno > --- > rust/kernel/pci.rs | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs > index 0d09ae34a64d..22a32172b108 100644 > --- a/rust/kernel/pci.rs > +++ b/rust/kernel/pci.rs > @@ -222,7 +222,7 @@ macro_rules! pci_device_table { > ///``` > /// Drivers must implement this trait in order to get a PCI driver registered. Please refer to the > /// `Adapter` documentation for an example. > -pub trait Driver { > +pub trait Driver: Send { > /// The type holding information about each device id supported by the driver. > /// > /// TODO: Use associated_type_defaults once stabilized:
On Wed, Mar 19, 2025 at 03:52:55PM +0100, Danilo Krummrich wrote: > The instance of Self, returned and created by Driver::probe() is > dropped in the bus' remove() callback. > > Request implementers of the Driver trait to implement Send, since the > remove() callback is not guaranteed to run from the same thread as > probe(). > > Fixes: 1bd8b6b2c5d3 ("rust: pci: add basic PCI device / driver abstractions") > Reported-by: Alice Ryhl <aliceryhl@google.com> > Closes: https://lore.kernel.org/lkml/Z9rDxOJ2V2bPjj5i@google.com/ > Signed-off-by: Danilo Krummrich <dakr@kernel.org> > --- > rust/kernel/pci.rs | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) As there's no in-kernel users of these, any objection for me to take them for 6.15-rc1, or should they go now to Linus for 6.14-final? thanks, greg k-h
On Wed, Mar 19, 2025 at 10:03:49AM -0700, Greg KH wrote: > On Wed, Mar 19, 2025 at 03:52:55PM +0100, Danilo Krummrich wrote: > > The instance of Self, returned and created by Driver::probe() is > > dropped in the bus' remove() callback. > > > > Request implementers of the Driver trait to implement Send, since the > > remove() callback is not guaranteed to run from the same thread as > > probe(). > > > > Fixes: 1bd8b6b2c5d3 ("rust: pci: add basic PCI device / driver abstractions") > > Reported-by: Alice Ryhl <aliceryhl@google.com> > > Closes: https://lore.kernel.org/lkml/Z9rDxOJ2V2bPjj5i@google.com/ > > Signed-off-by: Danilo Krummrich <dakr@kernel.org> > > --- > > rust/kernel/pci.rs | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > As there's no in-kernel users of these, any objection for me to take > them for 6.15-rc1, or should they go now to Linus for 6.14-final? I think it's fine to take them for 6.15-rc1 only. -- Note that, while those patches can be taken "as is" to stable trees, they require rust: platform: impl Send + Sync for platform::Device rust: pci: impl Send + Sync for pci::Device as well, if 7b948a2af6b5 ("rust: pci: fix unrestricted &mut pci::Device") 4d320e30ee04 ("rust: platform: fix unrestricted &mut platform::Device") are in the same tree.
On Wed, Mar 19, 2025 at 06:11:13PM +0100, Danilo Krummrich wrote: > On Wed, Mar 19, 2025 at 10:03:49AM -0700, Greg KH wrote: > > On Wed, Mar 19, 2025 at 03:52:55PM +0100, Danilo Krummrich wrote: > > > The instance of Self, returned and created by Driver::probe() is > > > dropped in the bus' remove() callback. > > > > > > Request implementers of the Driver trait to implement Send, since the > > > remove() callback is not guaranteed to run from the same thread as > > > probe(). > > > > > > Fixes: 1bd8b6b2c5d3 ("rust: pci: add basic PCI device / driver abstractions") > > > Reported-by: Alice Ryhl <aliceryhl@google.com> > > > Closes: https://lore.kernel.org/lkml/Z9rDxOJ2V2bPjj5i@google.com/ > > > Signed-off-by: Danilo Krummrich <dakr@kernel.org> > > > --- > > > rust/kernel/pci.rs | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > As there's no in-kernel users of these, any objection for me to take > > them for 6.15-rc1, or should they go now to Linus for 6.14-final? > > I think it's fine to take them for 6.15-rc1 only. > > -- > > Note that, while those patches can be taken "as is" to stable trees, they > require > > rust: platform: impl Send + Sync for platform::Device > rust: pci: impl Send + Sync for pci::Device > > as well, if > > 7b948a2af6b5 ("rust: pci: fix unrestricted &mut pci::Device") > 4d320e30ee04 ("rust: platform: fix unrestricted &mut platform::Device") > > are in the same tree. Cool, I'll deal with that in a few weeks when -rc1 is out, thanks for the warning. greg k-h
diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs index 0d09ae34a64d..22a32172b108 100644 --- a/rust/kernel/pci.rs +++ b/rust/kernel/pci.rs @@ -222,7 +222,7 @@ macro_rules! pci_device_table { ///``` /// Drivers must implement this trait in order to get a PCI driver registered. Please refer to the /// `Adapter` documentation for an example. -pub trait Driver { +pub trait Driver: Send { /// The type holding information about each device id supported by the driver. /// /// TODO: Use associated_type_defaults once stabilized:
The instance of Self, returned and created by Driver::probe() is dropped in the bus' remove() callback. Request implementers of the Driver trait to implement Send, since the remove() callback is not guaranteed to run from the same thread as probe(). Fixes: 1bd8b6b2c5d3 ("rust: pci: add basic PCI device / driver abstractions") Reported-by: Alice Ryhl <aliceryhl@google.com> Closes: https://lore.kernel.org/lkml/Z9rDxOJ2V2bPjj5i@google.com/ Signed-off-by: Danilo Krummrich <dakr@kernel.org> --- rust/kernel/pci.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)