mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2025-04-19 20:58:31 +09:00
rust: platform: fix unrestricted &mut platform::Device
As by now, platform::Device is implemented as: #[derive(Clone)] pub struct Device(ARef<device::Device>); This may be convenient, but has the implication that drivers can call device methods that require a mutable reference concurrently at any point of time. Instead define platform::Device as pub struct Device<Ctx: DeviceContext = Normal>( Opaque<bindings::platform_dev>, PhantomData<Ctx>, ); and manually implement the AlwaysRefCounted trait. With this we can implement methods that should only be called from bus callbacks (such as probe()) for platform::Device<Core>. Consequently, we make this type accessible in bus callbacks only. Arbitrary references taken by the driver are still of type ARef<platform::Device> and hence don't provide access to methods that are reserved for bus callbacks. Fixes: 683a63befc73 ("rust: platform: add basic platform device / driver abstractions") Reviewed-by: Benno Lossin <benno.lossin@proton.me> Signed-off-by: Danilo Krummrich <dakr@kernel.org> Acked-by: Boqun Feng <boqun.feng@gmail.com> Link: https://lore.kernel.org/r/20250314160932.100165-5-dakr@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
7b948a2af6
commit
4d320e30ee
@ -5,7 +5,7 @@
|
||||
//! C header: [`include/linux/platform_device.h`](srctree/include/linux/platform_device.h)
|
||||
|
||||
use crate::{
|
||||
bindings, container_of, device, driver,
|
||||
bindings, device, driver,
|
||||
error::{to_result, Result},
|
||||
of,
|
||||
prelude::*,
|
||||
@ -14,7 +14,11 @@ use crate::{
|
||||
ThisModule,
|
||||
};
|
||||
|
||||
use core::ptr::addr_of_mut;
|
||||
use core::{
|
||||
marker::PhantomData,
|
||||
ops::Deref,
|
||||
ptr::{addr_of_mut, NonNull},
|
||||
};
|
||||
|
||||
/// An adapter for the registration of platform drivers.
|
||||
pub struct Adapter<T: Driver>(T);
|
||||
@ -54,14 +58,14 @@ unsafe impl<T: Driver + 'static> driver::RegistrationOps for Adapter<T> {
|
||||
|
||||
impl<T: Driver + 'static> Adapter<T> {
|
||||
extern "C" fn probe_callback(pdev: *mut bindings::platform_device) -> kernel::ffi::c_int {
|
||||
// SAFETY: The platform bus only ever calls the probe callback with a valid `pdev`.
|
||||
let dev = unsafe { device::Device::get_device(addr_of_mut!((*pdev).dev)) };
|
||||
// SAFETY: `dev` is guaranteed to be embedded in a valid `struct platform_device` by the
|
||||
// call above.
|
||||
let mut pdev = unsafe { Device::from_dev(dev) };
|
||||
// SAFETY: The platform bus only ever calls the probe callback with a valid pointer to a
|
||||
// `struct platform_device`.
|
||||
//
|
||||
// INVARIANT: `pdev` is valid for the duration of `probe_callback()`.
|
||||
let pdev = unsafe { &*pdev.cast::<Device<device::Core>>() };
|
||||
|
||||
let info = <Self as driver::Adapter>::id_info(pdev.as_ref());
|
||||
match T::probe(&mut pdev, info) {
|
||||
match T::probe(pdev, info) {
|
||||
Ok(data) => {
|
||||
// Let the `struct platform_device` own a reference of the driver's private data.
|
||||
// SAFETY: By the type invariant `pdev.as_raw` returns a valid pointer to a
|
||||
@ -120,7 +124,7 @@ macro_rules! module_platform_driver {
|
||||
/// # Example
|
||||
///
|
||||
///```
|
||||
/// # use kernel::{bindings, c_str, of, platform};
|
||||
/// # use kernel::{bindings, c_str, device::Core, of, platform};
|
||||
///
|
||||
/// struct MyDriver;
|
||||
///
|
||||
@ -138,7 +142,7 @@ macro_rules! module_platform_driver {
|
||||
/// const OF_ID_TABLE: Option<of::IdTable<Self::IdInfo>> = Some(&OF_TABLE);
|
||||
///
|
||||
/// fn probe(
|
||||
/// _pdev: &mut platform::Device,
|
||||
/// _pdev: &platform::Device<Core>,
|
||||
/// _id_info: Option<&Self::IdInfo>,
|
||||
/// ) -> Result<Pin<KBox<Self>>> {
|
||||
/// Err(ENODEV)
|
||||
@ -160,41 +164,72 @@ pub trait Driver {
|
||||
///
|
||||
/// Called when a new platform device is added or discovered.
|
||||
/// Implementers should attempt to initialize the device here.
|
||||
fn probe(dev: &mut Device, id_info: Option<&Self::IdInfo>) -> Result<Pin<KBox<Self>>>;
|
||||
fn probe(dev: &Device<device::Core>, id_info: Option<&Self::IdInfo>)
|
||||
-> Result<Pin<KBox<Self>>>;
|
||||
}
|
||||
|
||||
/// The platform device representation.
|
||||
///
|
||||
/// A platform device is based on an always reference counted `device:Device` instance. Cloning a
|
||||
/// platform device, hence, also increments the base device' reference count.
|
||||
/// This structure represents the Rust abstraction for a C `struct platform_device`. The
|
||||
/// implementation abstracts the usage of an already existing C `struct platform_device` within Rust
|
||||
/// code that we get passed from the C side.
|
||||
///
|
||||
/// # Invariants
|
||||
///
|
||||
/// `Device` holds a valid reference of `ARef<device::Device>` whose underlying `struct device` is a
|
||||
/// member of a `struct platform_device`.
|
||||
#[derive(Clone)]
|
||||
pub struct Device(ARef<device::Device>);
|
||||
/// A [`Device`] instance represents a valid `struct platform_device` created by the C portion of
|
||||
/// the kernel.
|
||||
#[repr(transparent)]
|
||||
pub struct Device<Ctx: device::DeviceContext = device::Normal>(
|
||||
Opaque<bindings::platform_device>,
|
||||
PhantomData<Ctx>,
|
||||
);
|
||||
|
||||
impl Device {
|
||||
/// Convert a raw kernel device into a `Device`
|
||||
///
|
||||
/// # Safety
|
||||
///
|
||||
/// `dev` must be an `Aref<device::Device>` whose underlying `bindings::device` is a member of a
|
||||
/// `bindings::platform_device`.
|
||||
unsafe fn from_dev(dev: ARef<device::Device>) -> Self {
|
||||
Self(dev)
|
||||
fn as_raw(&self) -> *mut bindings::platform_device {
|
||||
self.0.get()
|
||||
}
|
||||
}
|
||||
|
||||
impl Deref for Device<device::Core> {
|
||||
type Target = Device;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
let ptr: *const Self = self;
|
||||
|
||||
// CAST: `Device<Ctx>` is a transparent wrapper of `Opaque<bindings::platform_device>`.
|
||||
let ptr = ptr.cast::<Device>();
|
||||
|
||||
// SAFETY: `ptr` was derived from `&self`.
|
||||
unsafe { &*ptr }
|
||||
}
|
||||
}
|
||||
|
||||
impl From<&Device<device::Core>> for ARef<Device> {
|
||||
fn from(dev: &Device<device::Core>) -> Self {
|
||||
(&**dev).into()
|
||||
}
|
||||
}
|
||||
|
||||
// SAFETY: Instances of `Device` are always reference-counted.
|
||||
unsafe impl crate::types::AlwaysRefCounted for Device {
|
||||
fn inc_ref(&self) {
|
||||
// SAFETY: The existence of a shared reference guarantees that the refcount is non-zero.
|
||||
unsafe { bindings::get_device(self.as_ref().as_raw()) };
|
||||
}
|
||||
|
||||
fn as_raw(&self) -> *mut bindings::platform_device {
|
||||
// SAFETY: By the type invariant `self.0.as_raw` is a pointer to the `struct device`
|
||||
// embedded in `struct platform_device`.
|
||||
unsafe { container_of!(self.0.as_raw(), bindings::platform_device, dev) }.cast_mut()
|
||||
unsafe fn dec_ref(obj: NonNull<Self>) {
|
||||
// SAFETY: The safety requirements guarantee that the refcount is non-zero.
|
||||
unsafe { bindings::platform_device_put(obj.cast().as_ptr()) }
|
||||
}
|
||||
}
|
||||
|
||||
impl AsRef<device::Device> for Device {
|
||||
fn as_ref(&self) -> &device::Device {
|
||||
&self.0
|
||||
// SAFETY: By the type invariant of `Self`, `self.as_raw()` is a pointer to a valid
|
||||
// `struct platform_device`.
|
||||
let dev = unsafe { addr_of_mut!((*self.as_raw()).dev) };
|
||||
|
||||
// SAFETY: `dev` points to a valid `struct device`.
|
||||
unsafe { device::Device::as_ref(dev) }
|
||||
}
|
||||
}
|
||||
|
@ -2,10 +2,10 @@
|
||||
|
||||
//! Rust Platform driver sample.
|
||||
|
||||
use kernel::{c_str, of, platform, prelude::*};
|
||||
use kernel::{c_str, device::Core, of, platform, prelude::*, types::ARef};
|
||||
|
||||
struct SampleDriver {
|
||||
pdev: platform::Device,
|
||||
pdev: ARef<platform::Device>,
|
||||
}
|
||||
|
||||
struct Info(u32);
|
||||
@ -21,14 +21,17 @@ impl platform::Driver for SampleDriver {
|
||||
type IdInfo = Info;
|
||||
const OF_ID_TABLE: Option<of::IdTable<Self::IdInfo>> = Some(&OF_TABLE);
|
||||
|
||||
fn probe(pdev: &mut platform::Device, info: Option<&Self::IdInfo>) -> Result<Pin<KBox<Self>>> {
|
||||
fn probe(
|
||||
pdev: &platform::Device<Core>,
|
||||
info: Option<&Self::IdInfo>,
|
||||
) -> Result<Pin<KBox<Self>>> {
|
||||
dev_dbg!(pdev.as_ref(), "Probe Rust Platform driver sample.\n");
|
||||
|
||||
if let Some(info) = info {
|
||||
dev_info!(pdev.as_ref(), "Probed with info: '{}'.\n", info.0);
|
||||
}
|
||||
|
||||
let drvdata = KBox::new(Self { pdev: pdev.clone() }, GFP_KERNEL)?;
|
||||
let drvdata = KBox::new(Self { pdev: pdev.into() }, GFP_KERNEL)?;
|
||||
|
||||
Ok(drvdata.into())
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user